fast-clean 1.4.2__py3-none-any.whl → 1.4.4__py3-none-any.whl

fast_clean/depends.py

@@ -10,7 +10,7 @@ from dishka import Provider, Scope, provide
 from fastapi import Depends, Request
 from faststream.kafka import KafkaBroker
 from flatten_dict import unflatten
-from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 from starlette.datastructures import FormData
 from stringcase import snakecase
 
@@ -81,14 +81,18 @@ class CoreProvider(Provider):
     Провайдер зависимостей.
     """
 
-    scope = Scope.APP
+    scope = Scope.REQUEST
 
     # --- repositories ---
 
-    settings_repository_factory = provide(SettingsRepositoryFactoryImpl, provides=SettingsRepositoryFactoryProtocol)
-    storage_repository_factory = provide(StorageRepositoryFactoryImpl, provides=StorageRepositoryFactoryProtocol)
+    settings_repository_factory = provide(
+        SettingsRepositoryFactoryImpl, provides=SettingsRepositoryFactoryProtocol, scope=Scope.APP
+    )
+    storage_repository_factory = provide(
+        StorageRepositoryFactoryImpl, provides=StorageRepositoryFactoryProtocol, scope=Scope.APP
+    )
 
-    @provide
+    @provide(scope=Scope.APP)
     @staticmethod
     async def get_settings_repository(
         settings_repository_factory: SettingsRepositoryFactoryProtocol,
@@ -98,7 +102,7 @@ class CoreProvider(Provider):
         """
         return await settings_repository_factory.make(SettingsSourceEnum.ENV)
 
-    @provide
+    @provide(scope=Scope.APP)
     @staticmethod
     async def get_settings(settings_repository: SettingsRepositoryProtocol) -> CoreSettingsSchema:
         """
@@ -106,7 +110,7 @@ class CoreProvider(Provider):
         """
         return await settings_repository.get(CoreSettingsSchema)
 
-    @provide
+    @provide(scope=Scope.APP)
     @staticmethod
     async def get_cache_settings(settings_repository: SettingsRepositoryProtocol) -> CoreCacheSettingsSchema:
         """
@@ -114,6 +118,7 @@ class CoreProvider(Provider):
         """
         return await settings_repository.get(CoreCacheSettingsSchema)
 
+    @provide
     @staticmethod
     async def get_broker_repository(settings_repository: SettingsRepositoryProtocol) -> AsyncIterator[KafkaBroker]:
         """
@@ -122,7 +127,7 @@ class CoreProvider(Provider):
         kafka_settings = await settings_repository.get(CoreKafkaSettingsSchema)
         yield BrokerFactory.make_static(kafka_settings)
 
-    @provide
+    @provide(scope=Scope.APP)
     @staticmethod
     async def get_cache_repository(settings_repository: SettingsRepositoryProtocol) -> CacheRepositoryProtocol:
         """
@@ -131,7 +136,7 @@ class CoreProvider(Provider):
         cache_settings = await settings_repository.get(CoreCacheSettingsSchema)
         return CacheManager.init(cache_settings)
 
-    @provide(scope=Scope.REQUEST)
+    @provide
     @staticmethod
     async def get_storage_repository(
         settings_repository: SettingsRepositoryProtocol,
@@ -154,17 +159,24 @@ class CoreProvider(Provider):
             )
             async with storage_repository:
                 yield storage_repository
-        raise NotImplementedError(f'Storage {storage_settings.provider} not allowed')
+        else:
+            raise NotImplementedError(f'Storage {storage_settings.provider} is not allowed')
 
     # --- db ---
 
+    @provide(scope=Scope.APP)
+    @staticmethod
+    async def get_async_sessionmaker(
+        settings_repository: SettingsRepositoryProtocol,
+    ) -> async_sessionmaker[AsyncSession]:
+        return await SessionFactory.make_async_session_dynamic(settings_repository)
+
     @provide
     @staticmethod
-    async def get_async_session(settings_repository: SettingsRepositoryProtocol) -> AsyncIterator[AsyncSession]:
+    async def get_async_session(session_maker: async_sessionmaker[AsyncSession]) -> AsyncIterator[AsyncSession]:
         """
         Получаем асинхронную сессию.
         """
-        session_maker = await SessionFactory.make_async_session_dynamic(settings_repository)
         async with session_maker() as session:
             yield session
 
