SARepo 0.1.0__tar.gz → 0.1.3__tar.gz

{sarepo-0.1.0 → sarepo-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SARepo
-Version: 0.1.0
+Version: 0.1.3
 Summary: Minimal, explicit Repository & Unit-of-Work layer over SQLAlchemy 2.x
 Author: nurbergenovv
 License: MIT

{sarepo-0.1.0 → sarepo-0.1.3}/SARepo/repo.py

@@ -1,14 +1,16 @@
 
-from typing import Generic, TypeVar, Type, Optional, Any, Protocol
+from typing import Generic, List, TypeVar, Type, Optional, Any, Protocol
 from .base import Page, PageRequest
 
 T = TypeVar("T")
 
 class CrudRepository(Protocol, Generic[T]):
     model: Type[T]
+    def getAll(self, limit: Optional[int]) -> List[T]: ...
     def get(self, id_: Any) -> T: ...
     def try_get(self, id_: Any) -> Optional[T]: ...
     def add(self, entity: T) -> T: ...
     def update(self, entity: T) -> T: ...
     def remove(self, entity: T) -> None: ...
+    def delete_by_id(self, id_: Any) -> bool: ...
     def page(self, page: PageRequest, spec=None, order_by=None) -> Page[T]: ...

{sarepo-0.1.0 → sarepo-0.1.3}/SARepo/sa_repo.py

@@ -1,8 +1,8 @@
 
-from typing import Type, Generic, TypeVar, Optional, Sequence, Any, Callable
+from typing import List, Type, Generic, TypeVar, Optional, Sequence, Any, Callable
 from sqlalchemy.orm import Session
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, func
+from sqlalchemy import inspect, select, func
 from .base import PageRequest, Page, NotFoundError
 
 T = TypeVar("T")
@@ -17,6 +17,13 @@ class SARepository(Generic[T]):
     def _select(self):
         return select(self.model)
 
+    def getAll(self, limit: Optional[int] = None) -> List[T]:
+        stmt = select(self.model)
+        if limit is not None:
+            stmt = stmt.limit(limit)
+        result = self.session.execute(stmt)
+        return result.scalars().all()
+    
     def get(self, id_: Any) -> T:
         obj = self.session.get(self.model, id_)
         if not obj:
@@ -38,11 +45,26 @@ class SARepository(Generic[T]):
         return entity
 
     def remove(self, entity: T) -> None:
+        insp = inspect(entity, raiseerr=False)
+        if not (insp and (insp.persistent or insp.pending)):
+            pk = getattr(entity, "id", None)
+            if pk is None:
+                raise ValueError("remove() needs a persistent entity or an entity with a primary key set")
+            entity = self.session.get(self.model, pk)
+            if entity is None:
+                return
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             self.session.delete(entity)
 
+    def delete_by_id(self, id_: Any) -> bool:
+        obj = self.session.get(self.model, id_)
+        if not obj:
+            return False
+        self.remove(obj)
+        return True
+
     def page(self, page: PageRequest, spec: Optional[Spec] = None, order_by=None) -> Page[T]:
         stmt = self._select()
         if spec:
@@ -62,6 +84,13 @@ class SAAsyncRepository(Generic[T]):
     def __init__(self, model: Type[T], session: AsyncSession):
         self.model = model
         self.session = session
+        
+    async def getAll(self, limit: Optional[int] = None) -> List[T]:
+        stmt = select(self.model)
+        if limit is not None:
+            stmt = stmt.limit(limit)
+        result = await self.session.execute(stmt)
+        return result.scalars().all()
 
     def _select(self):
         return select(self.model)
@@ -87,11 +116,26 @@ class SAAsyncRepository(Generic[T]):
         return entity
 
     async def remove(self, entity: T) -> None:
+        insp = inspect(entity, raiseerr=False)
+        if not (insp and (insp.persistent or insp.pending)):
+            pk = getattr(entity, "id", None)
+            if pk is None:
+                raise ValueError("remove() needs a persistent entity or an entity with a primary key set")
+            entity = await self.session.get(self.model, pk)
+            if entity is None:
+                return
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             await self.session.delete(entity)
 
+    async def delete_by_id(self, id_: Any) -> bool:
+        obj = await self.session.get(self.model, id_)
+        if not obj:
+            return False
+        await self.remove(obj)
+        return True
+
     async def page(self, page: PageRequest, spec: Optional[Spec] = None, order_by=None) -> Page[T]:
         stmt = self._select()
         if spec:

{sarepo-0.1.0 → sarepo-0.1.3}/SARepo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SARepo
-Version: 0.1.0
+Version: 0.1.3
 Summary: Minimal, explicit Repository & Unit-of-Work layer over SQLAlchemy 2.x
 Author: nurbergenovv
 License: MIT

{sarepo-0.1.0 → sarepo-0.1.3}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "SARepo"
-version = "0.1.0"
+version = "0.1.3"
 description = "Minimal, explicit Repository & Unit-of-Work layer over SQLAlchemy 2.x"
 readme = "README.md"
 requires-python = ">=3.11"

sarepo-0.1.3/tests/test_sync_basic.py

@@ -0,0 +1,73 @@
+import pytest
+from sqlalchemy import create_engine, String
+from sqlalchemy.orm import sessionmaker, DeclarativeBase, Mapped, mapped_column
+from SARepo.sa_repo import SARepository
+from SARepo.base import PageRequest, NotFoundError
+
+class Base(DeclarativeBase): pass
+
+class Item(Base):
+    __tablename__ = "items"
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(String(100), nullable=False)
+
+def test_crud_and_pagination():
+    engine = create_engine("sqlite+pysqlite:///:memory:", echo=False)
+    Base.metadata.create_all(engine)
+    SessionLocal = sessionmaker(bind=engine, expire_on_commit=False)
+
+    with SessionLocal() as session:
+        repo = SARepository(Item, session)
+        for i in range(25):
+            repo.add(Item(title=f"t{i}"))
+        session.commit()
+
+        page = repo.page(PageRequest(1, 10))
+        assert page.total == 25
+        assert len(page.items) == 10
+        assert page.page == 1
+        assert page.pages == 3
+        # проверим, что конкретные объекты есть
+        got = {it.title for it in page.items}
+        assert got.issubset({f"t{i}" for i in range(25)})
+
+def test_get_all():
+    engine = create_engine("sqlite+pysqlite:///:memory:", echo=False)
+    Base.metadata.create_all(engine)
+    SessionLocal = sessionmaker(bind=engine, expire_on_commit=False)
+
+    with SessionLocal() as session:
+        repo = SARepository(Item, session)
+        for i in range(10):
+            repo.add(Item(title=f"get-all-{i}"))
+        session.commit()
+
+        items = repo.getAll()
+        assert isinstance(items, list)
+        assert len(items) == 10
+        titles = {i.title for i in items}
+        assert titles == {f"get-all-{i}" for i in range(10)}
+        
+        items2 = repo.getAll(5)
+        assert isinstance(items2, list)
+        assert len(items2) == 5
+        titles = {i.title for i in items2}
+        assert titles == {f"get-all-{i}" for i in range(5)}
+
+def test_get_and_try_get():
+    engine = create_engine("sqlite+pysqlite:///:memory:", echo=False)
+    Base.metadata.create_all(engine)
+    SessionLocal = sessionmaker(bind=engine, expire_on_commit=False)
+
+    with SessionLocal() as session:
+        repo = SARepository(Item, session)
+        obj = repo.add(Item(title="one"))
+        session.commit()
+
+        same = repo.get(obj.id)
+        assert same.id == obj.id and same.title == "one"
+
+        assert repo.try_get(9999) is None
+
+        with pytest.raises(NotFoundError):
+            repo.get(9999)

sarepo-0.1.0/tests/test_sync_basic.py

@@ -1,30 +0,0 @@
-
-import pytest
-from sqlalchemy import create_engine, String
-from sqlalchemy.orm import sessionmaker, DeclarativeBase, Mapped, mapped_column
-from SARepoo.sa_repo import SARepository
-from SARepoo.base import PageRequest
-
-class Base(DeclarativeBase): pass
-
-class Item(Base):
-    __tablename__ = "items"
-    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    title: Mapped[str] = mapped_column(String(100))
-
-def test_crud_and_pagination():
-    engine = create_engine("sqlite+pysqlite:///:memory:", echo=False)
-    Base.metadata.create_all(engine)
-    SessionLocal = sessionmaker(bind=engine, expire_on_commit=False)
-
-    with SessionLocal() as session:
-        repo = SARepository(Item, session)
-        for i in range(25):
-            repo.add(Item(title=f"t{i}"))
-        session.commit()
-
-        page = repo.page(PageRequest(1, 10))
-        assert page.total == 25
-        assert len(page.items) == 10
-        assert page.page == 1
-        assert page.pages == 3