fast-clean 1.4.0__tar.gz → 1.4.1__tar.gz

{fast_clean-1.4.0 → fast_clean-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-clean
-Version: 1.4.0
+Version: 1.4.1
 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 → fast_clean-1.4.1}/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,
@@ -121,15 +120,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 +193,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-1.4.0 → fast_clean-1.4.1}/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-1.4.0 → fast_clean-1.4.1}/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-1.4.0 → fast_clean-1.4.1}/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-1.4.0 → fast_clean-1.4.1}/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 → fast_clean-1.4.1}/fast_clean.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-clean
-Version: 1.4.0
+Version: 1.4.1
 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 → fast_clean-1.4.1}/fast_clean.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ fast_clean/loggers.py
 fast_clean/middleware.py
 fast_clean/models.py
 fast_clean/py.typed
-fast_clean/redis.py
 fast_clean/settings.py
 fast_clean.egg-info/PKG-INFO
 fast_clean.egg-info/SOURCES.txt

{fast_clean-1.4.0 → fast_clean-1.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-clean"
-version = "1.4.0"
+version = "1.4.1"
 description = "FastAPI Clean Architecture implementation"
 readme = "README.md"
 requires-python = ">=3.13"

fast_clean-1.4.0/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)