yaddd-sqlalchemy 0.1.1__tar.gz → 0.2.0__tar.gz

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/.gitignore

@@ -140,10 +140,14 @@ venv.bak/
 # mkdocs documentation
 /site
 
+# ruff
+.ruff_cache/
+
 # mypy
 .mypy_cache/
-.dmypy.json
-dmypy.json
+
+# ty
+.ty/
 
 # Pyre type checker
 .pyre/

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: yaddd-sqlalchemy
-Version: 0.1.1
+Version: 0.2.0
 Summary: SQLAlchemy integration for yaddd: SqlCrudRepository, SqlUnitOfWork, VOTypeDecorator
 Project-URL: Homepage, https://github.com/netstuff/yaddd
 Author-email: Yuri Andreev <andreev.jr@gmail.com>
@@ -17,7 +17,7 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.12
 Requires-Dist: sqlalchemy[asyncio]>=2.0
-Requires-Dist: yaddd>=0.3
+Requires-Dist: yaddd>=0.5
 Description-Content-Type: text/markdown
 
 # yaddd-sqlalchemy

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/pyproject.toml

@@ -19,10 +19,10 @@ classifiers = [
 ]
 requires-python = '>=3.12'
 dependencies = [
-    "yaddd>=0.3",
+    "yaddd>=0.5",
     "sqlalchemy[asyncio]>=2.0",
 ]
-version = "0.1.1"
+version = "0.2.0"
 readme = 'README.md'
 
 [project.urls]

yaddd_sqlalchemy-0.2.0/src/yaddd_sqlalchemy/agents/manifest.toml

@@ -0,0 +1,20 @@
+schema = 1
+name = "yaddd-sqlalchemy"
+version = "0.2.0"
+
+[[relaxes]]
+rule = "IMPORTS_INFRASTRUCTURE"
+allow_add = ["sqlalchemy", "yaddd_sqlalchemy"]
+reason = "SqlCrudRepository, SqlUnitOfWork and VOTypeDecorator implement persistence ports."
+when = { dependency = "yaddd-sqlalchemy", specifier = ">=0.1" }
+
+[[restricts]]
+rule = "IMPORTS_APPLICATION"
+deny_add = ["sqlalchemy", "yaddd_sqlalchemy"]
+reason = "Application stays persistence-agnostic; only infrastructure may know SQLAlchemy."
+when = { dependency = "yaddd-sqlalchemy" }
+
+[rules.SQLALCHEMY_PERSISTENCE]
+layer = "infrastructure"
+kind = "guidance"
+doc = "rules/infrastructure.md"

yaddd_sqlalchemy-0.2.0/src/yaddd_sqlalchemy/agents/rules/infrastructure.md

@@ -0,0 +1,12 @@
+# SQLAlchemy persistence
+
+Additive to the base infrastructure rules. This pack relaxes exactly one import
+rule: infrastructure may use `sqlalchemy` and `yaddd_sqlalchemy`.
+
+- **Use `SqlCrudRepository`** for Core-based repositories and
+  `SqlUnitOfWork` for transaction boundaries. Do not commit inside a
+  repository.
+- **Use `VOTypeDecorator`** for columns that hold value objects, so values are
+  validated on the way in and on the way out.
+- **Keep SQLAlchemy out of `application`.** The pack also restricts that layer:
+  use cases depend on ports, not sessions or tables.

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/src/yaddd_sqlalchemy/repositories.py

@@ -5,11 +5,12 @@ from typing import Any, ClassVar
 
 from sqlalchemy import Column, Table, delete, insert, select, update
 from sqlalchemy.engine import Row
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
+
 from yaddd.domain.entities import AggregateRoot, PrimaryKey
 from yaddd.domain.repositories import CrudRepository
-from yaddd.exceptions import EntityNotFoundError
-
+from yaddd.exceptions import ConflictError, EntityNotFoundError
 from yaddd_sqlalchemy.session import SqlTransaction
 
 
