querymodelling 0.0.2a0__tar.gz → 0.0.4__tar.gz

{querymodelling-0.0.2a0/querymodelling.egg-info → querymodelling-0.0.4}/PKG-INFO

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

{querymodelling-0.0.2a0 → querymodelling-0.0.4}/pyproject.toml

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

querymodelling-0.0.4/querymodelling/__helper__.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+
+def is_enum(annotation):
+    try:
+        return issubclass(annotation, Enum)
+    except TypeError:
+        return False

{querymodelling-0.0.2a0 → querymodelling-0.0.4}/querymodelling/__version__.py

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

{querymodelling-0.0.2a0 → querymodelling-0.0.4}/querymodelling/sql.py

@@ -4,6 +4,7 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
 from typing import TypeVar, Sequence, Type, Callable, ParamSpec
 from pydantic import AliasChoices
 
+from .__helper__ import is_enum
 from .base import get_functions, DefaultSort
 from .fields import QueryField, SortField
 from .model import PageQuery
@@ -21,7 +22,7 @@ def sortable_by(field):
             return field.asc()
     return wrapper
 
-def retrieve_entries(
+def retrieve_paged_entries(
     query: Q,
     session: Session,
     t: Type[T],
@@ -47,6 +48,20 @@ def retrieve_entries(
 
     return total_elements, session.exec(statement).all()
 
+def retrieve_entries(
+    query: Q,
+    session: Session,
+    t: Type[T]
+) -> tuple[int, Sequence[T]]:
+    search_clause = get_functions(query, "query")
+    order_clause = get_functions(query, "sort")
+    statement = select(t)
+    if search_clause:
+        statement = statement.where(*search_clause)
+    if order_clause:
+        statement = statement.order_by(*order_clause)
+    return session.exec(statement).all()
+
 def create_query_fields(
     base_field: any,
     field_name: str,
@@ -71,7 +86,6 @@ def create_query_fields(
                 validation_alias=validation_alias,
                 default=None,
                 json_schema_extra=json_schema_extra | {
-                    "query.backend": "sql",
                     "query.operator": operator
                 }
             ),
@@ -98,9 +112,14 @@ def create_callback(
                 json_schema_extra[property_name] = field_info[
                     property_name]
 
+        json_schema_extra = json_schema_extra | {
+            "query.backend": "sql"
+        }
+
         if annotation == str:
             operator_mapping = {
                 None: lambda value: field == value,
+                "not": lambda value: field != value,
                 "startswith": lambda value: field.like(f"{value}%"),
                 "endswith": lambda value: field.like(f"%{value}"),
                 "contains": lambda value: field.like(f"%{value}%")
@@ -116,7 +135,20 @@ def create_callback(
             operator_mapping = {
                 None: lambda value: field == value,
                 "from": lambda value: field >= value,
-                "to": 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,
@@ -124,7 +156,7 @@ def create_callback(
                 annotation,
                 operator_mapping,
                 json_schema_extra
-            ) 
+            )
         sort_name = f"sort_{field_name}"
         sort_name_dot = f"sort.{field_name}"
         yield (
@@ -134,9 +166,7 @@ def create_callback(
                 alias=sort_name_dot,
                 validation_alias=AliasChoices(sort_name, sort_name_dot),
                 default=None,
-                json_schema_extra=json_schema_extra | {
-                    "query.backend": "sql"
-                }
+                json_schema_extra=json_schema_extra
             ),
             DefaultSort
         )

{querymodelling-0.0.2a0 → querymodelling-0.0.4/querymodelling.egg-info}/PKG-INFO

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

{querymodelling-0.0.2a0 → querymodelling-0.0.4}/querymodelling.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ LICENSE
 README.md
 pyproject.toml
 setup.py
+querymodelling/__helper__.py
 querymodelling/__init__.py
 querymodelling/__version__.py
 querymodelling/base.py