apexdevkit 1.8.7__tar.gz → 1.8.9__tar.gz

{apexdevkit-1.8.7 → apexdevkit-1.8.9}/PKG-INFO

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

{apexdevkit-1.8.7 → apexdevkit-1.8.9}/apexdevkit/repository/sqlite.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from sqlite3 import IntegrityError
-from typing import Any, Callable, Generic, Iterator, TypeVar
+from typing import Any, Generic, Iterator, TypeVar
 
 from apexdevkit.error import DoesNotExistError, ExistsError
 from apexdevkit.repository import Database, DatabaseCommand
@@ -14,7 +14,6 @@ ItemT = TypeVar("ItemT")
 class SqliteRepository(Generic[ItemT]):
     db: Database
     table: SqlTable[ItemT]
-    duplicate_criteria: Callable[[ItemT], str] = lambda i: "Unknown"
 
     def __iter__(self) -> Iterator[ItemT]:
         for raw in self.db.execute(self.table.select_all()).fetch_all():
@@ -32,7 +31,10 @@ class SqliteRepository(Generic[ItemT]):
         try:
             return self.table.load(self.db.execute(self.table.insert(item)).fetch_one())
         except IntegrityError:  # pragma: no cover
-            ExistsError(item).with_duplicate(self.duplicate_criteria).fire()
+            item = self.table.load(
+                self.db.execute(self.table.select_duplicate(item)).fetch_one()
+            )
+            self.table.duplicate(item).fire()
             return item
 
     def create_many(self, items: list[ItemT]) -> list[ItemT]:
@@ -70,6 +72,9 @@ class SqlTable(Generic[ItemT]):  # pragma: no cover
     def select(self, item_id: str) -> DatabaseCommand:
         raise NotImplementedError("Not implemented")
 
+    def select_duplicate(self, item: ItemT) -> DatabaseCommand:
+        raise NotImplementedError("Not implemented")
+
     def select_all(self) -> DatabaseCommand:
         raise NotImplementedError("Not implemented")
 
@@ -85,6 +90,9 @@ class SqlTable(Generic[ItemT]):  # pragma: no cover
     def load(self, data: dict[str, Any]) -> ItemT:
         raise NotImplementedError("Not implemented")
 
+    def duplicate(self, item: ItemT) -> ExistsError:
+        return ExistsError(item).with_duplicate(lambda i: "Unknown")
+
 
 @dataclass
 class UnknownError(Exception):

{apexdevkit-1.8.7 → apexdevkit-1.8.9}/apexdevkit/testing/fake.py

@@ -19,8 +19,8 @@ class Fake:
     def text(self, *, length: int) -> str:
         return "".join(self.faker.random_letters(length=length))
 
-    def number(self) -> int:
-        return int(self.faker.random.randint(0, 100000))
+    def number(self, top: int = 100000) -> int:
+        return int(self.faker.random.randint(0, top))
 
     def timestamp(self) -> int:
         return int(self.faker.unix_time())
@@ -31,6 +31,24 @@ class Fake:
     def hour(self) -> int:
         return int(self.faker.random_int(min=0, max=23))
 
+    def first_name(self) -> str:
+        return str(self.faker.first_name())
+
+    def last_name(self) -> str:
+        return str(self.faker.last_name())
+
+    def sentence(self, *, words: int) -> str:
+        return str(self.faker.sentence(nb_words=words))
+
+    def country(self) -> str:
+        return str(self.faker.country())
+
+    def address(self) -> str:
+        return str(self.faker.address())
+
+    def bool(self) -> bool:
+        return bool(self.faker.boolean())
+
 
 @dataclass
 class FakeResource(Generic[ItemT]):

{apexdevkit-1.8.7 → apexdevkit-1.8.9}/pyproject.toml

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