fast-clean 1.1.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

fast_clean/contrib/logging/enums.py

@@ -0,0 +1,10 @@
+from enum import StrEnum, auto
+
+
+class EnvironmentEnum(StrEnum):
+    """
+    Окружения
+    """
+
+    DEVELOPMENT = auto()
+    PRODUCTION = auto()

fast_clean/contrib/logging/sentry.py

@@ -0,0 +1,23 @@
+import logging
+
+import sentry_sdk
+from sentry_sdk.integrations.fastapi import FastApiIntegration
+from sentry_sdk.integrations.logging import LoggingIntegration
+
+from .enums import EnvironmentEnum
+
+
+def use_sentry(
+    dsn: str | None,
+    environment: EnvironmentEnum = EnvironmentEnum.DEVELOPMENT,
+    level: int = logging.DEBUG,
+    event_level: int = logging.ERROR,
+) -> None:
+    if not dsn:
+        return
+
+    sentry_logging = LoggingIntegration(
+        level=level,
+        event_level=event_level,
+    )
+    sentry_sdk.init(dsn=dsn, environment=str(environment), integrations=[sentry_logging, FastApiIntegration()])

fast_clean/contrib/monitoring/middleware.py

@@ -0,0 +1,6 @@
+from aioprometheus.asgi.middleware import MetricsMiddleware
+from fastapi import FastAPI
+
+
+def use_middleware(app: FastAPI) -> None:
+    app.add_middleware(MetricsMiddleware)   # type: ignore

fast_clean/contrib/monitoring/router.py

@@ -0,0 +1,6 @@
+from aioprometheus.asgi.starlette import metrics
+from fastapi import APIRouter
+
+router = APIRouter(tags=['Monitoring'])
+
+router.get('/metrics')(metrics)

fast_clean/contrib/sqlalchemy_utils/utils.py

@@ -0,0 +1,26 @@
+from typing import Any
+
+import sqlalchemy_utils
+from alembic.autogenerate.api import AutogenContext
+
+
+def render_item(type_: str, obj: Any, autogen_context: AutogenContext):
+    """
+    Apply custom rendering for selected items.
+    """
+
+    if type_ == 'type' and isinstance(obj, sqlalchemy_utils.types.ChoiceType):
+        autogen_context.imports.add('import sqlalchemy_utils')
+        autogen_context.imports.add(f'from {obj.choices.__module__} import {obj.choices.__name__}')
+        return f'sqlalchemy_utils.types.ChoiceType({obj.choices.__name__}, impl=sa.{obj.impl.__class__.__name__}())'
+
+    if type_ == 'type' and isinstance(obj, sqlalchemy_utils.types.JSONType):
+        autogen_context.imports.add('import sqlalchemy_utils')
+        return 'sqlalchemy_utils.types.JSONType()'
+
+    if type_ == 'type' and isinstance(obj, sqlalchemy_utils.types.UUIDType):
+        autogen_context.imports.add('import sqlalchemy_utils')
+        return f'sqlalchemy_utils.types.UUIDType(binary={obj.binary})'
+
+    # Default rendering for other objects
+    return False

fast_clean/db.py

