apexdevkit 1.23.1__tar.gz → 1.23.3__tar.gz

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/PKG-INFO

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

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/annotation/deprecate.py

@@ -24,12 +24,11 @@ def deprecated(warning: str) -> Callable[[F], F]:
     def decorator(obj: F) -> F:
         if inspect.isfunction(obj) or inspect.ismethod(obj):
             return cast(F, _wrap_function(obj, warning))
-        elif inspect.isclass(obj):
+        if inspect.isclass(obj):
             return cast(F, _deprecate_class(obj, warning))
-        else:
-            raise TypeError(
-                f"Unsupported type for deprecation: {type(obj)}"
-            )  # pragma: no cover
+        raise TypeError(
+            f"Unsupported type for deprecation: {type(obj)}"
+        )  # pragma: no cover
 
     return decorator
 

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/fastapi/builder.py

@@ -20,7 +20,7 @@ class FastApiBuilder:
     def build(self) -> FastAPI:
         self.app.add_exception_handler(
             ApiError,
-            lambda request, exc: JSONResponse(content=exc.data, status_code=exc.code),
+            lambda _, exc: JSONResponse(content=exc.data, status_code=exc.code),
         )
         return self.app
 

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/formatter.py

@@ -95,7 +95,7 @@ class DataclassFormatter(Generic[_TargetT]):
             key_type = types[key.name]
             if key.name not in raw:
                 continue
-            elif key.name in self.sub_formatters.keys():
+            if key.name in self.sub_formatters:
                 raw[key.name] = (
                     self.sub_formatters[key.name].load(raw.pop(key.name))
                     if raw[key.name]

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/id.py

@@ -30,7 +30,7 @@ class ApexID:
                 cls.sequence = 0
 
             if cls.sequence > cls._sequence_bitmask:
-                raise DuplicateIDException("Duplicate ID Generated")
+                raise DuplicateIDError("Duplicate ID Generated")
 
             cls.last_timestamp = current_timestamp
 
@@ -50,5 +50,5 @@ class ApexID:
         return int(os.getenv("APEX_ID_METADATA", "0"))
 
 
-class DuplicateIDException(Exception):
+class DuplicateIDError(Exception):
     pass

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/repository/connector.py

@@ -96,16 +96,16 @@ class MsSqlCursorAdapter:
     cursor: Cursor
 
     def execute(self, *args: Any, **kwargs: Any) -> Any:
-        self.cursor.execute(*args, **kwargs)  # type : ignore
+        self.cursor.execute(*args, **kwargs)
 
     def executemany(self, *args: Any, **kwargs: Any) -> Any:
-        self.cursor.executemany(*args, **kwargs)  # type : ignore
+        self.cursor.executemany(*args, **kwargs)
 
-    def fetchone(self, *args: Any, **kwargs: Any) -> Any:
-        return self.cursor.fetchone()  # type : ignore
+    def fetchone(self, *_: Any, **__: Any) -> Any:
+        return self.cursor.fetchone()
 
-    def fetchall(self, *args: Any, **kwargs: Any) -> Any:
-        return self.cursor.fetchall()  # type : ignore
+    def fetchall(self, *_: Any, **__: Any) -> Any:
+        return self.cursor.fetchall()
 
     def close(self) -> None:
         self.cursor.close()  # type : ignore

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/repository/in_memory.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import Callable, Iterable, Iterator
+from collections import defaultdict
+from collections.abc import Callable, Iterable, Iterator, MutableMapping
 from contextlib import suppress
 from dataclasses import dataclass, field
 from typing import Any, Generic, Protocol, Self
@@ -102,13 +103,26 @@ class InMemoryByteStore(Generic[ItemT]):
         for raw in self.items.values():
             yield self.formatter.load(raw)
 
+    @dataclass
+    class Cache:
+        items: MutableMapping[str, InMemoryByteStore[Any]] = field(init=False)
+
+        def __post_init__(self) -> None:
+            self.items = defaultdict(InMemoryByteStore)
+
+        def store_for(self, name: str) -> InMemoryByteStore[Any]:
+            return self.items[name]
+
+        def clear(self) -> None:
+            self.items.clear()
+
 
 @dataclass
 class _SingleKeyRepository(RepositoryBase[ItemT]):
     store: KeyValueStore[ItemT]
     pk: _KeyFunction[ItemT]
 
-    def bind(self, **kwargs: Any) -> Self:  # pragma: no cover
+    def bind(self, **_: Any) -> Self:  # pragma: no cover
         return self
 
     def create(self, item: ItemT) -> ItemT:
@@ -154,7 +168,7 @@ class _ManyKeyRepository(RepositoryBase[ItemT]):
 
     keys: list[_KeyFunction[ItemT]] = field(default_factory=list)
 
-    def bind(self, **kwargs: Any) -> Self:  # pragma: no cover
+    def bind(self, **_: Any) -> Self:  # pragma: no cover
         return self
 
     def create(self, item: ItemT) -> ItemT:

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/repository/mssql.py

@@ -52,8 +52,7 @@ class MsSqlRepository(RepositoryBase[ItemT]):
         except OperationalError as e:
             if "Conversion failed" in str(e):
                 raise DoesNotExistError(item_id) from e
-            else:
-                raise e
+            raise e
 
         if not raw:
             raise DoesNotExistError(item_id)
@@ -367,12 +366,11 @@ class DefaultSqlTable(SqlTable[ItemT]):
     def exists(self, duplicate: ItemT) -> ExistsError:
         raw = self.formatter.dump(duplicate)
         return ExistsError(duplicate).with_duplicate(
-            lambda i: f"{self.fields.id}<{raw[self.fields.id]}>"
+            lambda _: f"{self.fields.id}<{raw[self.fields.id]}>"
         )
 
     @property
     def _user_check(self) -> str:
         if self.username is not None:
             return f"EXECUTE AS USER = '{self.username}'"
-        else:
-            return ""
+        return ""

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/repository/repository.py

@@ -75,7 +75,7 @@ class MultipleRepositoryBuilder(Generic[ItemT]):
     def with_repository(
         self,
         repository: Repository[ItemT],
-        condition: Callable[[ItemT], bool] = lambda item: True,
+        condition: Callable[[ItemT], bool] = lambda _: True,
         formatter: Formatter[ItemT, ItemT] | None = None,
         id_prefix: str = "",
     ) -> MultipleRepositoryBuilder[ItemT]:
@@ -94,7 +94,7 @@ class MultipleRepositoryBuilder(Generic[ItemT]):
     def and_repository(
         self,
         repository: Repository[ItemT],
-        condition: Callable[[ItemT], bool] = lambda item: True,
+        condition: Callable[[ItemT], bool] = lambda _: True,
         formatter: Formatter[ItemT, ItemT] | None = None,
         id_prefix: str = "",
     ) -> MultipleRepositoryBuilder[ItemT]:
@@ -112,7 +112,7 @@ class MultipleRepositoryBuilder(Generic[ItemT]):
 @dataclass(frozen=True)
 class _InnerRepository(Generic[ItemT]):
     inner: Repository[ItemT]
-    condition: Callable[[ItemT], bool] = lambda item: True
+    condition: Callable[[ItemT], bool] = lambda _: True
     formatter: Formatter[ItemT, ItemT] = field(
         default_factory=lambda: NoFormatter[ItemT]()
     )

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/repository/sql.py

@@ -145,8 +145,8 @@ class SqlFieldManager:
         ]
         if len(ordering) > 0:
             return "ORDER BY " + ", ".join(order_clauses)
