GeneralManager 0.82.2__tar.gz → 0.82.4__tar.gz

{generalmanager-0.82.2/src/GeneralManager.egg-info → generalmanager-0.82.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.82.2
+Version: 0.82.4
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.82.2 → generalmanager-0.82.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.82.2"
+version = "0.82.4"
 description = "Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching."
 readme = "README.md"
 authors = [{ name = "Tim Kleindick", email = "tkleindick@yahoo.de" }]

{generalmanager-0.82.2 → generalmanager-0.82.4/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.82.2
+Version: 0.82.4
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.82.2 → generalmanager-0.82.4}/src/general_manager/api/graphql.py

@@ -100,6 +100,7 @@ from general_manager.api.graphql_mutations import (
     generate_delete_mutation_class as _generate_delete_mutation_class_fn,
 )
 from general_manager.api.graphql_output import (
+    GraphQLOutputIdentityMetadataError,
     create_output_field_resolver,
     map_graphql_output_annotation,
     resolve_output_type_hints,
@@ -518,6 +519,11 @@ class GraphQL:
         )
         fields: dict[str, graphene.Field] = {}
         for declared_field in dataclasses.fields(output_class):
+            is_identifier = declared_field.metadata.get("is_identifier", False)
+            if not isinstance(is_identifier, bool):
+                raise GraphQLOutputIdentityMetadataError(
+                    output_name, declared_field.name, is_identifier
+                )
             mapped = map_graphql_output_annotation(
                 hints[declared_field.name],
                 owner_name=output_name,
@@ -528,6 +534,7 @@ class GraphQL:
                 output_type_registry=cls.graphql_output_type_registry,
                 measurement_type=MeasurementType,
                 scalar_mapper=cls._map_field_to_graphene_base_type,
+                is_identifier=is_identifier,
             )
             field = cast(graphene.Field, mapped.field)
             field.resolver = create_output_field_resolver(

{generalmanager-0.82.2 → generalmanager-0.82.4}/src/general_manager/api/graphql_output.py

@@ -9,6 +9,7 @@ from decimal import Decimal
 import sys
 from types import UnionType
 from typing import Any, ForwardRef, Union, get_args, get_origin, get_type_hints
+from uuid import UUID
 
 import graphene
 
@@ -40,6 +41,16 @@ class GraphQLOutputAnnotationError(TypeError):
         )
 
 
+class GraphQLOutputIdentityMetadataError(TypeError):
+    """Raised when an output field's identity flag is not boolean."""
+
+    def __init__(self, owner_name: str, field_name: str, flag: object) -> None:
+        super().__init__(
+            f"Invalid is_identifier metadata for {owner_name}.{field_name}: "
+            f"expected bool, got {flag!r}"
+        )
+
+
 @dataclass(frozen=True, slots=True)
 class _MappedAnnotation:
     """Internal Graphene type metadata before a field wrapper is mounted."""
@@ -144,6 +155,7 @@ def _map_collection_annotation(
     output_type_registry: Mapping[str, type[graphene.ObjectType]],
     measurement_type: type[graphene.ObjectType],
     scalar_mapper: Callable[[type], type],
+    is_identifier: bool = False,
 ) -> _MappedAnnotation:
     origin = get_origin(annotation)
     if origin not in (list, tuple, set):
@@ -159,6 +171,13 @@ def _map_collection_annotation(
             raise _annotation_error(owner_name, field_name, annotation)
         element_annotation = args[0]
 
+    if is_identifier:
+        _, identity_type = _unwrap_optional_annotation(
+            element_annotation, owner_name=owner_name, field_name=field_name
+        )
+        if identity_type not in (int, str, UUID):
+            raise _annotation_error(owner_name, field_name, annotation)
+
     element = _map_annotation(
         element_annotation,
         owner_name=owner_name,
@@ -169,6 +188,7 @@ def _map_collection_annotation(
         output_type_registry=output_type_registry,
         measurement_type=measurement_type,
         scalar_mapper=scalar_mapper,
+        is_identifier=is_identifier,
     )
     element_type = element.graphene_type
     if not element.nullable:
@@ -192,6 +212,7 @@ def _map_non_optional_value(
     output_type_registry: Mapping[str, type[graphene.ObjectType]],
     measurement_type: type[graphene.ObjectType],
     scalar_mapper: Callable[[type], type],
+    is_identifier: bool = False,
 ) -> _MappedAnnotation:
     annotation = _resolve_registered_name(
         annotation,
@@ -220,6 +241,17 @@ def _map_non_optional_value(
             output_type_registry=output_type_registry,
             measurement_type=measurement_type,
             scalar_mapper=scalar_mapper,
+            is_identifier=is_identifier,
+        )
+
+    if is_identifier:
+        if annotation not in (int, str, UUID):
+            raise _annotation_error(owner_name, field_name, annotation)
+        return _MappedAnnotation(
+            graphene.ID,
+            annotation,
+            nullable=False,
+            contains_measurement=False,
         )
 
     if safe_issubclass(annotation, GraphQLType):
@@ -290,6 +322,7 @@ def _map_annotation(
     output_type_registry: Mapping[str, type[graphene.ObjectType]],
     measurement_type: type[graphene.ObjectType],
     scalar_mapper: Callable[[type], type],
+    is_identifier: bool = False,
 ) -> _MappedAnnotation:
     nullable, concrete = _unwrap_optional_annotation(
         annotation,
@@ -306,6 +339,7 @@ def _map_annotation(
         output_type_registry=output_type_registry,
         measurement_type=measurement_type,
         scalar_mapper=scalar_mapper,
+        is_identifier=is_identifier,
     )
     return replace(mapped, nullable=nullable)
 
@@ -322,6 +356,7 @@ def _map_non_optional_annotation(
     measurement_type: type[graphene.ObjectType],
     scalar_mapper: Callable[[type], type],
     required: bool,
+    is_identifier: bool = False,
 ) -> MappedGraphQLOutput:
     """Map one non-optional annotation to a Graphene field."""
     mapped = _map_non_optional_value(
@@ -334,6 +369,7 @@ def _map_non_optional_annotation(
         output_type_registry=output_type_registry,
         measurement_type=measurement_type,
         scalar_mapper=scalar_mapper,
+        is_identifier=is_identifier,
     )
     field_kwargs: dict[str, object] = {}
     if mapped.contains_measurement:
@@ -355,8 +391,14 @@ def map_graphql_output_annotation(
     output_type_registry: Mapping[str, type[graphene.ObjectType]],
     measurement_type: type[graphene.ObjectType],
     scalar_mapper: Callable[[type], type],
+    is_identifier: bool = False,
 ) -> MappedGraphQLOutput:
-    """Map a strict GraphQL output annotation to a mounted Graphene field."""
+    """Map a strict output hint, preserving nullability and native values.
+
+    Explicit identity fields accept int, str, UUID, and supported flat
+    collections of those types. Their resolver type stays native while the
+    generated scalar is ID. Unmarked fields retain the strict legacy mapping.
+    """
     nullable, concrete_type = _unwrap_optional_annotation(
         annotation,
         owner_name=owner_name,
@@ -374,6 +416,7 @@ def map_graphql_output_annotation(
             measurement_type=measurement_type,
             scalar_mapper=scalar_mapper,
             required=not nullable,
+            is_identifier=is_identifier,
         )
     except GraphQLOutputAnnotationError as error:
         # Preserve the annotation written on the owning field in diagnostics,

{generalmanager-0.82.2 → generalmanager-0.82.4}/src/general_manager/api/graphql_search.py

@@ -18,9 +18,10 @@ from typing import (
     cast,
     get_args,
 )
+from uuid import UUID
 
 import graphene
-from graphql import GraphQLError
+from graphql import GraphQLError, GraphQLID
 from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 
@@ -35,6 +36,7 @@ from general_manager.api.graphql_ordering import (
 from general_manager.bucket._ordering import SortTerm, sort_items
 from general_manager.logging import get_logger
 from general_manager.manager.general_manager import GeneralManager
+from general_manager.manager.input import Input
 from general_manager.measurement.measurement import Measurement
 from general_manager.utils.type_checks import safe_issubclass
 from general_manager.search.backend_registry import get_search_backend
@@ -880,13 +882,16 @@ def normalize_id_filter_value(
     value: object,
 ) -> object:
     """
-    Convert equality filters marked as scalar identities to their native types.
+    Convert confirmed identity equality operands to their native types.
 
     Actual ORM primary keys use the declared constructor input, independent of
     the model column name. Raw relation references use the target field's
     ``to_python`` conversion, including ``to_field`` references. Ordered lookups
-    and non-list/tuple ``in`` values pass through unchanged. Conversion preserves
-    existing filter semantics; constructor and write validation remain separate.
+    and non-list/tuple ``in`` values pass through unchanged. Declared native
+    properties use their validated annotation and the standard Input cast;
+    collection operands retain the backend's existing element comparisons.
+    Equality lists retain production adapters' OR grammar. Constructor and
+    write validation remain separate. Null operands and elements remain null.
 
     Raises:
         Exceptions from ``Input.cast()`` or ORM field conversion propagate.
@@ -900,6 +905,22 @@ def normalize_id_filter_value(
     interface = getattr(field_type, "Interface", None)
     if interface is None:
         return value
+    prop = interface.get_graph_ql_properties().get(attribute_name)
+    if prop is not None:
+        if not prop.is_identifier:
+            return value
+        native_type, _ = property_identifier_type(
+            prop.graphql_type_hint,
+            owner_name=field_type.__name__,
+            field_name=attribute_name,
+        )
+        scalar_input = Input(native_type)
+        if operator == "in" and not isinstance(value, (list, tuple)):
+            return value
+        if isinstance(value, (list, tuple)):
+            return [_cast_identity_scalar(scalar_input.cast, item) for item in value]
+        return _cast_identity_scalar(scalar_input.cast, value)
+
     metadata = interface.get_attribute_types().get(attribute_name, {})
     if not metadata.get("is_identifier"):
         return value
@@ -924,10 +945,19 @@ def normalize_id_filter_value(
     if converter is None:
         return value
 
-    if operator == "in":
-        if not isinstance(value, (list, tuple)):
-            return value
-        return [converter(item) for item in value]
+    if operator == "in" and not isinstance(value, (list, tuple)):
+        return value
+    if isinstance(value, (list, tuple)):
+        return [_cast_identity_scalar(converter, item) for item in value]
+    return _cast_identity_scalar(converter, value)
+
+
+def _cast_identity_scalar(
+    converter: Callable[[object], object], value: object
+) -> object:
+    """Use existing ID validation before native casting can truncate JSON values."""
+    if value is not None and not isinstance(value, UUID):
+        GraphQLID.parse_value(value)
     return converter(value)
 
 
@@ -1216,16 +1246,22 @@ def register_search_query(
             decision = getattr(permission_plan, "decision", "conditional")
             if decision == "deny_all":
                 continue
+            # Shared indexes may give the same field different native types.
+            # Keep parsed user filters and permission constraints untouched.
+            manager_filters = {
+                key: normalize_id_filter_value(manager_class, key, value)
+                for key, value in parsed_filters.items()
+            }
             backend_shape = get_backend_shape(manager_class)
             instance_check_reasons = resolve_instance_check_reasons(
                 permission_plan,
                 backend_shape=backend_shape,
             )
             filter_groups = (
-                parsed_filters or None
+                manager_filters or None
                 if decision == "allow_all"
                 else merge_permission_filters(
-                    parsed_filters,
+                    manager_filters,
                     permission_plan.filters,
                 )
             )

{generalmanager-0.82.2 → generalmanager-0.82.4}/src/general_manager/api/graphql_type.py

@@ -29,7 +29,14 @@ class GraphQLTypeMeta(type):
 
 
 class GraphQLType(metaclass=GraphQLTypeMeta):
-    """Frozen annotated value exposed only as a GraphQL output object."""
+    """Frozen annotated value exposed only as a GraphQL output object.
+
+    Use ``dataclasses.field(metadata={"is_identifier": True})`` to declare
+    native int, str, or UUID identity fields and their supported homogeneous
+    collections. Schema generation preserves annotation nullability and native
+    values while exposing ID scalars. Missing or false metadata keeps existing
+    output types; other flag values fail schema generation with TypeError.
+    """
 
 
 def get_registered_graphql_types() -> tuple[type[GraphQLType], ...]: