обавлены миксины, базовые классы sqlalchemy. доработана зависимость contextified_transactional_session

Author: albertalexandrov

fastapi_django/db/models/base.py

@@ -1,16 +1,41 @@
-from typing import Self
+from typing import Self, Any
+from uuid import uuid4, UUID
 
-from sqlalchemy import MetaData
+from sqlalchemy import MetaData, BigInteger, SmallInteger
 from sqlalchemy.ext.asyncio import AsyncAttrs
-from sqlalchemy.orm import DeclarativeBase
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 metadata = MetaData()
 
 
 class Model(AsyncAttrs, DeclarativeBase):
     metadata = metadata
 
-    def update(self, **values) -> Self:
+    def update(self, **values: Any) -> Self:
         for key, value in values.items():
             setattr(self, key, value)
         return self
+
+
+class UUIDv4Base(Model):
+    __abstract__ = True
+
+    id: Mapped[UUID] = mapped_column(default=uuid4, primary_key=True)
+
+
+class IntBase(Model):
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+
+
+class BigIntBase(Model):
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=False)
+
+
+class SmallIntBase(Model):
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(SmallInteger, primary_key=True, autoincrement=False)

fastapi_django/db/models/mixins.py

@@ -0,0 +1,16 @@
+from datetime import datetime
+
+from sqlalchemy import DateTime, func
+from sqlalchemy.orm import declarative_mixin, Mapped, mapped_column
+
+
+@declarative_mixin
+class CreatedAtMixin:
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), default=func.now(), server_default=func.now()
+    )
+
+
+@declarative_mixin
+class UpdatedAtMixin:
+    updated_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), onupdate=func.now())

fastapi_django/db/repositories/base.py

@@ -16,13 +16,16 @@ class BaseRepository(Generic[Model]):
     def __init__(self):
         if not self.model_cls:
             raise ImproperlyConfigured(f"Не задана модель в атрибуте `{self.__class__.__name__}.model_cls`")
-        self._session = session_context_var.get()
-        assert self._session is not None, "Сессия не определена. Используйте декоратор"
-        print(self._session)
         self._flush = False
         self._commit = False
         print(f"Инициировали репозиторий {self.__class__.__name__}")
 
+    @property
+    def _session(self):
+        session = session_context_var.get()
+        assert session is not None, "Сессия не определена. Используйте декоратор"
+        return session
+
     def _clone(self) -> Self:
         clone = self.__class__()
         clone._flush = self._flush

fastapi_django/db/sessions.py

@@ -1,8 +1,8 @@
 from contextlib import asynccontextmanager
 from contextvars import ContextVar
-from typing import Any, AsyncGenerator
+from typing import Any
 
-from sqlalchemy.ext.asyncio import async_sessionmaker, AsyncSession
+from sqlalchemy.ext.asyncio import async_sessionmaker
 
 from fastapi_django.db import engine
 
@@ -32,6 +32,7 @@ async def contextified_transactional_session(**kw: Any):
     token = session_context_var.set(session)
     try:
         yield session
+        await session.flush()
         await transaction.commit()
     except Exception as e:
         await transaction.rollback()

fastapi_django/sqlalchemy/__init__.py

@@ -10,7 +10,7 @@ check_untyped_defs = true
 
 [tool.poetry]
 name = "fastapi-django"
-version = "0.19.0"
+version = "0.20.5"
 description = ""
 authors = ["albertalexandrov <[email protected]>"]
 packages = [{include = "fastapi_django"}]