SARepo 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

SARepo/repo.py

@@ -13,7 +13,7 @@ class CrudRepository(Protocol, Generic[T]):
     def try_get(self, id_: Any, *, include_deleted: bool = False) -> Optional[T]: ...
     def add(self, entity: T) -> T: ...
     def update(self, entity: T) -> T: ...
-    def remove(self, entity: T) -> None: ...
+    def remove(self, entity: Optional[T] = None, id: Optional[Any] = None) -> bool: ...
     def delete_by_id(self, id_: Any) -> bool: ...
     def page(self, page: PageRequest, spec: Optional[Spec] = None, order_by=None, *, include_deleted: bool = False) -> Page[T]: ...
     def get_all_by_column(

SARepo/sa_repo.py

@@ -71,7 +71,13 @@ class SARepository(Generic[T]):
         self.session.refresh(entity)
         return entity
 
-    def remove(self, entity: T) -> None:
+    def remove(self, entity: Optional[T] = None, id: Optional[Any] = None) -> bool:
+        if entity is None and id is None:
+            raise ValueError("remove() requires either entity or id")
+    
+        if id is not None:
+            return self._delete_by_id(id)
+        
         insp = inspect(entity, raiseerr=False)
         if not (insp and (insp.persistent or insp.pending)):
             pk = getattr(entity, "id", None)
@@ -79,13 +85,15 @@ class SARepository(Generic[T]):
                 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
+                return False
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             self.session.delete(entity)
+            
+        return True
 
-    def delete_by_id(self, id_: Any) -> bool:
+    def _delete_by_id(self, id_: Any) -> bool:
         obj = self.session.get(self.model, id_)
         if not obj:
             return False
@@ -283,7 +291,13 @@ class SAAsyncRepository(Generic[T]):
         await self.session.refresh(entity)
         return entity
 
-    async def remove(self, entity: T) -> None:
+    async def remove(self, entity: Optional[T] = None, id: Optional[Any] = None) -> bool:
+        if entity is None and id is None:
+            raise ValueError("remove() requires either entity or id")
+    
+        if id is not None:
+            return await self._delete_by_id(id)
+        
         insp = inspect(entity, raiseerr=False)
         if not (insp and (insp.persistent or insp.pending)):
             pk = getattr(entity, "id", None)
@@ -291,13 +305,16 @@ class SAAsyncRepository(Generic[T]):
                 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
+                return False
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             await self.session.delete(entity)
+            
+        return True
 
-    async def delete_by_id(self, id_: Any) -> bool:
+    
+    async def _delete_by_id(self, id_: Any) -> bool:
         obj = await self.session.get(self.model, id_)
         if not obj:
             return False

{sarepo-0.1.5.dist-info → sarepo-0.1.6.dist-info}/METADATA

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

sarepo-0.1.6.dist-info/RECORD

@@ -0,0 +1,12 @@
+SARepo/__init__.py,sha256=tNYbuUDloC1qVnXq7uomS3jRcaPUvy0VEZiMdYR6x1M,183
+SARepo/base.py,sha256=UbAdZ9WYh_o93mrCVL3D8Q0tY_8mvm0HspO_L5m0GTQ,874
+SARepo/models.py,sha256=ypSmbKAijvNH4WjSeJBgyNT8mKa_e_7-I5kiNisjGAI,570
+SARepo/repo.py,sha256=q99K9odCVuxJ9HIKwgVpu3p9-hyzxmGlE-wkiCp9tbg,1820
+SARepo/sa_repo.py,sha256=iPJan94ALJ3N58aU1D6rgO6uhqLDUxcHXvORpQrAt9c,17258
+SARepo/specs.py,sha256=e-X1cCkva3e71M37hcfbjNDMezZAaOkkRaPToUzhEeU,687
+SARepo/uow.py,sha256=yPlvi7PoH9x2pLNt6hEin9zT5qG9axUKn_TkZcIuz1s,859
+sarepo-0.1.6.dist-info/licenses/LICENSE,sha256=px90NOQCrnZ77qoFT8IvAiNS1CXQ2OU27uVBKbki9DM,131
+sarepo-0.1.6.dist-info/METADATA,sha256=4Yfl0Eh0h8Sb2Lrs_DxZRfPJuZzGTg7-I9blRPva9aw,2691
+sarepo-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sarepo-0.1.6.dist-info/top_level.txt,sha256=0k952UYVZLIIv3kZzFlxI0yzBMusZo3-XCQtxms_kS0,7
+sarepo-0.1.6.dist-info/RECORD,,

sarepo-0.1.5.dist-info/RECORD

@@ -1,12 +0,0 @@
-SARepo/__init__.py,sha256=tNYbuUDloC1qVnXq7uomS3jRcaPUvy0VEZiMdYR6x1M,183
-SARepo/base.py,sha256=UbAdZ9WYh_o93mrCVL3D8Q0tY_8mvm0HspO_L5m0GTQ,874
-SARepo/models.py,sha256=ypSmbKAijvNH4WjSeJBgyNT8mKa_e_7-I5kiNisjGAI,570
-SARepo/repo.py,sha256=N_LaqguNE3Y_9vZBPBvqQreu-6Sy9-BZFR3-pZl5eT4,1777
-SARepo/sa_repo.py,sha256=iIscSTNoZGb8XMTY66_fiooWPVwGMOMYAL9BC_xS7bI,16691
-SARepo/specs.py,sha256=e-X1cCkva3e71M37hcfbjNDMezZAaOkkRaPToUzhEeU,687
-SARepo/uow.py,sha256=yPlvi7PoH9x2pLNt6hEin9zT5qG9axUKn_TkZcIuz1s,859
-sarepo-0.1.5.dist-info/licenses/LICENSE,sha256=px90NOQCrnZ77qoFT8IvAiNS1CXQ2OU27uVBKbki9DM,131
-sarepo-0.1.5.dist-info/METADATA,sha256=m9z_QHD-D1dN95nAGWvpFGAUT7hCad990Lb-nNS5two,2691
-sarepo-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sarepo-0.1.5.dist-info/top_level.txt,sha256=0k952UYVZLIIv3kZzFlxI0yzBMusZo3-XCQtxms_kS0,7
-sarepo-0.1.5.dist-info/RECORD,,