fix formatting, linting

Author: corva-alex-s

setup.cfg

@@ -27,6 +27,7 @@ omit =
     docs/modules/ROOT/examples/logging/tutorial005.py
     docs/modules/ROOT/examples/followable/tutorial001.py
     src/corva/__init__.py
+    src/version.py
 
 [isort]
 profile = black

src/corva/handlers.py

@@ -576,7 +576,9 @@ def _merge_events(
     Only "scheduled" and "stream" type of apps can be processed here.
     If somehow any other type is passed - raise an exception
     """
-    if not isinstance(aws_event, list):     # if aws_event is not a list - there is nothing to merge, so do nothing.
+    if not isinstance(
+        aws_event, list
+    ):  # if aws_event is not a list - there is nothing to merge, so do nothing.
         return aws_event
 
     if data_transformation_type is RawScheduledEvent:

src/corva/models/merge/merge.py

@@ -1,6 +1,7 @@
+from typing import Optional
+
 from corva.models.base import CorvaBaseEvent
 from corva.models.merge.enums import EventType, RerunMode, SourceType
-from typing import Optional
 
 
 class PartialRerunMergeEvent(CorvaBaseEvent):
@@ -31,15 +32,15 @@ class PartialRerunMergeEvent(CorvaBaseEvent):
     rerun_mode: Optional[RerunMode]
     start: Optional[int]
     end: Optional[int]
-    asset_id: Optional[int]
-    rerun_asset_id: Optional[int]
-    app_stream_id: Optional[int]
-    rerun_app_stream_id: Optional[int]
+    asset_id: int
+    rerun_asset_id: int
+    app_stream_id: int
+    rerun_app_stream_id: int
     version: Optional[int]
     app_id: Optional[int]
     app_key: Optional[str]
-    app_connection_id: Optional[int]
-    rerun_app_connection_id: Optional[int]
+    app_connection_id: int
+    rerun_app_connection_id: int
     source_type: Optional[SourceType]
     log_type: Optional[str]
     run_until: Optional[int]

src/corva/models/merge/raw.py

@@ -13,17 +13,17 @@ class RawPartialMergeEventData(pydantic.BaseModel):
     rerun_mode: Optional[RerunMode]
     start: Optional[int]
     end: Optional[int]
-    asset_id: Optional[int]
-    rerun_asset_id: Optional[int]
-    app_stream_id: Optional[int]
-    rerun_app_stream_id: Optional[int]
+    asset_id: int
+    rerun_asset_id: int
+    app_stream_id: int
+    rerun_app_stream_id: int
     version: Optional[int] = pydantic.Field(
         ..., le=1, ge=1
     )  # Currently handler supports only 1-st version of this event.
     app_id: Optional[int]
     app_key: Optional[str]
-    app_connection_id: Optional[int]
-    rerun_app_connection_id: Optional[int]
+    app_connection_id: int
+    rerun_app_connection_id: int
     source_type: Optional[SourceType]
     log_type: Optional[str]
     run_until: Optional[int]

tests/unit/test_partial_rerun_merge_app.py

@@ -33,7 +33,7 @@
 
 
 def test_merge_event_handler_called_from_stream_app_on_unexpected_event_type_raises_exc(
-        context,
+    context,
 ):
     """Partial merge app must raise Pydantic validation exception
     while processing event of unexpected type.
@@ -55,7 +55,7 @@ def partial_rerun_merge_app(event, api, asset_cache, rerun_asset_cache):
 
 
 def test_merge_event_handler_called_from_stream_app_returns_expected_cache_values(
-        context,
+    context,
 ):
     """Partial merge app must provide functional(working) cache objects
     for asset and rerun asset.
@@ -124,8 +124,9 @@ def partial_rerun_merge_app(event, api, asset_cache, rerun_asset_cache):
 
 
 def test_event_parsing_not_failing_on_missing_field(context):
-    """When calling scheduled event with merge event handler defined,
-    partial merge handler should be called only.
+    """
+    When field is missing we're still able to parse the event and invoke correct
+    function
     """
 
     @corva.scheduled(merge_events=True)
@@ -136,15 +137,15 @@ def scheduled_app(event, api, cache):
     def partial_rerun_merge_app(event, api, asset_cache, rerun_asset_cache):
         return True
 
-    event_with_missing_parameter = deepcopy(RAW_EVENT)
+    event_with_missing_parameter: dict = deepcopy(RAW_EVENT)
     event_with_missing_parameter["data"]["end"] = None
     partial_merge_app_response = scheduled_app(event_with_missing_parameter, context)[0]
     assert partial_merge_app_response is True
 
 
 def test_merge_events_parameter_ignored_for_partial_rerun_merge(context):
-    """When calling scheduled event with merge event handler defined,
-    partial merge handler should be called only.
+    """
+    merge_events parameter is ignored when incoming aws_event is not a list
     """
 
     @corva.scheduled(merge_events=True)
@@ -157,3 +158,7 @@ def partial_rerun_merge_app(event, api, asset_cache, rerun_asset_cache):
 
     partial_merge_app_response = scheduled_app(RAW_EVENT, context)[0]
     assert partial_merge_app_response is True
+
+
+def test_partial_rerun_decorator_can_be_called_directly(context):
+    corva.partial_rerun_merge()