GeneralManager 0.82.1__tar.gz → 0.82.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.82.1
+Version: 0.82.2
 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.1 → generalmanager-0.82.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.82.1"
+version = "0.82.2"
 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.1 → generalmanager-0.82.2/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.82.1
+Version: 0.82.2
 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.1 → generalmanager-0.82.2}/src/general_manager/api/graphql.py

@@ -38,7 +38,10 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db import DEFAULT_DB_ALIAS, models, transaction
 from django.utils.module_loading import import_string
 
-from general_manager.api.graphql_identifiers import build_identification_arguments
+from general_manager.api.graphql_identifiers import (
+    build_identification_arguments,
+    property_identifier_type,
+)
 from general_manager.bucket.base_bucket import Bucket
 from general_manager.bucket.group_bucket import GroupBucket
 from general_manager.cache.dependency_index import (
@@ -929,6 +932,20 @@ class GraphQL:
         ) in generalManagerClass.Interface.get_graph_ql_properties().items():
             raw_hint = attr_value.graphql_type_hint
 
+            if attr_value.is_identifier:
+                native_type, is_collection = property_identifier_type(
+                    raw_hint,
+                    owner_name=generalManagerClass.__name__,
+                    field_name=attr_name,
+                )
+                fields[attr_name] = (
+                    graphene.List(graphene.ID) if is_collection else graphene.ID()
+                )
+                fields[f"resolve_{attr_name}"] = cls._create_resolver(
+                    attr_name, native_type
+                )
+                continue
+
             if _contains_measurement(raw_hint):
                 mapped = map_graphql_output_annotation(
                     raw_hint,

{generalmanager-0.82.1 → generalmanager-0.82.2}/src/general_manager/api/graphql_identifiers.py

@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import cast
+from types import UnionType
+from typing import Annotated, Union, cast, get_args, get_origin
+from uuid import UUID
 
 import graphene
 from django.db import models
@@ -16,9 +18,49 @@ from general_manager.api.graphql_relations import (
     get_graphql_manager_registry,
     resolve_general_manager_type,
 )
+from general_manager.api.graphql_output import GraphQLOutputAnnotationError
 from general_manager.manager.general_manager import GeneralManager
 
 
+def property_identifier_type(
+    annotation: object, *, owner_name: str, field_name: str
+) -> tuple[type, bool]:
+    """Validate an explicit native identity hint and return its type and shape.
+
+    This shared interpretation lets output and filter builders consume the
+    descriptor's public ``is_identifier`` flag without changing its annotation
+    or the native resolver value. Optional wrappers do not add non-null output
+    constraints to legacy manager properties.
+    """
+    original_annotation = annotation
+
+    def unwrap(hint: object) -> object:
+        while get_origin(hint) is Annotated:
+            hint = get_args(hint)[0]
+        if get_origin(hint) in (Union, UnionType):
+            members = get_args(hint)
+            if len(members) == 2 and type(None) in members:
+                return unwrap(next(t for t in members if t is not type(None)))
+        return hint
+
+    annotation = unwrap(annotation)
+    origin = get_origin(annotation)
+    is_collection = origin in (list, tuple, set)
+    if is_collection:
+        elements = get_args(annotation)
+        if origin is tuple and len(elements) == 2 and elements[1] is Ellipsis:
+            elements = elements[:1]
+        if elements and (origin is tuple or len(elements) == 1):
+            native_type = unwrap(elements[0])
+            if native_type in (int, str, UUID) and all(
+                unwrap(element) is native_type for element in elements
+            ):
+                return cast(type, native_type), True
+    elif annotation in (int, str, UUID):
+        return cast(type, annotation), False
+    raise GraphQLOutputAnnotationError(owner_name, field_name, original_annotation)
+
+
 def is_orm_identifier_input(manager_class: type[GeneralManager], name: str) -> bool:
     """Identify the ORM constructor alias addressing the actual model PK."""
     model = getattr(manager_class.Interface, "_model", None)

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

@@ -25,6 +25,7 @@ from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 
 from general_manager.conf import get_setting
+from general_manager.api.graphql_identifiers import property_identifier_type
 from general_manager.api.graphql_ordering import (
     GraphQLOrderingInputError,
     create_ordering_types,
@@ -842,12 +843,20 @@ def create_filter_options(
             continue
         hints = [t for t in get_args(prop.graphql_type_hint) if t is not type(None)]
         prop_type = hints[0] if hints else cast(type, prop.graphql_type_hint)
+        prop_info: dict[str, object] = {}
+        if prop.is_identifier:
+            prop_type, _ = property_identifier_type(
+                prop.graphql_type_hint,
+                owner_name=field_type.__name__,
+                field_name=prop_name,
+            )
+            prop_info["is_identifier"] = True
         filter_fields = {
             **filter_fields,
             **{
                 k: v
                 for k, v in get_filter_options(
-                    prop_type, prop_name, map_field_to_graphene_read
+                    prop_type, prop_name, map_field_to_graphene_read, prop_info
                 )
                 if v is not None
             },

{generalmanager-0.82.1 → generalmanager-0.82.2}/src/general_manager/api/property.py

@@ -55,7 +55,7 @@ class GraphQLPropertyTimeoutConfigurationError(ValueError):
 class GraphQLProperty(property):
     """Descriptor that exposes a resolver with GraphQL metadata and caching.
 
-    Stable inspection attributes are `sortable`, `filterable`,
+    Stable inspection attributes are `sortable`, `filterable`, `is_identifier`,
     `query_annotation`, `cache`, `timeout`, `warm_up`, and `graphql_type_hint`.
     The descriptor preserves normal `property` behavior such as `fget` and
     `__doc__`, but those values follow Python's property/wraps mechanics rather
@@ -66,6 +66,7 @@ class GraphQLProperty(property):
 
     sortable: bool
     filterable: bool
+    is_identifier: bool
     warm_up: bool
     query_annotation: object | None
     timeout: int | None
@@ -77,6 +78,7 @@ class GraphQLProperty(property):
         *,
         sortable: bool = False,
         filterable: bool = False,
+        is_identifier: bool = False,
         query_annotation: object | None = None,
         cache: GraphQLPropertyCache = "none",
         timeout: int | None = None,
@@ -101,6 +103,10 @@ class GraphQLProperty(property):
             filterable: Whether generated GraphQL fields may expose filtering
                 for this property. Stored as supplied; runtime truthiness is not
                 coerced or validated.
+            is_identifier: Declare native integer, string, or UUID identities,
+                either scalar or a homogeneous list, tuple, or set. Generates
+                GraphQL ID output without changing Python values. Unsupported
+                annotations raise TypeError during schema generation.
             query_annotation: Opaque ORM annotation object or callable consumed
                 by database bucket query construction.
             cache: Resolver cache scope. `"none"` evaluates every access,
@@ -160,6 +166,7 @@ class GraphQLProperty(property):
 
         self.sortable = sortable
         self.filterable = filterable
+        self.is_identifier = is_identifier
         self.query_annotation = query_annotation
         self.cache = cache
         self.timeout = timeout
@@ -276,6 +283,7 @@ def graph_ql_property(
     *,
     sortable: bool = False,
     filterable: bool = False,
+    is_identifier: bool = False,
     query_annotation: object | None = None,
     cache: GraphQLPropertyCache = "run",
     timeout: int | None = None,
@@ -290,6 +298,7 @@ def graph_ql_property(
     *,
     sortable: bool = False,
     filterable: bool = False,
+    is_identifier: bool = False,
     query_annotation: object | None = None,
     cache: GraphQLPropertyCache = "run",
     timeout: int | None = None,
@@ -307,6 +316,13 @@ def graph_ql_property(
             property.
         filterable: Whether generated GraphQL fields may expose filtering for
             this property.
+        is_identifier: Explicitly declare native integer, string, or UUID
+            identities. Scalars map to ID and homogeneous list, tuple, or set
+            collections to [ID], preserving nullable property output and native
+            Python values. Optional annotations and optional elements are
+            supported. Manager objects, nested collections, ambiguous unions,
+            and other scalar types raise TypeError during schema generation.
+            Names and query_annotation never infer this flag. Defaults to False.
         query_annotation: Opaque ORM annotation object or callable consumed by
             database bucket query construction.
         cache: Cache scope. `"run"` is the default and memoizes only within the
@@ -354,6 +370,7 @@ def graph_ql_property(
             sortable=sortable,
             query_annotation=query_annotation,
             filterable=filterable,
+            is_identifier=is_identifier,
             cache=cache,
             timeout=timeout,
             warm_up=warm_up,