-        else:
-            return ""
+
+        return ""
 
     def __iter__(self) -> Iterator[_SqlField]:
         yield from self.fields
@@ -163,8 +163,8 @@ class SqlFieldManager:
         ]
         if len(statements) > 0:
             return "WHERE " + " AND ".join(statements)
-        else:
-            return ""
+
+        return ""
 
     def with_fixed(self, raw: Mapping[str, Any]) -> dict[str, Any]:
         data = dict(raw)
@@ -185,14 +185,13 @@ class SqlFieldManager:
         if result is not None:
             if result.parent_value is None:
                 return self.key_formatter.replace("x", result.name) + " IS NULL"
-            else:
-                return (
-                    self.key_formatter.replace("x", result.name)
-                    + " = "
-                    + self.value_formatter.replace("x", result.name)
-                )
-        else:
-            return ""
+            return (
+                self.key_formatter.replace("x", result.name)
+                + " = "
+                + self.value_formatter.replace("x", result.name)
+            )
+
+        return ""
 
     def _id_filter(self, include_id: bool, read_id: bool) -> str:
         return (

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/apexdevkit/repository/sqlite.py

@@ -61,7 +61,7 @@ class SqliteRepository(RepositoryBase[ItemT]):
 
 
 class SqlTable(Generic[ItemT]):  # pragma: no cover
-    def bind(self, **kwargs: Any) -> SqlTable[ItemT]:
+    def bind(self, **_: Any) -> SqlTable[ItemT]:
         return self
 
     def count_all(self) -> DatabaseCommand:
@@ -92,7 +92,7 @@ class SqlTable(Generic[ItemT]):  # pragma: no cover
         raise NotImplementedError
 
     def duplicate(self, item: ItemT) -> ExistsError:
-        return ExistsError(item).with_duplicate(lambda i: "Unknown")
+        return ExistsError(item).with_duplicate(lambda _: "Unknown")
 
 
 @dataclass
@@ -251,7 +251,7 @@ class _DefaultSqlTable(SqlTable[ItemT]):
     def duplicate(self, item: ItemT) -> ExistsError:
         raw = self.formatter.dump(item)
         return ExistsError(item).with_duplicate(
-            lambda i: ",".join(
+            lambda _: ",".join(
                 [f"{key}<{raw[key]}>" for key in raw if key in self.fields.composite]
             )
         )

{apexdevkit-1.23.1 → apexdevkit-1.23.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexdevkit"
-version = "1.23.1"
+version = "1.23.3"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [
@@ -50,15 +50,28 @@ exclude = [
 
 [tool.ruff.lint]
 select = [
+    "A",    # flake8-builtins
+    "ARG",  # flake8-unused-arguments
     "B",    # flake8-bugbear
     "C4",   # flake8-comprehensions
+    "PT",   # flake8-pytest-style
+    "RSE",  # flake8-raise
+    "RET",  # flake8-return
+    "SIM",  # flake8-simplify
+    "T20",  # flake8-print
     "E",    # pycodestyle errors
+    "W",    # pycodestyle warnings
     "F",    # pyflakes
     "I",    # isort
+    "N",    # pep8-naming
     "UP",   # pyupgrade
-    "W",    # pycodestyle warnings
 ]
 
+[tool.ruff.lint.per-file-ignores]
+"apexdevkit/fastapi/resource.py" = ["N803"]
+"apexdevkit/fastapi/dependable.py" = ["N806"]
+
+
 [tool.ruff.lint.mccabe]
 max-complexity = 10