architectonics 0.0.12__tar.gz → 0.0.14__tar.gz

{architectonics-0.0.12 → architectonics-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: architectonics
-Version: 0.0.12
+Version: 0.0.14
 Summary: 
 Author: Your Name
 Author-email: you@example.com

architectonics-0.0.14/architectonics/common/consts/roles_dict.py

@@ -0,0 +1,7 @@
+from enum import Enum
+
+
+class Roles(str, Enum):
+    SUPER_ADMIN = "SuperAdmin"
+    TEACHER = "Teacher"
+    STUDENT = "Student"

architectonics-0.0.14/architectonics/common/consts/super_admin_user.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class SuperAdminUser:
+    id: str = "fb0c95e7-8608-4722-a7e4-04e11f9f1be8"
+    first_name: str = "Super"
+    last_name: str = "User"

architectonics-0.0.12/architectonics/models/abstract_base_model.py → architectonics-0.0.14/architectonics/common/entities/base_entity.py

@@ -3,11 +3,12 @@ import uuid
 from sqlalchemy import Column, DateTime, String
 from sqlalchemy.orm import as_declarative
 
-from architectonics.utils import get_current_datetime
+from architectonics.common.interfaces.base_entity_interface import BaseEntityInterface
+from architectonics_old.utils import get_current_datetime
 
 
 @as_declarative()
-class AbstractBaseModel:
+class BaseEntity(BaseEntityInterface):
     __abstract__ = True
 
     id = Column(

architectonics-0.0.14/architectonics/common/enums/step_types.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class StepTypes(int, Enum):
+    TEXT_STEP = 1
+    VIDEO_STEP = 2

architectonics-0.0.14/architectonics/common/interfaces/base_entity_interface.py

@@ -0,0 +1,19 @@
+from abc import ABC, abstractmethod
+from datetime import datetime
+from typing import ClassVar
+
+
+class BaseEntityInterface(ABC):
+    PK_FIELD: ClassVar[str]
+
+    @property
+    @abstractmethod
+    def id(self) -> str: ...
+
+    @property
+    @abstractmethod
+    def created_at(self) -> datetime: ...
+
+    @property
+    @abstractmethod
+    def updated_at(self) -> datetime: ...

architectonics-0.0.14/architectonics/common/interfaces/base_model_interface.py

@@ -0,0 +1,17 @@
+from abc import ABC, abstractmethod
+from datetime import datetime
+
+
+class BaseModelInterface(ABC):
+
+    @property
+    @abstractmethod
+    def id(self) -> str: ...
+
+    @property
+    @abstractmethod
+    def created_at(self) -> datetime: ...
+
+    @property
+    @abstractmethod
+    def updated_at(self) -> datetime: ...

architectonics-0.0.14/architectonics/common/interfaces/user_context_interface.py

@@ -0,0 +1,13 @@
+from abc import ABC, abstractmethod
+from typing import Iterable
+
+
+class UserContextInterface(ABC):
+
+    @property
+    @abstractmethod
+    def id(self) -> str: ...
+
+    @property
+    @abstractmethod
+    def roles(self) -> Iterable[str]: ...

architectonics-0.0.14/architectonics/common/models/base_model.py

@@ -0,0 +1,22 @@
+from dataclasses import dataclass, field
+from datetime import datetime
+import uuid
+
+from architectonics.common.interfaces.base_model_interface import BaseModelInterface
+
+
+@dataclass
+class BaseModel(BaseModelInterface):
+    id: str = field(
+        default_factory=lambda: str(
+            uuid.uuid4(),
+        ),
+    )
+
+    created_at: datetime = field(
+        default_factory=datetime.utcnow,
+    )
+
+    updated_at: datetime = field(
+        default_factory=datetime.utcnow,
+    )

architectonics-0.0.14/architectonics/common/models/error_message.py

@@ -0,0 +1,6 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class ErrorMessage:
+    message: str

architectonics-0.0.12/architectonics/config/base_database_settings.py → architectonics-0.0.14/architectonics/core/config/application_settings.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel
 load_dotenv()
 
 
-class BaseDatabaseSettings(BaseModel):
+class ApplicationSettings(BaseModel):
     DEBUG: bool = os.getenv("DEBUG", "False").lower() == "true"
 
     DATABASE_PREFIX: str = "postgresql+asyncpg"
@@ -22,4 +22,4 @@ class BaseDatabaseSettings(BaseModel):
     )
 
 
-base_database_settings = BaseDatabaseSettings()
+application_settings = ApplicationSettings()

{architectonics-0.0.12/architectonics → architectonics-0.0.14/architectonics/core/factory}/factory.py

@@ -1,14 +1,14 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
-from architectonics.config.base_database_settings import base_database_settings
+from architectonics.core.config.application_settings import application_settings
 
 
 class BaseAppFactory:
     @classmethod
     def create(cls, title) -> FastAPI:
         app = FastAPI(
-            debug=base_database_settings.DEBUG,
+            debug=application_settings.DEBUG,
             title=title,
             docs_url="/docs/",
         )

architectonics-0.0.14/architectonics/infrastructure/config/database_settings.py

@@ -0,0 +1,23 @@
+import os
+
+from dotenv import load_dotenv
+from pydantic import BaseModel
+
+load_dotenv()
+
+
+class DatabaseSettings(BaseModel):
+    DATABASE_PREFIX: str = "postgresql+asyncpg"
+
+    POSTGRES_USER: str = os.getenv("POSTGRES_USER")
+    POSTGRES_PASSWORD: str = os.getenv("POSTGRES_PASSWORD")
+    POSTGRES_HOST: str = os.getenv("POSTGRES_HOST")
+    POSTGRES_PORT: int = os.getenv("POSTGRES_PORT")
+    POSTGRES_DATABASE_NAME: str = os.getenv("POSTGRES_DATABASE_NAME")
+
+    DATABASE_CONNECTION_STRING: str = (
+        f"{DATABASE_PREFIX}://{POSTGRES_USER}:" f"{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DATABASE_NAME}"
+    )
+
+
+database_settings = DatabaseSettings()

{architectonics-0.0.12 → architectonics-0.0.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "architectonics"
-version = "0.0.12"
+version = "0.0.14"
 description = ""
 authors = ["Your Name <you@example.com>"]
 

{architectonics-0.0.12 → architectonics-0.0.14}/setup.py

@@ -3,12 +3,17 @@ from setuptools import setup
 
 packages = \
 ['architectonics',
- 'architectonics.config',
- 'architectonics.models',
- 'architectonics.repositories',
- 'architectonics.schemas',
- 'architectonics.services',
- 'architectonics.views']
+ 'architectonics.common.consts',
+ 'architectonics.common.entities',
+ 'architectonics.common.enums',
+ 'architectonics.common.interfaces',
+ 'architectonics.common.models',
+ 'architectonics.core',
+ 'architectonics.core.config',
+ 'architectonics.core.factory',
+ 'architectonics.core.repositories',
+ 'architectonics.infrastructure',
+ 'architectonics.infrastructure.config']
 
 package_data = \
 {'': ['*']}
@@ -25,7 +30,7 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'architectonics',
-    'version': '0.0.12',
+    'version': '0.0.14',
     'description': '',
     'long_description': None,
     'author': 'Your Name',

architectonics-0.0.12/architectonics/config/database.py

@@ -1,16 +0,0 @@
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
-from sqlalchemy.orm import sessionmaker
-
-from architectonics.config.base_database_settings import base_database_settings
-
-engine = create_async_engine(
-    base_database_settings.DATABASE_CONNECTION_STRING,
-    future=True,
-    echo=base_database_settings.DEBUG,
-)
-
-session = sessionmaker(
-    bind=engine,
-    class_=AsyncSession,
-    expire_on_commit=False,
-)

architectonics-0.0.12/architectonics/repositories/exceptions.py

@@ -1,18 +0,0 @@
-class RepositoryException(Exception):
-    """Base class for all repository exceptions."""
-
-
-class ObjectNotFoundRepositoryException(RepositoryException):
-    """Exception raised when can't find a row."""
-
-
-class ForeignKeyViolationRepositoryException(RepositoryException):
-    """Exception raised when foreign key constraint fails."""
-
-
-class ObjectAlreadyExistsRepositoryException(RepositoryException):
-    """Exception raised when unique constraint failes."""
-
-
-class IntegrityErrorRepositoryException(RepositoryException):
-    """Exception raised when integrity constraint fails."""

architectonics-0.0.12/architectonics/repositories/repository.py

@@ -1,151 +0,0 @@
-from abc import ABC
-from typing import Callable
-
-from asyncpg.exceptions import ForeignKeyViolationError
-from sqlalchemy import delete, select, update
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from architectonics.config.database import session
-from architectonics.models.abstract_base_model import AbstractBaseModel
-from architectonics.repositories.exceptions import (
-    ForeignKeyViolationRepositoryException,
-    IntegrityErrorRepositoryException,
-    ObjectAlreadyExistsRepositoryException,
-    ObjectNotFoundRepositoryException,
-)
-
-
-class AbstractBaseRepository(ABC):
-    _model: type[AbstractBaseModel] = NotImplemented
-    _session: Callable = session
-    _integrity_error: type[IntegrityError] = IntegrityError
-
-    def get_session(self) -> AsyncSession:
-        return self._session()
-
-    @property
-    def model_fields(self):
-        return self._model.__table__.columns
-
-    async def create_model(
-        self,
-        values: dict[str, any],
-    ) -> AbstractBaseModel:
-
-        model = self._model(
-            **values,
-        )
-
-        async with self.get_session() as session:
-
-            session.add(model)
-
-            try:
-                await session.commit()
-            except self._integrity_error as e:
-                raise ObjectAlreadyExistsRepositoryException(e)
-
-            return model
-
-    async def get_model(
-        self,
-        model_id: str,
-    ) -> AbstractBaseModel:
-
-        statement = select(
-            self._model,
-        ).where(
-            self._model.id == model_id,
-        )
-
-        async with self.get_session() as session:
-
-            result = await session.execute(
-                statement=statement,
-            )
-
-            model = result.scalars().first()
-
-            if model is None:
-                raise ObjectNotFoundRepositoryException()
-
-            return model
-
-    async def update_model(
-        self,
-        model_id: str,
-        values: dict[str, any],
-    ) -> AbstractBaseModel:
-
-        filtered_values = {k: v for k, v in values.items() if v is not None}
-
-        statement = (
-            update(
-                self._model,
-            )
-            .where(
-                self._model.id == model_id,
-            )
-            .values(
-                **filtered_values,
-            )
-            .returning(
-                self._model,
-            )
-        )
-
-        async with self.get_session() as session:
-            try:
-                result = await session.execute(
-                    statement=statement,
-                )
-                await session.commit()
-            except self._integrity_error as e:
-
-                orig = getattr(e.orig, "__cause__", None)
-
-                if isinstance(orig, ForeignKeyViolationError):
-                    raise ForeignKeyViolationRepositoryException()
-
-                raise IntegrityErrorRepositoryException(e)
-
-            model = result.scalars().first()
-
-            if model is None:
-                raise ObjectNotFoundRepositoryException()
-
-            return model
-
-    async def delete_model(
-        self,
-        model_id: str,
-    ) -> None:
-
-        statement = delete(
-            self._model,
-        ).where(
-            self._model.id == model_id,
-        )
-
-        async with self.get_session() as session:
-            await session.execute(statement)
-            await session.commit()
-
-    async def get_models_list(
-        self,
-    ) -> list[AbstractBaseModel]:
-
-        statement = select(
-            self._model,
-        )
-
-        async with self.get_session() as session:
-
-            result = await session.execute(
-                statement=statement,
-            )
-
-            models = result.scalars().all()
-
-            return models

architectonics-0.0.12/architectonics/schemas/response_schemas.py

@@ -1,21 +0,0 @@
-from pydantic import BaseModel, Field
-
-
-class ObjectNotFoundResponseSchema(BaseModel):
-    detail: str = Field()
-
-
-class ObjectAlreadyExistsResponseSchema(BaseModel):
-    detail: str = Field()
-
-
-class ObjectDeletedResponseSchema(BaseModel):
-    detail: str = Field()
-
-
-class NotImplementedResponseSchema(BaseModel):
-    detail: str = Field()
-
-
-class UnauthorizedResponseSchema(BaseModel):
-    detail: str = Field()

architectonics-0.0.12/architectonics/services/schemas.py

@@ -1,21 +0,0 @@
-from pydantic import BaseModel
-
-
-class AbstractModelCreateSchema(BaseModel):
-    pass
-
-
-class AbstractModelCreateErrorsSchema(BaseModel):
-    pass
-
-
-class AbstractModelGetSchema(BaseModel):
-    pass
-
-
-class AbstractModelUpdateSchema(BaseModel):
-    pass
-
-
-class AbstractModelUpdateErrorsSchema(BaseModel):
-    pass

architectonics-0.0.12/architectonics/services/service.py

@@ -1,147 +0,0 @@
-from starlette.status import HTTP_200_OK, HTTP_204_NO_CONTENT, HTTP_404_NOT_FOUND, HTTP_409_CONFLICT, HTTP_422_UNPROCESSABLE_ENTITY
-
-from architectonics.models.abstract_base_model import AbstractBaseModel
-from architectonics.repositories.exceptions import (
-    ForeignKeyViolationRepositoryException,
-    IntegrityErrorRepositoryException,
-    ObjectAlreadyExistsRepositoryException,
-    ObjectNotFoundRepositoryException,
-)
-from architectonics.repositories.repository import AbstractBaseRepository
-from architectonics.services.schemas import (
-    AbstractModelCreateSchema,
-    AbstractModelUpdateSchema,
-)
-from architectonics.services.types import ErrorsType, StatusCodeType
-
-
-class AbstractBaseService:
-    _repository: AbstractBaseRepository = NotImplemented
-
-    async def validate(self, **kwargs) -> dict[str, any]:
-
-        if not kwargs:
-            return {}
-
-        attrs = {field: value for field, value in kwargs.items() if field in self._repository.model_fields}
-
-        return attrs
-
-    async def _validate_values(self, **kwargs) -> tuple[dict[str, any], dict[str, list[str]]]:
-
-        errors = {}
-
-        for key, value in kwargs.items():
-            validation_method = f"validate_{key}"
-
-            if hasattr(self, validation_method):
-                result, error = getattr(
-                    self,
-                    validation_method,
-                )(
-                    value,
-                    kwargs,
-                )
-
-                if not result:
-                    errors[key] = errors.get(key, []) + error
-
-        attrs = await self.validate(
-            **kwargs,
-        )
-
-        return attrs, errors
-
-    async def create_model(
-        self,
-        create_schema: AbstractModelCreateSchema,
-    ) -> tuple[AbstractBaseModel | None, ErrorsType, StatusCodeType]:
-
-        schema_dict = create_schema.model_dump()
-
-        attrs, errors = await self._validate_values(
-            **schema_dict,
-        )
-
-        if errors:
-            return None, errors, HTTP_422_UNPROCESSABLE_ENTITY
-
-        try:
-            model = await self._repository.create_model(
-                values=attrs,
-            )
-        except ObjectAlreadyExistsRepositoryException:
-            return None, "object_already_exist", HTTP_409_CONFLICT
-
-        return model, None, HTTP_200_OK
-
-    async def get_model(
-        self,
-        model_id: str,
-    ) -> tuple[AbstractBaseModel | None, ErrorsType, StatusCodeType]:
-
-        try:
-            model = await self._repository.get_model(
-                model_id=model_id,
-            )
-        except ObjectNotFoundRepositoryException:
-            return None, "object_not_found", HTTP_404_NOT_FOUND
-
-        return model, None, HTTP_200_OK
-
-    async def update_model(
-        self,
-        model_id: str,
-        update_schema: AbstractModelUpdateSchema,
-    ) -> tuple[AbstractBaseModel | None, ErrorsType, StatusCodeType]:
-
-        schema_dict = update_schema.model_dump(
-            by_alias=False,
-        )
-
-        attrs, errors = await self._validate_values(
-            **schema_dict,
-        )
-
-        if errors:
-            return None, errors, HTTP_422_UNPROCESSABLE_ENTITY
-
-        try:
-            model = await self._repository.update_model(
-                model_id=model_id,
-                values=attrs,
-            )
-        except ForeignKeyViolationRepositoryException as e:
-            return None, f"{e}", HTTP_422_UNPROCESSABLE_ENTITY
-        except IntegrityErrorRepositoryException as e:
-            return None, f"{e}", HTTP_404_NOT_FOUND
-        except ObjectNotFoundRepositoryException:
-            return None, "object_not_found", HTTP_404_NOT_FOUND
-
-        return model, None, HTTP_200_OK
-
-    async def delete_model(
-        self,
-        model_id: str,
-    ) -> tuple[None, ErrorsType, StatusCodeType]:
-
-        _, errors, status_code = await self.get_model(
-            model_id=model_id,
-        )
-
-        if errors:
-            return None, errors, status_code
-
-        await self._repository.delete_model(
-            model_id=model_id,
-        )
-
-        return None, None, HTTP_204_NO_CONTENT
-
-    async def get_models_list(
-        self,
-    ) -> tuple[list[AbstractBaseModel], ErrorsType, StatusCodeType]:
-
-        models = await self._repository.get_models_list()
-
-        return models, None, HTTP_200_OK

architectonics-0.0.12/architectonics/services/types.py

@@ -1,4 +0,0 @@
-from typing import TypeAlias
-
-ErrorsType = str | dict[str, list[str]] | None
-StatusCodeType: TypeAlias = int

architectonics-0.0.12/architectonics/services/user_auth_service.py

@@ -1,52 +0,0 @@
-from uuid import UUID
-
-from fastapi import Depends, Header, HTTPException
-from starlette import status
-
-
-def get_user_id(
-    x_user_id: str = Header(
-        alias="X-User-Id",
-        description="Идентификатор пользователя",
-    ),
-) -> str:
-    if not x_user_id:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="X-User-Id header is required",
-        )
-
-    try:
-        _ = UUID(x_user_id, version=4)  # version=4 для проверки UUID v4
-    except ValueError:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="not_valid_uuid",
-        )
-
-    return x_user_id
-
-
-def get_user_roles(
-    x_user_roles: str = Header(
-        alias="X-User-Roles",
-        description="Роли пользователя",
-    ),
-) -> str:
-    if not x_user_roles:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="X-User-Roles header is required",
-        )
-
-    return x_user_roles.split(",")
-
-
-class UserAuthService:
-    def __init__(
-        self,
-        user_id: str = Depends(get_user_id),
-        user_roles: list[str] = Depends(get_user_roles),
-    ):
-        self.user_id = user_id
-        self.user_roles = user_roles

architectonics-0.0.12/architectonics/utils.py

@@ -1,5 +0,0 @@
-import datetime
-
-
-def get_current_datetime():
-    return datetime.datetime.utcnow()

architectonics-0.0.12/architectonics/views/ping.py

@@ -1,11 +0,0 @@
-from fastapi import APIRouter
-
-ping_router = APIRouter()
-
-
-@ping_router.get(
-    "/ping/",
-    tags=["system"],
-)
-async def ping():
-    return {"ping": "pong"}