@@ -79,18 +80,27 @@ class SqlCrudRepository[T: AggregateRoot](CrudRepository[T], ABC):
         return [self.to_domain(row) for row in result.all()]
 
     async def create(self, instance: T) -> T:
-        await self._session.execute(insert(self.table).values(**self.to_row(instance)))
+        try:
+            await self._session.execute(insert(self.table).values(**self.to_row(instance)))
+        except IntegrityError as exc:
+            raise ConflictError(str(exc)) from exc
         return instance
 
     async def update(self, instance: T) -> T:
         if await self.get(instance.pk) is None:
             raise EntityNotFoundError(f"{type(instance).__name__}({instance.pk})")
         stmt = update(self.table).where(self._pk_column == instance.pk).values(**self.to_row(instance))
-        await self._session.execute(stmt)
+        try:
+            await self._session.execute(stmt)
+        except IntegrityError as exc:
+            raise ConflictError(str(exc)) from exc
         return instance
 
     async def delete(self, pk: PrimaryKey) -> None:
-        await self._session.execute(delete(self.table).where(self._pk_column == pk))
+        try:
+            await self._session.execute(delete(self.table).where(self._pk_column == pk))
+        except IntegrityError as exc:
+            raise ConflictError(str(exc)) from exc
 
 
 class SqlTransactionBoundRepository[T: AggregateRoot](SqlCrudRepository[T], ABC):

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/src/yaddd_sqlalchemy/session.py

@@ -1,7 +1,10 @@
 """SQLAlchemy implementation of the application ``Session`` protocol."""
 
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
+
 from yaddd.application.session import Session
+from yaddd.exceptions import ConflictError
 from yaddd.infrastructure.transaction import BaseTransaction
 
 
@@ -28,9 +31,12 @@ class SqlSession(Session):
         await self._session.__aenter__()
 
     async def commit(self) -> None:
-        """Commit the current session."""
+        """Commit the current session, translating integrity failures."""
         if self._session is not None:
-            await self._session.commit()
+            try:
+                await self._session.commit()
+            except IntegrityError as exc:
+                raise ConflictError(str(exc)) from exc
 
     async def rollback(self) -> None:
         """Roll back the current session."""

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/src/yaddd_sqlalchemy/uow.py

@@ -5,7 +5,6 @@ from typing import Self, TypeVar
 
 from yaddd.application.uow import UnitOfWork
 from yaddd.domain.entities import AggregateRoot
-
 from yaddd_sqlalchemy.session import SqlTransaction
 
 

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/src/yaddd_sqlalchemy/value_objects.py

@@ -4,6 +4,7 @@ from typing import Any, ClassVar
 
 from sqlalchemy.engine import Dialect
 from sqlalchemy.types import TypeDecorator
+
 from yaddd.domain.value_object import ValueObject
 
 

{yaddd_sqlalchemy-0.1.1 → yaddd_sqlalchemy-0.2.0}/tests/test_uow.py

@@ -5,7 +5,7 @@ import pytest
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker
 
-from yaddd import DomainEvent, InMemoryEventPublisher
+from yaddd import ConflictError, DomainEvent, InMemoryEventPublisher
 from yaddd_sqlalchemy import SqlSession, SqlTransaction, SqlTransactionBoundRepository, SqlUnitOfWork
 
 from conftest import Order, orders_table
@@ -124,3 +124,16 @@ async def test_commit_publishes_tracked_events(engine: AsyncEngine):
 
     assert len(events) == 1
     assert isinstance(events[0], OrderPlaced)
+
+
+async def test_duplicate_commit_raises_conflict(engine: AsyncEngine):
+    order_id = uuid4().hex
+
+    async with build_uow(engine) as uow:
+        await uow.repos.orders.create(Order(id=order_id, status="new", total=10))
+        await uow.commit()
+
+    with pytest.raises(ConflictError):
+        async with build_uow(engine) as uow:
+            await uow.repos.orders.create(Order(id=order_id, status="new", total=10))
+            await uow.commit()