querymodelling 0.0.5__tar.gz → 0.0.7__tar.gz

{querymodelling-0.0.5/querymodelling.egg-info → querymodelling-0.0.7}/PKG-INFO

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

{querymodelling-0.0.5 → querymodelling-0.0.7}/pyproject.toml

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

{querymodelling-0.0.5 → querymodelling-0.0.7}/querymodelling/__version__.py

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

{querymodelling-0.0.5 → querymodelling-0.0.7}/querymodelling/sql.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from sqlmodel import Session, select, func
 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
@@ -70,20 +69,14 @@ def create_query_fields(
     json_schema_extra: dict
 ):   
     for operator, operator_function in operator_mapping.items():
-        validation_alias = None
-        alias = None
         if operator is None:
             name = field_name
         else:
             name = f"{field_name}_{operator}"
-            alias = f"{field_name}.{operator}"
-            validation_alias = AliasChoices(name, alias)
         yield (
             name,
             QueryField(base_field)(
                 operator_function,
-                alias=alias,
-                validation_alias=validation_alias,
                 default=None,
                 json_schema_extra=json_schema_extra | {
                     "query.operator": operator
@@ -95,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
@@ -114,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:
@@ -158,14 +155,10 @@ def create_callback(
                 operator_mapping,
                 json_schema_extra
             )
-        sort_name = f"sort_{field_name}"
-        sort_name_dot = f"sort.{field_name}"
         yield (
-            sort_name_dot,
+            f"sort_{field_name}",
             SortField(base_field)(
                 sortable_by(source_type.__dict__[field_name]),
-                alias=sort_name_dot,
-                validation_alias=AliasChoices(sort_name, sort_name_dot),
                 default=None,
                 json_schema_extra=json_schema_extra
             ),

{querymodelling-0.0.5 → querymodelling-0.0.7/querymodelling.egg-info}/PKG-INFO

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