@@ -178,10 +190,10 @@ class CoreProvider(Provider):
 
     # --- services ---
 
-    seed_service = provide(SeedService)
+    seed_service = provide(SeedService, scope=Scope.REQUEST)
     transaction_service = provide(TransactionService)
 
-    @provide
+    @provide(scope=Scope.APP)
     @staticmethod
     def get_cryptography_service_factory(settings: CoreSettingsSchema) -> CryptographyServiceFactory:
         """
@@ -199,7 +211,7 @@ class CoreProvider(Provider):
         """
         return await cryptography_service_factory.make(CryptographicAlgorithmEnum.AES_GCM)
 
-    @provide
+    @provide(scope=Scope.APP)
     @staticmethod
     def get_lock_service(cache_settings: CoreCacheSettingsSchema) -> LockServiceProtocol:
         """

{fast_clean-1.4.2.dist-info → fast_clean-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-clean
-Version: 1.4.2
+Version: 1.4.4
 Summary: FastAPI Clean Architecture implementation
 Author-email: Luferov Victor <luferovvs@yandex.ru>, Orlov Artem <squakrazv@yandex.ru>, Kashapov Rustam <hardtechnik91@gmail.com>
 Requires-Python: >=3.13

{fast_clean-1.4.2.dist-info → fast_clean-1.4.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ fast_clean/__init__.py,sha256=sT4tb75t5PXws8W_7wpA0jNtNxkWPFLAMrPlDGS7RHw,51
 fast_clean/broker.py,sha256=CHnL4Jd6jF5gKgtUXi33j9QFG2EUM4uqhVqdLuxIrZs,4474
 fast_clean/container.py,sha256=E1e0H1JqGOacH4uBNwkjTDXYhzN56yZi0AmWXQ3DkEQ,3535
 fast_clean/db.py,sha256=uZHXXHdLstqhyzGtBL5Z7VvXwIe6mxuPOUheJEzSMyM,5776
-fast_clean/depends.py,sha256=d6KbRPZsF_eh3Ed4Z9TYaDHZoWl6CSlHjc1y0OpiApg,7620
+fast_clean/depends.py,sha256=0gcMT_Ag1GJA3kb_q4yrM3E4MFIUz9rV29ljVqZZMPI,8020
 fast_clean/enums.py,sha256=lPhC_2_r6YFby7Mq-9u_JSiuyZ0e57F2VxBfUwnBZ18,826
 fast_clean/exceptions.py,sha256=Sp-k-a5z1Gedu0slzj1-rORnr4GP1FXDHKCKRaJq-7o,9485
 fast_clean/loggers.py,sha256=hVvZSDMMxYnK-p_yyjd4R7SyHpmxQF3eKQEeMu9Q-jo,705
@@ -66,7 +66,7 @@ fast_clean/utils/time.py,sha256=nvavbtG4zR_gkrGSbsqKAsBdePxO3LuTeoISbFZIgn0,307
 fast_clean/utils/toml.py,sha256=NbP7EfgKNYQ18LH8Hc-DmY1gks92bUSBW3D3-tMrY4E,737
 fast_clean/utils/type_converters.py,sha256=bMEJeoQB9Q6Qok1-ppn4Ii8ZpIkZwJbD2IzCydSStHw,523
 fast_clean/utils/typer.py,sha256=1O7BsNGn68bBzNbj0-Ycfhv35WpLzwvYTKn510YNXQQ,663
-fast_clean-1.4.2.dist-info/METADATA,sha256=C2BSQ7zHJPDpyiwr8GBzf_1IrnEetSu7YFxXO1YOmJQ,1200
-fast_clean-1.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fast_clean-1.4.2.dist-info/top_level.txt,sha256=QfsGs-QLmPCZWWPFOukD0zhMnokH68FoO2KeObl6ZIA,11
-fast_clean-1.4.2.dist-info/RECORD,,
+fast_clean-1.4.4.dist-info/METADATA,sha256=2CqHlg85rKSSKHR05cMKIJYyKXfZHZ5jafoCqd-7E1g,1200
+fast_clean-1.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fast_clean-1.4.4.dist-info/top_level.txt,sha256=QfsGs-QLmPCZWWPFOukD0zhMnokH68FoO2KeObl6ZIA,11
+fast_clean-1.4.4.dist-info/RECORD,,