Try to fix lambda handler not finding sqs handler function

Author: MU-Software

runtime/chalicelib/worker/__init__.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import pathlib
 import typing
 
@@ -14,36 +15,38 @@
     type RecordType = dict[str, typing.Any]
 
 SQSEventType = typing.TypedDict("SQSEventType", {"Records": list[RecordType]})
-WorkerType = typing.Callable[[chalice.app.Chalice, RecordType], dict[str, typing.Any]]
+WorkerType = typing.Callable[[RecordType], dict[str, typing.Any]]
+
+logger = logging.getLogger(__name__)
+workers: dict[str, WorkerType] = {}
+
+for _workers in typing.cast(
+    list[list[WorkerType]],
+    import_util.auto_import_patterns(pattern="workers", file_prefix="", dir=pathlib.Path(__file__).parent),
+):
+    _func_names = {worker.__name__ for worker in _workers}
+    if _duplicated := _func_names & workers.keys():
+        raise ValueError(f"Worker {_duplicated} is already registered")
+
+    workers.update({worker.__name__: worker for worker in _workers})
+
+
+def _sqs_handler(event: chalice.app.SQSEvent) -> list[dict[str, typing.Any]]:
+    parsed_event: SQSEventType = event.to_dict()
+    logger.info(f"{parsed_event=}")
+
+    results: list[dict[str, typing.Any]] = []
+    for record in parsed_event["Records"]:
+        try:
+            worker_name = json.loads(record["body"])["worker"]
+            results.append(workers[worker_name](record))
+        except Exception as e:
+            logger.error(f"Failed to handle event: {record}", exc_info=e)
+            results.append({"error": "Failed to handle event"})
+
+    logger.info(f"{results=}")
+    return results
 
 
 def register_worker(app: chalice.app.Chalice) -> None:
-    workers: dict[str, WorkerType] = {}
-
-    for _workers in typing.cast(
-        list[list[WorkerType]],
-        import_util.auto_import_patterns(pattern="workers", file_prefix="", dir=pathlib.Path(__file__).parent),
-    ):
-        _func_names = {worker.__name__ for worker in _workers}
-        if _duplicated := _func_names & workers.keys():
-            raise ValueError(f"Worker {_duplicated} is already registered")
-
-        workers.update({worker.__name__: worker for worker in _workers})
-
-    @app.on_sqs_message(queue=config_module.config.infra.queue_name)
-    def sqs_handler(event: chalice.app.SQSEvent) -> list[dict[str, typing.Any]]:
-        parsed_event: SQSEventType = event.to_dict()
-        app.log.info(f"{parsed_event=}")
-
-        results: list[dict[str, typing.Any]] = []
-        for record in parsed_event["Records"]:
-            try:
-                worker_name = json.loads(record["body"])["worker"]
-                result = workers[worker_name](app, record)
-                results.append(result)
-            except Exception as e:
-                app.log.error(f"Failed to handle event: {record}", exc_info=e)
-                results.append({"error": "Failed to handle event"})
-
-        app.log.info(f"{results=}")
-        return results
+    app.on_sqs_message(queue=config_module.config.infra.queue_name)(_sqs_handler)

runtime/chalicelib/worker/notification_sender.py

@@ -1,7 +1,6 @@
 import functools
 import typing
 
-import chalice.app
 import chalicelib.send_manager as send_manager
 import chalicelib.send_manager.__interface__ as send_mgr_interface
 import pydantic
@@ -42,7 +41,7 @@ def send(self) -> dict[str, str]:
         return self.send_manager.send(self.send_request_payload)
 
 
-def notification_sender(app: chalice.app.Chalice, record: RecordType) -> dict[str, str]:
+def notification_sender(record: RecordType) -> dict[str, str]:
     return WorkerPayload.model_validate_json(record["body"]).send()
 
 

runtime/chalicelib/worker/test_worker.py

@@ -1,7 +1,5 @@
 import typing
 
-import chalice.app
-
 if typing.TYPE_CHECKING:
     import mypy_boto3_sqs.type_defs
 
@@ -10,7 +8,7 @@
     type RecordType = dict[str, typing.Any]
 
 
-def test_handler(app: chalice.app.Chalice, record: RecordType) -> RecordType:
+def test_handler(record: RecordType) -> RecordType:
     print(record)
     return record