apexdevkit 1.9.6__tar.gz → 1.9.8__tar.gz

{apexdevkit-1.9.6 → apexdevkit-1.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apexdevkit
-Version: 1.9.6
+Version: 1.9.8
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

apexdevkit-1.9.8/apexdevkit/repository/decorator.py

@@ -0,0 +1,36 @@
+from dataclasses import dataclass
+from typing import Generic, Iterator, TypeVar
+
+from apexdevkit.repository import Repository
+
+ItemT = TypeVar("ItemT")
+IdT = TypeVar("IdT", contravariant=True)
+
+
+@dataclass
+class RepositoryDecorator(Generic[IdT, ItemT]):
+    inner: Repository[IdT, ItemT]
+
+    def create(self, item: ItemT) -> ItemT:
+        return self.inner.create(item)
+
+    def create_many(self, items: list[ItemT]) -> list[ItemT]:
+        return self.inner.create_many(items)
+
+    def read(self, item_id: IdT) -> ItemT:
+        return self.inner.read(item_id)
+
+    def update(self, item: ItemT) -> None:
+        self.inner.update(item)
+
+    def update_many(self, items: list[ItemT]) -> None:
+        self.inner.update_many(items)
+
+    def delete(self, item_id: IdT) -> None:
+        self.inner.delete(item_id)
+
+    def __iter__(self) -> Iterator[ItemT]:
+        return self.inner.__iter__()
+
+    def __len__(self) -> int:
+        return self.inner.__len__()

{apexdevkit-1.9.6 → apexdevkit-1.9.8}/apexdevkit/repository/mongo.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, ContextManager, Dict, Generic, Iterator, Protocol, TypeVar
+from typing import Any, ContextManager, Generic, Iterator, Protocol, TypeVar
 
 from pymongo import MongoClient, ReturnDocument
 from pymongo.collection import Collection
-from pymongo.results import DeleteResult, InsertOneResult
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.formatter import Formatter
@@ -22,15 +21,22 @@ ItemT = TypeVar("ItemT", bound=_Item)
 
 @dataclass
 class MongoRepository(Generic[ItemT]):
-    database: MongoDatabase
+    connector: MongoConnector
+    database_name: str
+    collection_name: str
     formatter: Formatter[dict[str, Any], ItemT]
 
+    def collection(self, client: MongoClient[Any]) -> Collection[Any]:
+        return client[self.database_name][self.collection_name]
+
     def __iter__(self) -> Iterator[ItemT]:
-        for raw in self.database:
-            yield self.formatter.load(raw)
+        with self.connector.connect() as client:
+            for raw in self.collection(client).find():
+                yield self.formatter.load(raw)
 
     def __len__(self) -> int:
-        return len(self.database)
+        with self.connector.connect() as client:
+            return self.collection(client).count_documents({})
 
     def create(self, item: ItemT) -> ItemT:
         try:
@@ -39,70 +45,40 @@ class MongoRepository(Generic[ItemT]):
                 lambda i: f"_Item with id<{i.id}> already exists."
             )
         except DoesNotExistError:
-            self.database.create(self.formatter.dump(item))
-            return item
+            with self.connector.connect() as client:
+                self.collection(client).insert_one(self.formatter.dump(item))
+                return item
 
     def create_many(self, items: list[ItemT]) -> list[ItemT]:
         return [self.create(item) for item in items]
 
     def read(self, item_id: str) -> ItemT:
-        raw = self.database.read(item_id)
+        with self.connector.connect() as client:
+            raw = self.collection(client).find_one({"id": item_id})
 
-        if not raw:
-            raise DoesNotExistError(item_id)
+            if not raw:
+                raise DoesNotExistError(item_id)
 
-        return self.formatter.load(raw)
+            return self.formatter.load(dict(raw))
 
     def update(self, item: ItemT) -> None:
-        self.database.update(item.id, self.formatter.dump(item))
+        with self.connector.connect() as client:
+            self.collection(client).find_one_and_update(
+                {"id": item.id},
+                {"$set": self.formatter.dump(item)},
+                return_document=ReturnDocument.AFTER,
+            )
 
     def update_many(self, items: list[ItemT]) -> None:
         for item in items:
             self.update(item)
 
     def delete(self, item_id: str) -> None:
-        result = self.database.delete(item_id)
-        if result.deleted_count == 0:
-            raise DoesNotExistError(item_id)
-
-
-@dataclass
-class MongoDatabase:
-    connector: MongoConnector
-    database_name: str
-    collection_name: str
-
-    def collection(self, client: MongoClient[Any]) -> Collection[Any]:
-        return client[self.database_name][self.collection_name]
-
-    def __iter__(self) -> Iterator[Any]:
         with self.connector.connect() as client:
-            for raw in self.collection(client).find():
-                yield raw
-
-    def __len__(self) -> int:
-        with self.connector.connect() as client:
-            return self.collection(client).count_documents({})
+            result = self.collection(client).delete_one({"id": item_id})
 
-    def create(self, item: Dict[str, Any]) -> InsertOneResult:
-        with self.connector.connect() as client:
-            return self.collection(client).insert_one(item)
-
-    def read(self, item_id: str) -> Dict[str, Any] | None:
-        with self.connector.connect() as client:
-            return self.collection(client).find_one({"id": item_id})
-
-    def update(self, item_id: str, item: Dict[str, Any]) -> Any:
-        with self.connector.connect() as client:
-            return self.collection(client).find_one_and_update(
-                {"id": item_id},
-                {"$set": item},
-                return_document=ReturnDocument.AFTER,
-            )
-
-    def delete(self, item_id: str) -> DeleteResult:
-        with self.connector.connect() as client:
-            return self.collection(client).delete_one({"id": item_id})
+            if result.deleted_count == 0:
+                raise DoesNotExistError(item_id)
 
 
 class MongoConnector(Protocol):  # pragma: no cover

{apexdevkit-1.9.6 → apexdevkit-1.9.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.9.6"
+version = "1.9.8"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"