Fix coverage, linter

Author: corva-alex-s

src/corva/handlers.py

@@ -60,7 +60,7 @@ def base_handler(
     func: Callable,
     raw_event_type: Type[RawBaseEvent],
     handler: Optional[logging.Handler],
-    merge_events: Optional[bool] = False
+    merge_events: Optional[bool] = False,
 ) -> Callable[[Any, Any], List[Any]]:
     @functools.wraps(func)
     def wrapper(aws_event: Any, aws_context: Any) -> List[Any]:
@@ -125,7 +125,7 @@ def stream(
     func: Optional[Callable[[StreamEventT, Api, UserRedisSdk], Any]] = None,
     *,
     handler: Optional[logging.Handler] = None,
-    merge_events: Optional[bool] = False
+    merge_events: Optional[bool] = False,
 ) -> Callable:
     """Runs stream app.
 
@@ -143,7 +143,7 @@ def stream(
         base_handler,
         raw_event_type=RawStreamEvent,
         handler=handler,
-        merge_events=merge_events
+        merge_events=merge_events,
     )
     def wrapper(
         event: RawStreamEvent,
@@ -234,7 +234,7 @@ def scheduled(
     func: Optional[Callable[[ScheduledEventT, Api, UserRedisSdk], Any]] = None,
     *,
     handler: Optional[logging.Handler] = None,
-    merge_events: Optional[bool] = False
+    merge_events: Optional[bool] = False,
 ) -> Callable:
     """Runs scheduled app.
 
@@ -250,7 +250,7 @@ def scheduled(
         base_handler,
         raw_event_type=RawScheduledEvent,
         handler=handler,
-        merge_events=merge_events
+        merge_events=merge_events,
     )
     def wrapper(
         event: RawScheduledEvent,
@@ -565,19 +565,24 @@ def _get_custom_event_type_by_raw_aws_event(
     return None, None
 
 
-def _merge_events(aws_event: Any, data_transformation_type: RawBaseEvent) -> Any:
+def _merge_events(aws_event: Any, data_transformation_type: Type[RawBaseEvent]) -> Any:
     """
     Merges incoming aws_events into one.
     Merge happens differently, depending on app type.
     """
     if data_transformation_type == RawScheduledEvent:
         if not isinstance(aws_event[0], dict):
-            aws_event: List[dict] = list(itertools.chain(*aws_event))
+            aws_event = list(itertools.chain(*aws_event))
         is_depth = aws_event[0]["scheduler_type"] == SchedulerType.data_depth_milestone
-        event_start, event_end = ("top_depth", "bottom_depth")\
-            if is_depth else ("schedule_start", "schedule_end")
-        min_event_start, max_event_end = (aws_event[0][event_start],
-                                          aws_event[0].get(event_end))
+        event_start, event_end = (
+            ("top_depth", "bottom_depth")
+            if is_depth
+            else ("schedule_start", "schedule_end")
+        )
+        min_event_start, max_event_end = (
+            aws_event[0][event_start],
+            aws_event[0].get(event_end),
+        )
         for event in aws_event[1:]:
             if event[event_start] < min_event_start:
                 min_event_start = event[event_start]

tests/unit/test_scheduled_app.py

@@ -1,5 +1,6 @@
 import logging
 import re
+from typing import Dict, List, Union
 
 import pytest
 import redis
@@ -543,10 +544,10 @@ def scheduled_app(event, api, cache):
 )
 def test_merge_events_scheduled_event(context, requests_mock, time_ranges, flat):
     @scheduled(merge_events=True)
-    def scheduled_app(event, api, state):
-        return event
+    def scheduled_app(_event: ScheduledDataTimeEvent, api, state):
+        return _event
 
-    event = []
+    event: List[Union[List, Dict]] = []
     for schedule_start, schedule_end in time_ranges:
         event.append(
             RawScheduledDataTimeEvent(
@@ -568,5 +569,5 @@ def scheduled_app(event, api, state):
 
     assert result_event.start_time == 1
     assert result_event.end_time == 60
-    max_schedule_run_value = time_ranges[-1][-1]
-    assert result_event.schedule_end == max_schedule_run_value
+    max_schedule_value = time_ranges[-1][-1]
+    assert result_event.schedule_end == max_schedule_value  # type: ignore[attr-defined]

tests/unit/test_stream_app.py

@@ -626,6 +626,7 @@ def test_merge_events_stream_event(context):
     to merge incoming events into one event with all records(6 in our
     case) combined
     """
+
     @stream(merge_events=True)
     def stream_app(event, api, cache):
         return event
@@ -665,7 +666,7 @@ def stream_app(event, api, cache):
                     timestamp=4,
                     asset_id=1,
                     company_id=1,
-                )
+                ),
             ],
             metadata=RawMetadata(
                 app_stream_id=1,
@@ -686,15 +687,15 @@ def stream_app(event, api, cache):
                     timestamp=6,
                     asset_id=1,
                     company_id=1,
-                )
+                ),
             ],
             metadata=RawMetadata(
                 app_stream_id=1,
                 apps={SETTINGS.APP_KEY: RawAppMetadata(app_connection_id=1)},
                 log_type=LogType.time,
             ),
-        ).dict()
+        ).dict(),
     ]
 
-    result_event: StreamEvent = stream_app(event, context)[0]
+    result_event: StreamTimeEvent = stream_app(event, context)[0]
     assert len(result_event.records) == 6, "records were not merged into a single event"