@@ -21,7 +21,7 @@ from sqlalchemy.ext.asyncio import (
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 from sqlalchemy.sql import func
-from sqlalchemy_utils import UUIDType
+from sqlalchemy_utils.types.uuid import UUIDType
 from stringcase import snakecase
 
 from .settings import CoreDbSettingsSchema, CoreSettingsSchema
@@ -61,7 +61,7 @@ def make_async_session_factory(
     return async_sessionmaker(asyncio_engine, expire_on_commit=False, autoflush=False)
 
 
-class BaseParent(AsyncAttrs, DeclarativeBase):
+class Base(AsyncAttrs, DeclarativeBase):
     """
     Базовая родительская модель.
     """
@@ -71,7 +71,7 @@ class BaseParent(AsyncAttrs, DeclarativeBase):
     metadata = metadata
 
 
-class Base(BaseParent):
+class BaseUUID(Base):
     """
     Базовая родительская модель нового типа.
     """
@@ -90,7 +90,7 @@ class Base(BaseParent):
         return snakecase(cls.__name__)
 
 
-class BaseOld(BaseParent):
+class BaseInt(Base):
     """
     Базовая родительская модель старого типа.
     """
@@ -100,6 +100,10 @@ class BaseOld(BaseParent):
     id: Mapped[int] = mapped_column(primary_key=True)
 
 
+    @declared_attr.directive
+    def __tablename__(cls) -> str:
+        return snakecase(cls.__name__)
+
 class SessionFactory:
     """
     Фабрика сессий.
@@ -170,8 +174,7 @@ class SessionManagerImpl:
         Получаем сессию для выполнения запроса.
         """
         if self.session.in_transaction():
-            async with self.session.begin_nested():
-                yield self.session
+            yield self.session
         else:
             async with self.session.begin():
                 if immediate:

fast_clean/repositories/__init__.py

@@ -6,10 +6,10 @@ from .cache import CacheManager as CacheManager
 from .cache import CacheRepositoryProtocol as CacheRepositoryProtocol
 from .cache import InMemoryCacheRepository as InMemoryCacheRepository
 from .cache import RedisCacheRepository as RedisCacheRepository
-from .crud import CrudRepositoryOldProtocol as CrudRepositoryOldProtocol
+from .crud import CrudRepositoryIntProtocol as CrudRepositoryIntProtocol
 from .crud import CrudRepositoryProtocol as CrudRepositoryProtocol
 from .crud import DbCrudRepository as DbCrudRepository
-from .crud import DbCrudRepositoryOld as DbCrudRepositoryOld
+from .crud import DbCrudRepositoryInt as DbCrudRepositoryInt
 from .settings import EnvSettingsRepository as EnvSettingsRepository
 from .settings import SettingsRepositoryError as SettingsRepositoryError
 from .settings import SettingsRepositoryFactoryImpl as SettingsRepositoryFactoryImpl

fast_clean/repositories/crud/__init__.py

@@ -13,17 +13,17 @@ from typing import Any, Protocol, Self
 from fast_clean.schemas import PaginationResultSchema, PaginationSchema
 
 from .db import DbCrudRepository as DbCrudRepository
-from .db import DbCrudRepositoryOld as DbCrudRepositoryOld
+from .db import DbCrudRepositoryInt as DbCrudRepositoryInt
 from .in_memory import InMemoryCrudRepository as InMemoryCrudRepository
-from .in_memory import InMemoryCrudRepositoryOld as InMemoryCrudRepositoryOld
+from .in_memory import InMemoryCrudRepositoryInt as InMemoryCrudRepositoryInt
 from .type_vars import (
     CreateSchemaBaseType,
-    CreateSchemaOldType,
+    CreateSchemaIntType,
     CreateSchemaType,
     IdTypeContravariant,
     ReadSchemaBaseType,
     UpdateSchemaBaseType,
-    UpdateSchemaOldType,
+    UpdateSchemaIntType,
     UpdateSchemaType,
 )
 
@@ -118,17 +118,17 @@ class CrudRepositoryBaseProtocol(
         ...
 
 
-class CrudRepositoryOldProtocol(
+class CrudRepositoryIntProtocol(
     CrudRepositoryBaseProtocol[
         ReadSchemaBaseType,
-        CreateSchemaOldType,
-        UpdateSchemaOldType,
+        CreateSchemaIntType,
+        UpdateSchemaIntType,
         int,
     ],
     Protocol[
         ReadSchemaBaseType,
-        CreateSchemaOldType,
-        UpdateSchemaOldType,
+        CreateSchemaIntType,
+        UpdateSchemaIntType,
     ],
 ):
     """

fast_clean/repositories/crud/db.py

@@ -28,17 +28,17 @@ from fast_clean.schemas import PaginationResultSchema, PaginationSchema
 
 from .type_vars import (
     CreateSchemaBaseType,
-    CreateSchemaOldType,
+    CreateSchemaIntType,
     CreateSchemaType,
     IdType,
     ModelBaseType,
-    ModelOldType,
+    ModelIntType,
     ModelType,
     ReadSchemaBaseType,
-    ReadSchemaOldType,
+    ReadSchemaIntType,
     ReadSchemaType,
     UpdateSchemaBaseType,
-    UpdateSchemaOldType,
+    UpdateSchemaIntType,
     UpdateSchemaType,
 )
 
@@ -526,19 +526,19 @@ class DbCrudRepositoryBase(
         return order_by_expr
 
 
-class DbCrudRepositoryOld(
+class DbCrudRepositoryInt(
     DbCrudRepositoryBase[
-        ModelOldType,
-        ReadSchemaOldType,
-        CreateSchemaOldType,
-        UpdateSchemaOldType,
+        ModelIntType,
+        ReadSchemaIntType,
+        CreateSchemaIntType,
+        UpdateSchemaIntType,
         int,
     ],
     Generic[
-        ModelOldType,
-        ReadSchemaOldType,
-        CreateSchemaOldType,
-        UpdateSchemaOldType,
+        ModelIntType,
+        ReadSchemaIntType,
+        CreateSchemaIntType,
+        UpdateSchemaIntType,
     ],
 ):
     """

fast_clean/repositories/crud/in_memory.py

@@ -15,14 +15,14 @@ from fast_clean.schemas import PaginationResultSchema, PaginationSchema
 
 from .type_vars import (
     CreateSchemaBaseType,
-    CreateSchemaOldType,
+    CreateSchemaIntType,
     CreateSchemaType,
     IdType,
     ReadSchemaBaseType,
-    ReadSchemaOldType,
+    ReadSchemaIntType,
     ReadSchemaType,
     UpdateSchemaBaseType,
-    UpdateSchemaOldType,
+    UpdateSchemaIntType,
     UpdateSchemaType,
 )
 
@@ -311,17 +311,17 @@ class InMemoryCrudRepositoryBase(ABC, Generic[ReadSchemaBaseType, CreateSchemaBa
         return model
 
 
-class InMemoryCrudRepositoryOld(
+class InMemoryCrudRepositoryInt(
     InMemoryCrudRepositoryBase[
-        ReadSchemaOldType,
-        CreateSchemaOldType,
-        UpdateSchemaOldType,
+        ReadSchemaIntType,
+        CreateSchemaIntType,
+        UpdateSchemaIntType,
         int,
     ],
     Generic[
-        ReadSchemaOldType,
-        CreateSchemaOldType,
-        UpdateSchemaOldType,
+        ReadSchemaIntType,
+        CreateSchemaIntType,
+        UpdateSchemaIntType,
     ],
 ):
     """

fast_clean/repositories/crud/type_vars.py

@@ -5,31 +5,31 @@
 import uuid
 from typing import TypeVar
 
-from fast_clean.db import Base, BaseOld
+from fast_clean.db import BaseInt, BaseUUID
 from fast_clean.schemas import (
     CreateSchema,
-    CreateSchemaOld,
+    CreateSchemaInt,
     ReadSchema,
-    ReadSchemaOld,
+    ReadSchemaInt,
     UpdateSchema,
-    UpdateSchemaOld,
+    UpdateSchemaInt,
 )
 
-ModelBaseType = TypeVar('ModelBaseType', bound=BaseOld | Base)
-CreateSchemaBaseType = TypeVar('CreateSchemaBaseType', bound=CreateSchemaOld | CreateSchema)
-ReadSchemaBaseType = TypeVar('ReadSchemaBaseType', bound=ReadSchemaOld | ReadSchema)
-UpdateSchemaBaseType = TypeVar('UpdateSchemaBaseType', bound=UpdateSchemaOld | UpdateSchema)
+ModelBaseType = TypeVar('ModelBaseType', bound=BaseInt | BaseUUID)
+CreateSchemaBaseType = TypeVar('CreateSchemaBaseType', bound=CreateSchemaInt | CreateSchema)
+ReadSchemaBaseType = TypeVar('ReadSchemaBaseType', bound=ReadSchemaInt | ReadSchema)
+UpdateSchemaBaseType = TypeVar('UpdateSchemaBaseType', bound=UpdateSchemaInt | UpdateSchema)
 IdType = TypeVar('IdType', bound=int | uuid.UUID)
 IdTypeContravariant = TypeVar('IdTypeContravariant', bound=int | uuid.UUID, contravariant=True)
 
 
-ModelOldType = TypeVar('ModelOldType', bound=BaseOld)
-CreateSchemaOldType = TypeVar('CreateSchemaOldType', bound=CreateSchemaOld)
-ReadSchemaOldType = TypeVar('ReadSchemaOldType', bound=ReadSchemaOld)
-UpdateSchemaOldType = TypeVar('UpdateSchemaOldType', bound=UpdateSchemaOld)
+ModelIntType = TypeVar('ModelIntType', bound=BaseInt)
+CreateSchemaIntType = TypeVar('CreateSchemaIntType', bound=CreateSchemaInt)
+ReadSchemaIntType = TypeVar('ReadSchemaIntType', bound=ReadSchemaInt)
+UpdateSchemaIntType = TypeVar('UpdateSchemaIntType', bound=UpdateSchemaInt)
 
 
-ModelType = TypeVar('ModelType', bound=Base)
+ModelType = TypeVar('ModelType', bound=BaseUUID)
 CreateSchemaType = TypeVar('CreateSchemaType', bound=CreateSchema)
 ReadSchemaType = TypeVar('ReadSchemaType', bound=ReadSchema)
 UpdateSchemaType = TypeVar('UpdateSchemaType', bound=UpdateSchema)

fast_clean/repositories/storage/s3.py

@@ -24,7 +24,7 @@ class S3StorageRepository:
     def __init__(self: Self, params: S3StorageParamsSchema):
         self.params = params
         self.bucket = self.params.bucket
-        self.client = miniopy_async.Minio(
+        self.client = miniopy_async.Minio(  # type: ignore
             f'{self.params.endpoint}:{self.params.port}',
             access_key=self.params.access_key,
             secret_key=self.params.secret_key,

fast_clean/schemas/__init__.py

@@ -13,11 +13,11 @@ from .pagination import PaginationResponseSchema as PaginationResponseSchema
 from .pagination import PaginationResultSchema as PaginationResultSchema
 from .pagination import PaginationSchema as PaginationSchema
 from .repository import CreateSchema as CreateSchema
-from .repository import CreateSchemaOld as CreateSchemaOld
+from .repository import CreateSchemaInt as CreateSchemaInt
 from .repository import ReadSchema as ReadSchema
-from .repository import ReadSchemaOld as ReadSchemaOld
+from .repository import ReadSchemaInt as ReadSchemaInt
 from .repository import UpdateSchema as UpdateSchema
-from .repository import UpdateSchemaOld as UpdateSchemaOld
+from .repository import UpdateSchemaInt as UpdateSchemaInt
 from .request_response import RemoteRequestSchema as RemoteRequestSchema
 from .request_response import RemoteResponseSchema as RemoteResponseSchema
 from .request_response import RequestSchema as RequestSchema

fast_clean/schemas/repository.py

@@ -34,9 +34,9 @@ class UpdateSchemaGeneric(BaseModel, Generic[IdType]):
     id: IdType
 
 
-CreateSchemaOld = CreateSchemaGeneric[int]
-ReadSchemaOld = ReadSchemaGeneric[int]
-UpdateSchemaOld = UpdateSchemaGeneric[int]
+CreateSchemaInt = CreateSchemaGeneric[int]
+ReadSchemaInt = ReadSchemaGeneric[int]
+UpdateSchemaInt = UpdateSchemaGeneric[int]
 
 CreateSchema = CreateSchemaGeneric[uuid.UUID]
 ReadSchema = ReadSchemaGeneric[uuid.UUID]

fast_clean/services/lock.py

@@ -6,9 +6,9 @@ from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 from typing import AsyncContextManager, Protocol
 
-import redis.asyncio.lock as aioredis_lock
 from fast_clean.exceptions import LockError
 from redis import asyncio as aioredis
+from redis.exceptions import LockError as AIORedisLockError
 
 
 class LockServiceProtocol(Protocol):
@@ -53,5 +53,5 @@ class RedisLockService:
         try:
             async with self.redis.lock(name, timeout=timeout, sleep=sleep, blocking_timeout=blocking_timeout):
                 yield
-        except aioredis_lock.LockError as lock_error:
+        except AIORedisLockError as lock_error:
             raise LockError() from lock_error

{fast_clean-1.1.1.dist-info → fast_clean-1.2.0.dist-info}/METADATA

@@ -1,12 +1,14 @@
 Metadata-Version: 2.4
 Name: fast-clean
-Version: 1.1.1
+Version: 1.2.0
 Summary: FastAPI Clean Architecture implementation
-Author-email: Luferov Victor <luferovvs@yandex.ru>, Orlov Artem <squakrazv@yandex.ru>
-Requires-Python: >=3.12
+Author-email: Luferov Victor <luferovvs@yandex.ru>, Orlov Artem <squakrazv@yandex.ru>, Kashapov Rustam <hardtechnik91@gmail.com>
+Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 Requires-Dist: aiofiles>=24.1.0
 Requires-Dist: aiokafka>=0.12.0
+Requires-Dist: aioprometheus>=23.12.0
+Requires-Dist: alembic>=1.16.2
 Requires-Dist: cryptography>=44.0.1
 Requires-Dist: dishka>=1.6.0
 Requires-Dist: fastapi>=0.115.8
@@ -15,10 +17,12 @@ Requires-Dist: faststream>=0.5.34
 Requires-Dist: flatten-dict>=0.4.2
 Requires-Dist: miniopy-async>=1.21.1
 Requires-Dist: overrides>=7.7.0
-Requires-Dist: psycopg>=3.2.4
+Requires-Dist: psycopg[binary]>=3.2.4
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pydantic-settings>=2.8.0
 Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: sentry-sdk>=2.32.0
+Requires-Dist: snakecase>=1.0.1
 Requires-Dist: sqlalchemy-utils>=0.41.2
 Requires-Dist: sqlalchemy[asyncio]>=2.0.38
 Requires-Dist: stringcase>=1.2.0

{fast_clean-1.1.1.dist-info → fast_clean-1.2.0.dist-info}/RECORD

@@ -1,7 +1,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=d03D9cYHpq8iQ7ErAwZYggLhITmxD5feSr071kv0_x0,5507
+fast_clean/db.py,sha256=8lfs9SS41naPkvyKcsStdBAXo07p_6Kwr_6zx7--oGU,5552
 fast_clean/depends.py,sha256=nSsn1-c7A0VmtudCI70z5wi0b7TmSUqvHjyZpTE3_wk,7750
 fast_clean/enums.py,sha256=lPhC_2_r6YFby7Mq-9u_JSiuyZ0e57F2VxBfUwnBZ18,826
 fast_clean/exceptions.py,sha256=Sp-k-a5z1Gedu0slzj1-rORnr4GP1FXDHKCKRaJq-7o,9485
@@ -11,18 +11,25 @@ fast_clean/models.py,sha256=qnNUSwLf0gOW8C98PMIs6vTw7UP3-Nk-k6YoFvHstVM,880
 fast_clean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fast_clean/redis.py,sha256=H_SLnDhY_ute8pYHdhIypUGlCwMcVfFA4S2j8vLUph0,578
 fast_clean/settings.py,sha256=o460LZjXW0_WYe0QB9g0fTgch8dhkUq-6flAnf4LKM4,4715
-fast_clean/use_cases.py,sha256=XzRqnS3LOkaadbL50-E9f7q3Bi5Yz4AOCHKh82AH0Mg,1384
 fast_clean/contrib/__init__.py,sha256=AcFNyhc0QGsOnYvzQGanDN3QIAsKpn4d8RIj73F-sGc,63
 fast_clean/contrib/healthcheck/__init__.py,sha256=p8hUCLdv2qGngTwAeTGIV4h_ZGDm9ZNWMrA5_k3Yi0E,106
 fast_clean/contrib/healthcheck/router.py,sha256=6kyFuNqR5m3pB_fzerrZ7m7yvoqL_BiwkUMeLrxJVnE,408
-fast_clean/repositories/__init__.py,sha256=IpETRNot2t6rI5qUtsyqinkloS2fhcqSVpB5-s1iUmY,1753
+fast_clean/contrib/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fast_clean/contrib/logging/enums.py,sha256=a-Tz3k4j0aAbUXDvTV6sl2pKKEGuKG94qc3plXixezU,154
+fast_clean/contrib/logging/sentry.py,sha256=hacxHuHqYreosG_Nt0SPRlKQo0iE1hyY8DH4nbMhb5E,625
+fast_clean/contrib/monitoring/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fast_clean/contrib/monitoring/middleware.py,sha256=F6EDY_hNBmFlji-cCJwzsm5Wl1S0CsO373rjxfqjlGA,191
+fast_clean/contrib/monitoring/router.py,sha256=94gffX34VE_Yb6TLaQOP4YyXDQsClzOn4APb45V_HyA,153
+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/in_memory.py,sha256=Hb68UrTmQozALcyLrmYPBIfJfi67NvsCTDe1RfqwBHQ,2259
 fast_clean/repositories/cache/redis.py,sha256=UjrA2CXQtMfHTpowz6Ot952y73YjTEr6zJlBbWblaws,1908
-fast_clean/repositories/crud/__init__.py,sha256=CrfjDlf0QLQXzX4GO7VkDf_qaZMPl1Pz9pXv9fCyWSU,4391
-fast_clean/repositories/crud/db.py,sha256=OXQKBZ8pQGUgKiK_v1B0-HJIgXkS0EVwanXjDzjEwpc,23432
-fast_clean/repositories/crud/in_memory.py,sha256=0JZJC4iYAnJLNYBDpwlekKj580Qao9X0HL1hpfP-x14,13407
-fast_clean/repositories/crud/type_vars.py,sha256=YfSLmHAcjXLiR_uUevrAcT4_5dxc03ZLKPqRBN2aJG4,1306
+fast_clean/repositories/crud/__init__.py,sha256=m3HotDYyPm4tHKpobZcLoMpcdAgPsU9qrTkATKpS42Y,4391
+fast_clean/repositories/crud/db.py,sha256=roKUese7s75SJZuNRbkDAY-jGsRfrR80eangZdeijak,23432
+fast_clean/repositories/crud/in_memory.py,sha256=-beTCvrtyXon27S-I9O5Vk52YtMZZzfa9TmuQxKMw6Y,13407
+fast_clean/repositories/crud/type_vars.py,sha256=Gb4ew1T1NkitL87hJ75KtpTjOi6PuML5fU_zFAsVUqA,1318
 fast_clean/repositories/settings/__init__.py,sha256=ZxrncvTDs8pNkhWSy2cxV3a8uElTnrM-b1-vq4ouJok,1485
 fast_clean/repositories/settings/enums.py,sha256=coqZg6xe_mRFWeihBfnSkCByLuD0pT8Vv4g02tpBk-w,358
 fast_clean/repositories/settings/env.py,sha256=maQttYENMJyTf4vnSXa4L3R6tKiLmb-d0Q5VS-r9ZuE,2153
@@ -32,24 +39,21 @@ fast_clean/repositories/storage/__init__.py,sha256=mP_2NTx_Ec19WCmxecJsbjvNjhy8O
 fast_clean/repositories/storage/enums.py,sha256=bS4L63aEXNaGnJql8A1jmsK4KY916cWnzTW5p_PyLmg,375
 fast_clean/repositories/storage/local.py,sha256=s5REPU7xczvzin13sKyZtFdiocrgAMk8bnDIbJ90KT4,4270
 fast_clean/repositories/storage/reader.py,sha256=yAxj51ITWJf0u-KGC3DJ0iTB3pDI1p9ixi_h0ZcWoZ4,3299
-fast_clean/repositories/storage/s3.py,sha256=GcJ0qo6RgMSCIOKdafSwH4kz1YHc_2cOYuvgxT81yvI,4302
+fast_clean/repositories/storage/s3.py,sha256=z3YHGk89Ac87qAy3FApCXDpEx_CRdLfLzXBIng-BfUQ,4318
 fast_clean/repositories/storage/schemas.py,sha256=etlogfK_1uUZPQjHWQN6LWy6-8YY2Sago3Zbf6p0KcQ,623
-fast_clean/schemas/__init__.py,sha256=u7U2j-QURCEIL_Gg3cQyp3oCbsT497lD3X54nqWDfzQ,1361
+fast_clean/schemas/__init__.py,sha256=OrIP8vV_c5tO5fET3slhCRNfiXjgmZnR5hJlVIZYh24,1361
 fast_clean/schemas/exceptions.py,sha256=E7G9jv4G82Ede7OQ3619vPGwEywc7tKmXW6EolOGRFQ,723
 fast_clean/schemas/pagination.py,sha256=GEQ-Tbhx6xkMMXhDNWrTEhPv8IdnAOJxH2P1tscmn60,1384
-fast_clean/schemas/repository.py,sha256=up4-c7irCRm73Xsq0jMu5pot1xMDOuNRNNopId0-Zn8,889
+fast_clean/schemas/repository.py,sha256=ASxMJb23H3zwavr7P0_ZpCWZX7FjqAuC75qAIYqejvQ,889
 fast_clean/schemas/request_response.py,sha256=i4HTpjelWl4DxJ1sQaeanTWB_PThlhVJRhtMMGqRAiQ,693
 fast_clean/schemas/status_response.py,sha256=mASZRCNtKJnDbmhr8_pBytkE_3NguyTIFqO4aw-nNEQ,269
 fast_clean/services/__init__.py,sha256=Lvdb5ZibRGwoMn_WENrk9wERUViTsPrU8E_71XtPFJc,617
-fast_clean/services/lock.py,sha256=Sw8LKAQ6w-EFSOeIOVsbB89lZa3LvF4ROiRpJFF5hzE,1642
+fast_clean/services/lock.py,sha256=SLF9_wRx3rgHMw829XwflJgAlGJyXj57o4iVPvGwe78,1653
 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=IDokTE-dJriQxdsov3yoVw1OrsgyxJLeBFJwi_Mb7iE,1531
 fast_clean/services/cryptography/aes.py,sha256=_k0WtnKDaEKdUBegfwmqerE75ER44307CEQ-I2W0abo,4616
 fast_clean/services/cryptography/enums.py,sha256=cLibSGv6LNVTUI2rm3_DtDwU68GYIAf4kY3GGbtnw1A,494
-fast_clean/tools/__init__.py,sha256=m8n09uN47JGtAfgWVbXCJOxpzlrUazogqtLo6xPWe3s,181
-fast_clean/tools/cryptography.py,sha256=Q79-Qb4-nyrid3CNr7uWplT6tghnivFI-bqNUTvqlIQ,1913
-fast_clean/tools/load_seed.py,sha256=Tm5_r_myrC5dl_WyC6Bx2WKFAkfLf-Pch4ZK6zWN2Qg,867
 fast_clean/utils/__init__.py,sha256=Q3OiJNdWl51Vd_wSP7iuZQIq4_SjM1mYkqIWPaw94WU,709
 fast_clean/utils/process.py,sha256=6k2E1q7d31Wq6G5BqJqrX5czimvJExeltk7uO7CxiSg,936
 fast_clean/utils/pydantic.py,sha256=FtBkNsxdlrhrlEiIHu2wZwF-UR4THETV8mw-h_jevYg,871
@@ -59,7 +63,7 @@ fast_clean/utils/thread.py,sha256=ChEWBLupnSEMq4Wro_aiW0QvCLUKedKc0TQFMu7Zg4g,56
 fast_clean/utils/time.py,sha256=nvavbtG4zR_gkrGSbsqKAsBdePxO3LuTeoISbFZIgn0,307
 fast_clean/utils/type_converters.py,sha256=bMEJeoQB9Q6Qok1-ppn4Ii8ZpIkZwJbD2IzCydSStHw,523
 fast_clean/utils/typer.py,sha256=1O7BsNGn68bBzNbj0-Ycfhv35WpLzwvYTKn510YNXQQ,663
-fast_clean-1.1.1.dist-info/METADATA,sha256=IxnSOCrX-M6DG4WknIO7XRoQ-N7rBQ5ZUdFcd5MBiZQ,1059
-fast_clean-1.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fast_clean-1.1.1.dist-info/top_level.txt,sha256=QfsGs-QLmPCZWWPFOukD0zhMnokH68FoO2KeObl6ZIA,11
-fast_clean-1.1.1.dist-info/RECORD,,
+fast_clean-1.2.0.dist-info/METADATA,sha256=nnsHb099wnCfTNJ9DGPAfV_c_5SkPA2XLFefwi-11V0,1245
+fast_clean-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fast_clean-1.2.0.dist-info/top_level.txt,sha256=QfsGs-QLmPCZWWPFOukD0zhMnokH68FoO2KeObl6ZIA,11
+fast_clean-1.2.0.dist-info/RECORD,,

fast_clean/tools/__init__.py

@@ -1,6 +0,0 @@
-"""
-Пакет, содержащий команды Typer.
-"""
-
-from .cryptography import use_cryptography as use_cryptography
-from .load_seed import use_load_seed as use_load_seed

fast_clean/tools/cryptography.py

@@ -1,52 +0,0 @@
-"""
-Модуль, содержащий команды криптографии для шифрования секретных параметров.
-"""
-
-from typing import Annotated
-
-import typer
-
-from fast_clean.container import get_container
-from fast_clean.services import CryptographicAlgorithmEnum, CryptographyServiceFactory
-from fast_clean.utils import typer_async
-
-
-@typer_async
-async def encrypt(
-    data: Annotated[str, typer.Argument(help='Данные для шифровки.')],
-    algorithm: Annotated[
-        CryptographicAlgorithmEnum, typer.Option(help='Криптографический алгоритм')
-    ] = CryptographicAlgorithmEnum.AES_GCM,
-) -> None:
-    """
-    Зашифровываем данные.
-    """
-    async with get_container() as container:
-        cryptography_service_factory = await container.get(CryptographyServiceFactory)
-        cryptography_service = await cryptography_service_factory.make(algorithm)
-        print(cryptography_service.encrypt(data))
-
-
-@typer_async
-async def decrypt(
-    data: Annotated[str, typer.Argument(help='Данные для расшифровки.')],
-    algorithm: Annotated[
-        CryptographicAlgorithmEnum, typer.Option(help='Криптографический алгоритм')
-    ] = CryptographicAlgorithmEnum.AES_GCM,
-) -> None:
-    """
-    Расшифровываем данные.
-    """
-    async with get_container() as container:
-        cryptography_service_factory = await container.get(CryptographyServiceFactory)
-        cryptography_service = await cryptography_service_factory.make(algorithm)
-        print(cryptography_service.decrypt(data))
-
-
-def use_cryptography(app: typer.Typer) -> None:
-    """
-    Регистрируем команды криптографии для шифрования секретных параметров.
-    """
-
-    app.command()(encrypt)
-    app.command()(decrypt)

fast_clean/tools/load_seed.py

@@ -1,31 +0,0 @@
-"""
-Модуль, содержащий команды загрузки данных из файлов.
-"""
-
-from typing import Annotated
-
-import typer
-
-from fast_clean.container import get_container
-from fast_clean.services import SeedService
-from fast_clean.utils import typer_async
-
-
-@typer_async
-async def load_seed(
-    path: Annotated[str | None, typer.Argument(help='Путь к директории для загрузки данных.')] = None,
-) -> None:
-    """
-    Загружаем данные из файлов.
-    """
-    async with get_container() as container:
-        seed_service = await container.get(SeedService)
-        await seed_service.load_data(path)
-
-
-def use_load_seed(app: typer.Typer) -> None:
-    """
-    Регистрируем команды загрузки данных из файлов.
-    """
-
-    app.command()(load_seed)

fast_clean/use_cases.py

@@ -1,38 +0,0 @@
-"""
-Модуль, содержащий варианты использования.
-"""
-
-from __future__ import annotations
-
-from types import new_class
-from typing import Any, Protocol, TypeVar, cast
-
-UseCaseResultSchemaType = TypeVar('UseCaseResultSchemaType', covariant=True)
-
-
-class UseCaseProtocol(Protocol[UseCaseResultSchemaType]):
-    """
-    Протокол варианта использования.
-    """
-
-    async def __call__(self) -> UseCaseResultSchemaType:
-        """
-        Вызываем вариант использования.
-        """
-        ...
-
-    def __class_getitem__(cls, params: type | tuple[type, ...]) -> type:
-        """
-        Создаем уникальный класс.
-
-        По умолчанию одинаковые обобщенные классы указывают на один и тот же _GenericAlias.
-        Из-за данного поведения поиск по типу становится невозможным.
-
-            UseCaseA = UseCaseProtocol[None]
-            UseCaseB = UseCaseProtocol[None]
-            assert UseCaseA is UseCaseB
-
-        Поэтому вместо _GenericAlias возвращаем уникального наследника.
-        """
-        generic_alias = cast(Any, super()).__class_getitem__(params)
-        return new_class(cls.__name__, (generic_alias,))