fast-clean 1.1.1__tar.gz → 1.2.0__tar.gz

{fast_clean-1.1.1 → fast_clean-1.2.0}/PKG-INFO

@@ -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.2.0/fast_clean/contrib/logging/enums.py

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

fast_clean-1.2.0/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-1.2.0/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-1.2.0/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-1.2.0/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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-1.1.1 → fast_clean-1.2.0}/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 → fast_clean-1.2.0}/fast_clean.egg-info/PKG-INFO

@@ -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 → fast_clean-1.2.0}/fast_clean.egg-info/SOURCES.txt

@@ -13,7 +13,6 @@ fast_clean/models.py
 fast_clean/py.typed
 fast_clean/redis.py
 fast_clean/settings.py
-fast_clean/use_cases.py
 fast_clean.egg-info/PKG-INFO
 fast_clean.egg-info/SOURCES.txt
 fast_clean.egg-info/dependency_links.txt
@@ -22,6 +21,14 @@ fast_clean.egg-info/top_level.txt
 fast_clean/contrib/__init__.py
 fast_clean/contrib/healthcheck/__init__.py
 fast_clean/contrib/healthcheck/router.py
+fast_clean/contrib/logging/__init__.py
+fast_clean/contrib/logging/enums.py
+fast_clean/contrib/logging/sentry.py
+fast_clean/contrib/monitoring/__init__.py
+fast_clean/contrib/monitoring/middleware.py
+fast_clean/contrib/monitoring/router.py
+fast_clean/contrib/sqlalchemy_utils/__init__.py
+fast_clean/contrib/sqlalchemy_utils/utils.py
 fast_clean/repositories/__init__.py
 fast_clean/repositories/cache/__init__.py
 fast_clean/repositories/cache/in_memory.py
@@ -54,9 +61,6 @@ fast_clean/services/transaction.py
 fast_clean/services/cryptography/__init__.py
 fast_clean/services/cryptography/aes.py
 fast_clean/services/cryptography/enums.py
-fast_clean/tools/__init__.py
-fast_clean/tools/cryptography.py
-fast_clean/tools/load_seed.py
 fast_clean/utils/__init__.py
 fast_clean/utils/process.py
 fast_clean/utils/pydantic.py

{fast_clean-1.1.1 → fast_clean-1.2.0}/fast_clean.egg-info/requires.txt

@@ -1,5 +1,7 @@
 aiofiles>=24.1.0
 aiokafka>=0.12.0
+aioprometheus>=23.12.0
+alembic>=1.16.2
 cryptography>=44.0.1
 dishka>=1.6.0
 fastapi>=0.115.8
@@ -8,10 +10,12 @@ faststream>=0.5.34
 flatten-dict>=0.4.2
 miniopy-async>=1.21.1
 overrides>=7.7.0
-psycopg>=3.2.4
+psycopg[binary]>=3.2.4
 pydantic>=2.10.6
 pydantic-settings>=2.8.0
 pyyaml>=6.0.2
+sentry-sdk>=2.32.0
+snakecase>=1.0.1
 sqlalchemy-utils>=0.41.2
 sqlalchemy[asyncio]>=2.0.38
 stringcase>=1.2.0

{fast_clean-1.1.1 → fast_clean-1.2.0}/pyproject.toml

@@ -1,16 +1,19 @@
 [project]
 name = "fast-clean"
-version = "1.1.1"
+version = "1.2.0"
 description = "FastAPI Clean Architecture implementation"
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 authors = [
     {name = "Luferov Victor", email = "luferovvs@yandex.ru"},
     {name = "Orlov Artem", email = "squakrazv@yandex.ru"},
+    {name = "Kashapov Rustam", email = "hardtechnik91@gmail.com"},
 ]
 dependencies = [
     "aiofiles>=24.1.0",
     "aiokafka>=0.12.0",
+    "aioprometheus>=23.12.0",
+    "alembic>=1.16.2",
     "cryptography>=44.0.1",
     "dishka>=1.6.0",
     "fastapi>=0.115.8",
@@ -19,10 +22,12 @@ dependencies = [
     "flatten-dict>=0.4.2",
     "miniopy-async>=1.21.1",
     "overrides>=7.7.0",
-    "psycopg>=3.2.4",
+    "psycopg[binary]>=3.2.4",
     "pydantic>=2.10.6",
     "pydantic-settings>=2.8.0",
     "pyyaml>=6.0.2",
+    "sentry-sdk>=2.32.0",
+    "snakecase>=1.0.1",
     "sqlalchemy-utils>=0.41.2",
     "sqlalchemy[asyncio]>=2.0.38",
     "stringcase>=1.2.0",
@@ -43,15 +48,12 @@ dev = [
     "pytest-sugar>=1.0.0",
     "pytest-xdist>=3.6.1",
     "ruff>=0.9.7",
+    "types-sqlalchemy-utils>=1.1.0",
 ]
 
 [tool.ruff.format]
 quote-style = "single"
 
-[tool.black]
-skip-string-normalization = true
-line-length = 120
-
 [tool.ruff]
 line-length = 120
 lint.extend-select = ["Q"]

{fast_clean-1.1.1 → fast_clean-1.2.0}/tests/test_db.py

@@ -41,16 +41,3 @@ class TestSessionManager:
         assert len(call_args) == 1
         assert str(call_args[0]) == str(sa.text('SET CONSTRAINTS ALL IMMEDIATE'))
         assert not session_manager.session.in_transaction()
-
-    @staticmethod
-    async def test_get_session_begin_nested(
-        session_manager: SessionManagerImpl,
-    ) -> None:
-        """
-        Тестируем запуск дочерней транзакции в методе `begin`.
-        """
-        async with session_manager.session.begin():
-            assert not session_manager.session.in_nested_transaction()
-            async with session_manager.get_session():
-                assert session_manager.session.in_nested_transaction()
-            assert not session_manager.session.in_nested_transaction()

fast_clean-1.1.1/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-1.1.1/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-1.1.1/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-1.1.1/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,))