refactor containers

Author: vladimirgubarik

app/infrastructure/containers.py

@@ -82,6 +82,15 @@ def __call__(self) -> asyncio.Task:
 class BaseStartupContainer(containers.DeclarativeContainer):
     """Общий контейнер для старта бота."""
 
+    @staticmethod
+    def get_collectors() -> list[HandlerCollector]:
+        from app.presentation.bot.commands.common import collector as common_collector
+        from app.presentation.bot.commands.sample_record import (
+            collector as sample_record_collector,
+        )
+
+        return [common_collector, sample_record_collector]
+
     redis_client = providers.Singleton(lambda: aioredis.from_url(settings.REDIS_DSN))
 
     redis_repo = providers.Factory(
@@ -116,23 +125,12 @@ class BaseStartupContainer(containers.DeclarativeContainer):
             answer_error_middleware,
         ],
         callback_repo=callback_repo,
+        collectors=get_collectors(),
     )
 
 
 class ApplicationStartupContainer(BaseStartupContainer):
-    """Контейнер приложения с ленивой загрузкой collectors."""
-
-    @staticmethod
-    def get_collectors() -> list[HandlerCollector]:
-        from app.presentation.bot.commands.common import collector as common_collector
-        from app.presentation.bot.commands.sample_record import collector as sample_record_collector
-        return [common_collector, sample_record_collector]
-
-    bot = providers.Singleton(
-        Bot,
-        collectors=providers.Callable(get_collectors),
-        **BaseStartupContainer.bot.kwargs,
-    )
+    """Main Fastapi application container."""
 
     callback_task_manager = providers.Singleton(
         CallbackTaskManager,
@@ -146,12 +144,6 @@ def get_collectors() -> list[HandlerCollector]:
 
 
 class WorkerStartupContainer(BaseStartupContainer):
-    """Контейнер воркера с прямым импортом collectors."""
-
-    from app.presentation.bot.commands import common, sample_record
+    """SAQ Worker container"""
 
-    bot = providers.Singleton(
-        Bot,
-        collectors=[common.collector, sample_record.collector],  # type:ignore
-        **BaseStartupContainer.bot.kwargs,
-    )
+    pass

app/infrastructure/worker/worker.py

@@ -7,7 +7,7 @@
 from redis.asyncio import Redis
 from saq import CronJob, Queue
 
-from app.infrastructure.containers import WorkerStartupContainer
+from app.infrastructure.containers import WorkerStartupContainer, BaseStartupContainer
 from app.infrastructure.worker.tasks.simple_task import heartbeat_task
 from app.logger import logger
 from app.settings import settings
@@ -38,7 +38,7 @@ async def _shutdown_with_injection(
 
 
 async def startup(ctx: SaqCtx) -> None:
-    worker_startup_container = WorkerStartupContainer()
+    worker_startup_container = BaseStartupContainer()
 
     worker_startup_container.wire(modules=[__name__, "app.infrastructure.worker.tasks"])
     await _startup_with_injection()