querymodelling 0.0.6__tar.gz → 0.0.8__tar.gz

{querymodelling-0.0.6/querymodelling.egg-info → querymodelling-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: querymodelling
-Version: 0.0.6
+Version: 0.0.8
 Summary: build consistent api query models for fastapi
 Author: George Haddad
 Author-email: George Haddad <georgeh87@live.de>

{querymodelling-0.0.6 → querymodelling-0.0.8}/pyproject.toml

@@ -11,7 +11,7 @@ testpaths = ["tests"]
 
 [project]
 name = "querymodelling"
-version = "0.0.6"
+version = "0.0.8"
 description = "build consistent api query models for fastapi"
 readme = "README.md"
 requires-python = ">=3.11"

{querymodelling-0.0.6 → querymodelling-0.0.8}/querymodelling/__version__.py

@@ -1,7 +1,7 @@
 __title__ = "querymodelling"
 __description__ = ""
 __url__ = "https://querymodelling.readthedocs.io"
-__version__ = "0.0.6"
+__version__ = "0.0.8"
 __build__ = 0x023100
 __author__ = "George Haddad"
 __author_email__ = "georgeh87@live.de"

querymodelling-0.0.8/querymodelling/redis_om.py

@@ -0,0 +1,153 @@
+from datetime import datetime
+from typing import TypeVar, Sequence, Type, Callable, ParamSpec
+
+from .__helper__ import is_enum
+from .base import get_functions, DefaultSort
+from .fields import QueryField, SortField
+from .model import PageQuery
+
+
+T = TypeVar("T")
+PK = ParamSpec("PK")
+Q = TypeVar("Q", bound=PageQuery)
+
+def sortable_by(field, field_name):
+    def wrapper(order: DefaultSort):
+        if order == "desc":
+            return f"-{field_name}"
+        if order == "asc":
+            return field_name
+    return wrapper
+
+def create_statement(
+    query: Q,
+    t: Type[T]
+):
+    search_clause = get_functions(query, "query")
+    order_clause = get_functions(query, "sort")
+    statement = t.find(*search_clause)
+    if order_clause:
+        statement = statement.sort_by(*order_clause)
+    return statement
+
+def retrieve_paged_entries(
+    query: Q,
+    t: Type[T],
+) -> tuple[int, Sequence[T]]:
+    statement = create_statement(query, t)
+    
+    statement = statement.copy(
+        offset=query.page * query.size, limit=query.size)
+
+    entries = statement.execute(exhaust_results=False)
+    total_elements = statement.count()
+    
+    return total_elements, entries
+
+def retrieve_entries(
+    query: Q,
+    t: Type[T]
+) -> tuple[int, Sequence[T]]:
+    statement = create_statement(query, t)
+    return statement.all()
+
+def create_query_fields(
+    base_field: any,
+    field_name: str,
+    annotation: any,
+    operator_mapping: dict[str, Callable],
+    json_schema_extra: dict
+):   
+    for operator, operator_function in operator_mapping.items():
+        if operator is None:
+            name = field_name
+        else:
+            name = f"{field_name}_{operator}"
+        yield (
+            name,
+            QueryField(base_field)(
+                operator_function,
+                default=None,
+                json_schema_extra=json_schema_extra | {
+                    "query.operator": operator
+                }
+            ),
+            annotation
+        )
+
+def create_callback(
+    base_field,
+    copy_field_properties: list[str] = None,
+    schema_extra: dict = None
+):
+    def auto_create_callback(
+        source_type: type,
+        field_name: str,
+        field,
+        field_info,
+        annotation
+    ):
+        if copy_field_properties is None and schema_extra is None:
+            json_schema_extra = field_info.json_schema_extra
+        json_schema_extra = schema_extra or {}
+        if copy_field_properties is not None:
+            for property_name in copy_field_properties:
+                json_schema_extra[property_name] = field_info[
+                    property_name]
+
+        json_schema_extra = json_schema_extra | {
+            "query.backend": "redis",
+            "query.field": field_name
+        }
+
+        if annotation == str:
+            operator_mapping = {
+                None: lambda value: field == value,
+                "not": lambda value: field != value,
+                "startswith": lambda value: field.startswith(value),
+                "endswith": lambda value: field.endswith(value),
+                "contains": lambda value: field % value
+            }
+            yield from create_query_fields(
+                base_field,
+                field_name,
+                annotation,
+                operator_mapping,
+                json_schema_extra
+            )
+        elif annotation in (datetime, int):
+            operator_mapping = {
+                None: lambda value: field == value,
+                "from": lambda value: field >= value,
+                "to": lambda value: field <= value,
+                "not": lambda value: field != value
+            }
+            yield from create_query_fields(
+                base_field,
+                field_name,
+                annotation,
+                operator_mapping,
+                json_schema_extra
+            )
+        elif is_enum(annotation):
+            operator_mapping = {
+                None: lambda value: field == value,
+                "not": lambda value: field != value
+            }
+            yield from create_query_fields(
+                base_field,
+                field_name,
+                annotation,
+                operator_mapping,
+                json_schema_extra
+            )
+        yield (
+            f"sort_{field_name}",
+            SortField(base_field)(
+                sortable_by(source_type.__dict__[field_name], field_name),
+                default=None,
+                json_schema_extra=json_schema_extra
+            ),
+            DefaultSort
+        )
+    return auto_create_callback

{querymodelling-0.0.6 → querymodelling-0.0.8}/querymodelling/sql.py

@@ -88,14 +88,15 @@ def create_query_fields(
 def create_callback(
     base_field,
     copy_field_properties: list[str] = None,
-    schema_extra: dict = None
+    schema_extra: dict = None,
+    use_alias_reference: bool = True,
 ):
     def auto_create_callback(
         source_type: type,
         field_name: str,
         field,
         field_info,
-        annotation
+        annotation,
     ):
         if copy_field_properties is None and schema_extra is None:
             json_schema_extra = field_info.json_schema_extra
@@ -107,7 +108,10 @@ def create_callback(
 
         json_schema_extra = json_schema_extra | {
             "query.backend": "sql",
-            "query.field": field_name,
+            "query.field": (
+                (field_info.alias or field_name) 
+                if use_alias_reference else field_name
+            ),
         }
 
         if annotation == str:

{querymodelling-0.0.6 → querymodelling-0.0.8/querymodelling.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: querymodelling
-Version: 0.0.6
+Version: 0.0.8
 Summary: build consistent api query models for fastapi
 Author: George Haddad
 Author-email: George Haddad <georgeh87@live.de>

{querymodelling-0.0.6 → querymodelling-0.0.8}/querymodelling.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ querymodelling/base.py
 querymodelling/fields.py
 querymodelling/model.py
 querymodelling/pydantic.py
+querymodelling/redis_om.py
 querymodelling/sql.py
 querymodelling.egg-info/PKG-INFO
 querymodelling.egg-info/SOURCES.txt