jararaca 0.2.23__tar.gz → 0.2.25__tar.gz

{jararaca-0.2.23 → jararaca-0.2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.2.23
+Version: 0.2.25
 Summary: A simple and fast API framework for Python
 Home-page: https://github.com/LuscasLeo/jararaca
 Author: Lucas S

{jararaca-0.2.23 → jararaca-0.2.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.2.23"
+version = "0.2.25"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"

{jararaca-0.2.23 → jararaca-0.2.25}/src/jararaca/__init__.py

@@ -54,9 +54,13 @@ if TYPE_CHECKING:
     from .messagebus.types import Message, MessageOf
     from .messagebus.worker import MessageBusWorker
     from .microservice import Microservice, use_app_context, use_current_container
-    from .persistence.base import (
-        T_BASEMODEL,
-        BaseEntity,
+    from .persistence.base import T_BASEMODEL, BaseEntity
+    from .persistence.interceptors.aiosqa_interceptor import (
+        AIOSQAConfig,
+        AIOSqlAlchemySessionInterceptor,
+        use_session,
+    )
+    from .persistence.utilities import (
         CriteriaBasedAttributeQueryInjector,
         CRUDOperations,
         DateCriteria,
@@ -71,11 +75,6 @@ if TYPE_CHECKING:
         QueryOperations,
         StringCriteria,
     )
-    from .persistence.interceptors.aiosqa_interceptor import (
-        AIOSQAConfig,
-        AIOSqlAlchemySessionInterceptor,
-        use_session,
-    )
     from .presentation.decorators import (
         Delete,
         Get,
@@ -232,27 +231,31 @@ _dynamic_imports: "dict[str, tuple[str, str, str | None]]" = {
     "HttpPut": (__SPEC_PARENT__, "rpc.http.decorators", "Put"),
     "HttpDelete": (__SPEC_PARENT__, "rpc.http.decorators", "Delete"),
     "ObservabilityInterceptor": (__SPEC_PARENT__, "observability.interceptor", None),
-    "QueryInjector": (__SPEC_PARENT__, "persistence.base", None),
+    "QueryInjector": (__SPEC_PARENT__, "persistence.utilities", None),
     "HttpMicroservice": (__SPEC_PARENT__, "presentation.http_microservice", None),
     "use_current_container": (__SPEC_PARENT__, "microservice", None),
     "T_BASEMODEL": (__SPEC_PARENT__, "persistence.base", None),
-    "DatedEntity": (__SPEC_PARENT__, "persistence.base", None),
+    "DatedEntity": (__SPEC_PARENT__, "persistence.utilities", None),
     "BaseEntity": (__SPEC_PARENT__, "persistence.base", None),
     "use_ws_manager": (__SPEC_PARENT__, "presentation.websocket.context", None),
     "WebSocketEndpoint": (__SPEC_PARENT__, "presentation.websocket.decorators", None),
-    "CriteriaBasedAttributeQueryInjector": (__SPEC_PARENT__, "persistence.base", None),
-    "Identifiable": (__SPEC_PARENT__, "persistence.base", None),
-    "IdentifiableEntity": (__SPEC_PARENT__, "persistence.base", None),
+    "CriteriaBasedAttributeQueryInjector": (
+        __SPEC_PARENT__,
+        "persistence.utilities",
+        None,
+    ),
+    "Identifiable": (__SPEC_PARENT__, "persistence.utilities", None),
+    "IdentifiableEntity": (__SPEC_PARENT__, "persistence.utilities", None),
     "MessageOf": (__SPEC_PARENT__, "messagebus.types", None),
     "Message": (__SPEC_PARENT__, "messagebus.types", None),
-    "StringCriteria": (__SPEC_PARENT__, "persistence.base", None),
-    "DateCriteria": (__SPEC_PARENT__, "persistence.base", None),
-    "DateOrderedFilter": (__SPEC_PARENT__, "persistence.base", None),
-    "DateOrderedQueryInjector": (__SPEC_PARENT__, "persistence.base", None),
-    "Paginated": (__SPEC_PARENT__, "persistence.base", None),
-    "PaginatedFilter": (__SPEC_PARENT__, "persistence.base", None),
-    "QueryOperations": (__SPEC_PARENT__, "persistence.base", None),
-    "CRUDOperations": (__SPEC_PARENT__, "persistence.base", None),
+    "StringCriteria": (__SPEC_PARENT__, "persistence.utilities", None),
+    "DateCriteria": (__SPEC_PARENT__, "persistence.utilities", None),
+    "DateOrderedFilter": (__SPEC_PARENT__, "persistence.utilities", None),
+    "DateOrderedQueryInjector": (__SPEC_PARENT__, "persistence.utilities", None),
+    "Paginated": (__SPEC_PARENT__, "persistence.utilities", None),
+    "PaginatedFilter": (__SPEC_PARENT__, "persistence.utilities", None),
+    "QueryOperations": (__SPEC_PARENT__, "persistence.utilities", None),
+    "CRUDOperations": (__SPEC_PARENT__, "persistence.utilities", None),
     "RestController": (__SPEC_PARENT__, "presentation.decorators", None),
     "MessageBusController": (__SPEC_PARENT__, "messagebus.decorators", None),
     "MessageHandler": (__SPEC_PARENT__, "messagebus.decorators", None),

jararaca-0.2.25/src/jararaca/persistence/base.py

@@ -0,0 +1,33 @@
+from typing import Any, Self, Type, TypeVar
+
+from pydantic import BaseModel
+from sqlalchemy.orm import DeclarativeBase
+
+IDENTIFIABLE_SCHEMA_T = TypeVar("IDENTIFIABLE_SCHEMA_T")
+
+
+T_BASEMODEL = TypeVar("T_BASEMODEL", bound=BaseModel)
+
+
+def recursive_get_dict(obj: Any) -> Any:
+    if isinstance(obj, list):
+        return [recursive_get_dict(v) for v in obj]
+    elif hasattr(obj, "__dict__"):
+        return {
+            k: recursive_get_dict(v) for k, v in obj.__dict__.items() if k[0] != "_"
+        }
+    else:
+        return obj
+
+
+class BaseEntity(DeclarativeBase):
+
+    @classmethod
+    def from_basemodel(cls, mutation: T_BASEMODEL) -> "Self":
+        intersection = set(cls.__annotations__.keys()) & set(
+            mutation.model_fields.keys()
+        )
+        return cls(**{k: getattr(mutation, k) for k in intersection})
+
+    def to_basemodel(self, model: Type[T_BASEMODEL]) -> T_BASEMODEL:
+        return model.model_validate(recursive_get_dict(self))

jararaca-0.2.23/src/jararaca/persistence/base.py → jararaca-0.2.25/src/jararaca/persistence/utilities.py

@@ -21,9 +21,16 @@ from uuid import UUID, uuid4
 from pydantic import BaseModel, Field, ValidationError
 from sqlalchemy import DateTime, Result, Select, delete, func, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column
+
+from jararaca.persistence.base import (
+    IDENTIFIABLE_SCHEMA_T,
+    T_BASEMODEL,
+    BaseEntity,
+    recursive_get_dict,
+)
+from jararaca.persistence.sort_filter import FilterModel, SortModel
 
-IDENTIFIABLE_SCHEMA_T = TypeVar("IDENTIFIABLE_SCHEMA_T")
 logger = logging.getLogger(__name__)
 
 
@@ -38,33 +45,6 @@ class Identifiable(BaseModel, Generic[IDENTIFIABLE_SCHEMA_T]):
         return Identifiable[IDENTIFIABLE_SCHEMA_T](id=id, data=data)
 
 
-T_BASEMODEL = TypeVar("T_BASEMODEL", bound=BaseModel)
-
-
-def recursive_get_dict(obj: Any) -> Any:
-    if isinstance(obj, list):
-        return [recursive_get_dict(v) for v in obj]
-    elif hasattr(obj, "__dict__"):
-        return {
-            k: recursive_get_dict(v) for k, v in obj.__dict__.items() if k[0] != "_"
-        }
-    else:
-        return obj
-
-
-class BaseEntity(DeclarativeBase):
-
-    @classmethod
-    def from_basemodel(cls, mutation: T_BASEMODEL) -> "Self":
-        intersection = set(cls.__annotations__.keys()) & set(
-            mutation.model_fields.keys()
-        )
-        return cls(**{k: getattr(mutation, k) for k in intersection})
-
-    def to_basemodel(self, model: Type[T_BASEMODEL]) -> T_BASEMODEL:
-        return model.model_validate(recursive_get_dict(self))
-
-
 def nowutc() -> datetime:
     return datetime.now(UTC)
 
@@ -205,6 +185,8 @@ class CRUDOperations(Generic[IDENTIFIABLE_T]):
 class PaginatedFilter(BaseModel):
     page: Annotated[int, Field(gt=-1)] = 1
     page_size: int = 10
+    sort_models: list[SortModel] = []
+    filter_model: list[FilterModel] = []
 
 
 class QueryInjector(Protocol):