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

fast_clean/depends.py

@@ -16,7 +16,6 @@ from stringcase import snakecase
 
 from .broker import BrokerFactory
 from .db import SessionFactory, SessionManagerImpl, SessionManagerProtocol
-from .redis import RedisManager
 from .repositories import (
     CacheManager,
     CacheRepositoryProtocol,
@@ -107,6 +106,14 @@ class CoreProvider(Provider):
         """
         return await settings_repository.get(CoreSettingsSchema)
 
+    @provide
+    @staticmethod
+    async def get_cache_settings(settings_repository: SettingsRepositoryProtocol) -> CoreCacheSettingsSchema:
+        """
+        Получаем настройки кеша.
+        """
+        return await settings_repository.get(CoreCacheSettingsSchema)
+
     @staticmethod
     async def get_broker_repository(settings_repository: SettingsRepositoryProtocol) -> AsyncIterator[KafkaBroker]:
         """
@@ -121,15 +128,8 @@ class CoreProvider(Provider):
         """
         Получаем репозиторий кеша.
         """
-        settings = await settings_repository.get(CoreSettingsSchema)
-        if settings.redis_dsn is not None:
-            RedisManager.init(settings.redis_dsn)
         cache_settings = await settings_repository.get(CoreCacheSettingsSchema)
-        if CacheManager.cache_repository is None:
-            CacheManager.init(cache_settings, RedisManager.redis)
-        if CacheManager.cache_repository is not None:
-            return CacheManager.cache_repository
-        raise ValueError('Cache is not initialized')
+        return CacheManager.init(cache_settings)
 
     @provide(scope=Scope.REQUEST)
     @staticmethod
@@ -201,14 +201,12 @@ class CoreProvider(Provider):
 
     @provide
     @staticmethod
-    def get_lock_service(settings: CoreSettingsSchema) -> LockServiceProtocol:
+    def get_lock_service(cache_settings: CoreCacheSettingsSchema) -> LockServiceProtocol:
         """
         Получаем сервис распределенной блокировки.
         """
-        assert settings.redis_dsn is not None
-        RedisManager.init(settings.redis_dsn)
-        assert RedisManager.redis is not None
-        return RedisLockService(RedisManager.redis)
+        redis_client = CacheManager.init(cache_settings)
+        return RedisLockService(redis_client)  # type: ignore
 
 
 provider = CoreProvider()

fast_clean/repositories/cache/__init__.py

@@ -9,9 +9,9 @@
 from typing import ClassVar, Protocol, Self, cast
 
 from fastapi_cache import FastAPICache
+from redis import asyncio as aioredis
 
 from fast_clean.settings import CoreCacheSettingsSchema
-from redis import asyncio as aioredis
 
 from .in_memory import InMemoryCacheRepository as InMemoryCacheRepository
 from .redis import RedisCacheRepository as RedisCacheRepository
@@ -67,7 +67,7 @@ class CacheManager:
     cache_repository: ClassVar[CacheRepositoryProtocol | None] = None
 
     @classmethod
-    def init(cls, cache_settings: CoreCacheSettingsSchema, redis: aioredis.Redis | None) -> None:
+    def init(cls, cache_settings: CoreCacheSettingsSchema):
         """
         Инициализируем кеш.
         """
@@ -77,7 +77,13 @@ class CacheManager:
                 case 'in_memory':
                     cache_backend = InMemoryCacheRepository()
                 case 'redis':
-                    assert redis is not None
-                    cache_backend = RedisCacheRepository(redis)
+                    if not cache_settings.redis:
+                        raise ValueError('Redis not configured in settings')
+                    cache_backend = RedisCacheRepository(
+                        aioredis.from_url(url=str(cache_settings.redis.dsn), decode_responses=True)  # type: ignore
+                    )
+                case _:
+                    raise ValueError('Cache is not initialized')
             FastAPICache.init(cache_backend, prefix=cache_settings.prefix)
             cls.cache_repository = cast(CacheRepositoryProtocol, cache_backend)
+        return cls.cache_repository

fast_clean/repositories/cache/redis.py

@@ -6,7 +6,6 @@ from typing import Self
 
 from fastapi_cache.backends.redis import RedisBackend
 from overrides import override
-
 from redis.asyncio.client import Redis
 
 

fast_clean/services/lock.py

@@ -6,10 +6,11 @@ from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 from typing import AsyncContextManager, Protocol
 
-from fast_clean.exceptions import LockError
 from redis import asyncio as aioredis
 from redis.exceptions import LockError as AIORedisLockError
 
+from fast_clean.exceptions import LockError
+
 
 class LockServiceProtocol(Protocol):
     """

fast_clean/settings.py

@@ -39,6 +39,10 @@ class CoreDbSettingsSchema(BaseModel):
         return f'{self.provider}://{self.user}:{self.password}@{self.host}:{self.port}/{self.name}'
 
 
+class CoreRedisSettingsSchema(BaseModel):
+    dsn: RedisDsn
+
+
 class CoreCacheSettingsSchema(BaseModel):
     """
     Схема настроек кеша.
@@ -48,6 +52,8 @@ class CoreCacheSettingsSchema(BaseModel):
 
     prefix: str
 
+    redis: CoreRedisSettingsSchema | None = None
+
 
 class CoreS3SettingsSchema(BaseModel):
     """
@@ -178,7 +184,6 @@ class CoreSettingsSchema(BaseSettingsSchema):
     base_dir: Path = Path(os.getcwd())
     secret_key: str
     cors_origins: Annotated[list[str], Field(default_factory=list)]
-    redis_dsn: RedisDsn | None = None
     sentry_dsn: str | None = None
 
     model_config = SettingsConfigDict(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-clean
-Version: 1.4.0
+Version: 1.4.2
 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.0.dist-info → fast_clean-1.4.2.dist-info}/RECORD

@@ -2,15 +2,14 @@ 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=e5KQlvVPDPZrMaZBWAPOuLCt-HO7b9NA4UTMaTsB1Y8,7807
+fast_clean/depends.py,sha256=d6KbRPZsF_eh3Ed4Z9TYaDHZoWl6CSlHjc1y0OpiApg,7620
 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
 fast_clean/middleware.py,sha256=p0Tv_qu89ZQtzKZ10tNepArJyHlFX2II9UmivGWnycw,1037
 fast_clean/models.py,sha256=H7-Hk3gZP9i2TiJHu0u2Nex76c8ZbDhMR4lF41_PMyI,1057
 fast_clean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fast_clean/redis.py,sha256=H_SLnDhY_ute8pYHdhIypUGlCwMcVfFA4S2j8vLUph0,578
-fast_clean/settings.py,sha256=YgmdhW38quBHQty254Pv-vFZ5eGbl__VQ1lIgoVg8kI,4864
+fast_clean/settings.py,sha256=Ox2aDEOxw4LgrszCNpUMNlxCqozc6kcv7406786ADAw,4938
 fast_clean/cli/__init__.py,sha256=m8n09uN47JGtAfgWVbXCJOxpzlrUazogqtLo6xPWe3s,181
 fast_clean/cli/cryptography.py,sha256=ACaYAOn4KEKIdsTuCYkX1m6g2YpMczNCjJcVfLE2Rzo,1936
 fast_clean/cli/load_seed.py,sha256=Tm5_r_myrC5dl_WyC6Bx2WKFAkfLf-Pch4ZK6zWN2Qg,867
@@ -27,9 +26,9 @@ fast_clean/contrib/monitoring/router.py,sha256=94gffX34VE_Yb6TLaQOP4YyXDQsClzOn4
 fast_clean/contrib/sqlalchemy_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fast_clean/contrib/sqlalchemy_utils/utils.py,sha256=5xktmJlQifGpIXMruhe7qofEEu_ExncBTUmlrtFK1YQ,1061
 fast_clean/repositories/__init__.py,sha256=mHJ6CW1fYkkiSnnYiO3GRAa5YVCPN1otOOKkjbutuhs,1753
-fast_clean/repositories/cache/__init__.py,sha256=pD7qIS6H8DrnhOptJiXrlGcWYUCIU3VmVQCLccyxx4Q,2511
+fast_clean/repositories/cache/__init__.py,sha256=aVl1ReoU0doH1i78-Ef8rS-LaVQacF0SS9xLFWzmcgQ,2811
 fast_clean/repositories/cache/in_memory.py,sha256=Hb68UrTmQozALcyLrmYPBIfJfi67NvsCTDe1RfqwBHQ,2259
-fast_clean/repositories/cache/redis.py,sha256=UjrA2CXQtMfHTpowz6Ot952y73YjTEr6zJlBbWblaws,1908
+fast_clean/repositories/cache/redis.py,sha256=-iX6x-sfXj-pDYfcRIyKjq9nCjnlRQKeJtfeMmDpT-4,1907
 fast_clean/repositories/crud/__init__.py,sha256=z_-zY3esEbUEHSGb9WInU-vvRuTpTu4M-Qe5UhCN0Pc,4359
 fast_clean/repositories/crud/db.py,sha256=wyvDvEjvncfSVHlaguhrgCP7wIsiKRoGZEesxHzDVHI,23212
 fast_clean/repositories/crud/in_memory.py,sha256=37VBQJTIV4z1_Om9DhYqpa1t98hGGhY8gumoyV-fhDg,13172
@@ -51,7 +50,7 @@ fast_clean/schemas/pagination.py,sha256=GEQ-Tbhx6xkMMXhDNWrTEhPv8IdnAOJxH2P1tscm
 fast_clean/schemas/repository.py,sha256=ASxMJb23H3zwavr7P0_ZpCWZX7FjqAuC75qAIYqejvQ,889
 fast_clean/schemas/request_response.py,sha256=i4HTpjelWl4DxJ1sQaeanTWB_PThlhVJRhtMMGqRAiQ,693
 fast_clean/services/__init__.py,sha256=Lvdb5ZibRGwoMn_WENrk9wERUViTsPrU8E_71XtPFJc,617
-fast_clean/services/lock.py,sha256=SLF9_wRx3rgHMw829XwflJgAlGJyXj57o4iVPvGwe78,1653
+fast_clean/services/lock.py,sha256=SlO-wkULBtm9X7jvtUTiEpmDWuiNTscMD-73PPlmI0o,1654
 fast_clean/services/seed.py,sha256=M0yA2I5z-jLM2UcW_x7287mwIFW5Vt0fPFaplakGFc0,2836
 fast_clean/services/transaction.py,sha256=djXR6e6ukgpBXDbVmU095MvRJAIqdOPMgAcege52Qxg,762
 fast_clean/services/cryptography/__init__.py,sha256=XK9-z6HT1Jgfc4-IpNY6fZihjW2dqeO83cz5ZvjJIbo,1559
@@ -67,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.0.dist-info/METADATA,sha256=ltPh_moagnnuYT0IIVzx_hxD4I3PddBCpKp27xiy45s,1200
-fast_clean-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fast_clean-1.4.0.dist-info/top_level.txt,sha256=QfsGs-QLmPCZWWPFOukD0zhMnokH68FoO2KeObl6ZIA,11
-fast_clean-1.4.0.dist-info/RECORD,,
+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/redis.py

@@ -1,23 +0,0 @@
-"""
-Модуль, содержащий функционал, связанный с Redis.
-"""
-
-from pydantic import RedisDsn
-
-from redis import asyncio as aioredis
-
-
-class RedisManager:
-    """
-    Менеджер для управления клиентом Redis.
-    """
-
-    redis: aioredis.Redis | None = None
-
-    @classmethod
-    def init(cls, redis_dsn: RedisDsn) -> None:
-        """
-        Инициализируем клиент Redis.
-        """
-        if cls.redis is None:
-            cls.redis = aioredis.from_url(url=str(redis_dsn), decode_responses=True)