GeneralManager 0.89.0__tar.gz → 0.89.2__tar.gz

{generalmanager-0.89.0/src/GeneralManager.egg-info → generalmanager-0.89.2}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.89.0
+Version: 0.89.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.89.0 → generalmanager-0.89.2}/src/general_manager/api/graphql_query_permissions.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Iterable
 from dataclasses import dataclass, field
 from inspect import getattr_static
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from graphql import GraphQLError
 
@@ -412,6 +412,7 @@ def authorize_query_fields(
     from general_manager.api.graphql_resolvers import (
         can_read_instance,
         check_read_permission,
+        relation_id_alias_target_fields,
     )
 
     normalized = set()
@@ -518,20 +519,10 @@ def authorize_query_fields(
                 raise GraphQLError(_RELATION_ERROR)
             if not can_read_instance(value, info):
                 raise QueryRelationPermissionError()
-            from django.db import models
-            from general_manager.interface.orm_interface import OrmInterfaceBase
-
-            orm_interface = cast(
-                type[OrmInterfaceBase[models.Model]], instance.Interface
-            )
-            foreign_key = orm_interface._model._meta.get_field(relation)
-            target_field = getattr(foreign_key, "target_field", None)
-            if not isinstance(target_field, models.Field):
+            target_names = relation_id_alias_target_fields(instance.Interface, relation)
+            if not target_names:
                 raise GraphQLError(_RELATION_ERROR)
-            target_names = {target_field.name}
-            if target_field.primary_key:
-                target_names.add("id")
-            for target_name in sorted(target_names):
+            for target_name in target_names:
                 check(value, (target_name,))
         if not rest and not (native_node and native_node.children):
             return

{generalmanager-0.89.0 → generalmanager-0.89.2}/src/general_manager/api/graphql_resolvers.py

@@ -86,6 +86,7 @@ from general_manager.utils.executable_contract import (
 
 if TYPE_CHECKING:
     from graphene import ResolveInfo as GraphQLResolveInfo
+    from general_manager.interface.base_interface import InterfaceBase
     from general_manager.api.graphql_errors import (
         GraphQLResolveInfo as ReadPermissionInfo,
     )
@@ -1355,6 +1356,29 @@ def relation_id_alias_field(
     return relation_field
 
 
+def relation_id_alias_target_fields(
+    interface: type[InterfaceBase], relation_field: str
+) -> tuple[str, ...]:
+    """Return the target field names protected by a native ORM alias."""
+    from django.core.exceptions import FieldDoesNotExist
+    from django.db import models
+    from general_manager.interface.orm_interface import OrmInterfaceBase
+
+    if not safe_issubclass(interface, OrmInterfaceBase):
+        return ()
+    orm_interface = cast(type[OrmInterfaceBase[models.Model]], interface)
+    try:
+        foreign_key = orm_interface._model._meta.get_field(relation_field)
+    except FieldDoesNotExist:
+        return ()
+    target_field = getattr(foreign_key, "target_field", None)
+    if not isinstance(target_field, models.Field):
+        return ()
+    if target_field.primary_key and target_field.name != "id":
+        return tuple(sorted((target_field.name, "id")))
+    return (target_field.name,)
+
+
 def _unwrap_optional_annotation(annotation: object) -> object:
     origin = get_origin(annotation)
     if origin is Annotated:

{generalmanager-0.89.0 → generalmanager-0.89.2}/src/general_manager/search/authorization.py

@@ -35,7 +35,11 @@ def analyze_search_projection(
 ) -> SearchProjectionAuthorization:
     """Inspect definitions once, without evaluating a permission or property."""
     from general_manager.api.graphql_relations import resolve_general_manager_type
-    from general_manager.api.graphql_resolvers import relation_id_alias_field
+    from general_manager.api.graphql_resolvers import (
+        relation_id_alias_field,
+        relation_id_alias_target_fields,
+    )
+    from general_manager.api.graphql_value_contract import _manager_source
     from general_manager.permission.manager_based_permission import (
         additional_local_read_permission,
     )
@@ -87,9 +91,31 @@ def analyze_search_projection(
             if alias is not None:
                 inspect_permission(owner, alias, frozenset())
                 has_relations = True
-                # The alias target leaf is checked at runtime; retain the
-                # thorough path until its complete field policy is known.
-                reasons.add("relation identity alias")
+                target = resolve_general_manager_type(
+                    owner.Interface.get_attribute_types()[alias].get("type"), registry
+                )
+                target_fields = relation_id_alias_target_fields(owner.Interface, alias)
+                if (
+                    target is None
+                    or not target_fields
+                    or not _manager_source(owner, alias)
+                ):
+                    reasons.add("unknown relation identity target")
+                    continue
+                for target_field in target_fields:
+                    known, _ = source_field_annotation(target, target_field)
+                    if (
+                        not known
+                        or relation_id_alias_field(
+                            target, target_field, native_source=True
+                        )
+                        is not None
+                    ):
+                        reasons.add("unknown relation identity target")
+                    else:
+                        inspect_permission(target, target_field, frozenset())
+                # Retain the exact alias path for the runtime target-row check.
+                continue
             _, annotation = source_field_annotation(owner, field)
             target = resolve_general_manager_type(annotation, registry)
             if target is not None:

{generalmanager-0.89.0 → generalmanager-0.89.2}/src/general_manager/search/backends/meilisearch.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import hashlib
+import re
 import time
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass
@@ -241,6 +242,16 @@ class MeilisearchBackend:
         """
         index = self._get_or_create_index(index_name)
         searchable_fields = self._string_sequence_setting(settings, "searchable_fields")
+        if searchable_fields is not None and "*" not in searchable_fields:
+            # Keep original field priority and expose only each searchable
+            # field's own aliases, never filter-/sort-only numeric values.
+            searchable_fields = [
+                *searchable_fields,
+                *(
+                    "gm_numeric_tokens." + _numeric_field_key(name)
+                    for name in searchable_fields
+                ),
+            ]
         filterable_fields = self._string_sequence_setting(settings, "filterable_fields")
         contracts = settings.get("identity_fields", {})
         if not isinstance(contracts, Mapping):
@@ -807,10 +818,13 @@ class MeilisearchBackend:
                 - `data`: the original data mapping,
                 - additional top-level keys copied from `document.data` except
                   reserved keys (`id`, `gm_document_id`, `type`,
-                  `identification`, `data`, `gm_identity`).
+                  `identification`, `data`, `gm_identity`, `gm_numeric_tokens`).
                 - `gm_identity`: bounded equality tokens for declared present
                   identity fields. UUID/set JSON conversion affects only the
                   payload copy, never the source document.
+                - `gm_numeric_tokens`: complete ASCII digit runs from each
+                  serialized string field, plus their zero-stripped forms.
+                  Source values, filtering, and sorting remain unchanged.
         """
         reserved_keys = {
             "id",
@@ -819,6 +833,7 @@ class MeilisearchBackend:
             "identification",
             "data",
             "gm_identity",
+            "gm_numeric_tokens",
         }
         extra_data = {
             key: value
@@ -846,6 +861,12 @@ class MeilisearchBackend:
                     "data": document.data,
                     **extra_data,
                     "gm_identity": identities,
+                    "gm_numeric_tokens": {
+                        _numeric_field_key(name): list(
+                            dict.fromkeys(_numeric_tokens(value))
+                        )
+                        for name, value in extra_data.items()
+                    },
                 }
             ),
         )
@@ -1207,6 +1228,30 @@ def _is_meilisearch_already_exists(error: Exception) -> bool:
     return status == 409 or "already_exists" in code
 
 
+def _numeric_field_key(name: str) -> str:
+    """Keep literal source names distinct without provider path punctuation."""
+    return "f" + name.encode("utf-8").hex()
+
+
+def _numeric_tokens(value: object) -> Iterable[str]:
+    """Yield at most two aliases per digit run, never arbitrary substrings.
+
+    Inspect only existing string values, including collection/mapping values.
+    Do not read managers, mapping keys, or object representations. String
+    stripping handles arbitrarily long numbers without integer conversion.
+    """
+    if isinstance(value, str):
+        for digits in re.findall(r"[0-9]+", value):
+            yield digits
+            yield digits.lstrip("0") or "0"
+    elif isinstance(value, Mapping):
+        for item in value.values():
+            yield from _numeric_tokens(item)
+    elif isinstance(value, (list, tuple, set)):
+        for item in value:
+            yield from _numeric_tokens(item)
+
+
 def _json_search_value(value: object) -> object:
     """Copy native document values into JSON-compatible provider payloads."""
     if isinstance(value, UUID):

{generalmanager-0.89.0 → generalmanager-0.89.2}/src/general_manager/search/config.py

@@ -11,7 +11,15 @@ from general_manager.manager.general_manager import GeneralManager
 
 
 _RESERVED_DOCUMENT_FIELD_NAMES = frozenset(
-    {"id", "gm_document_id", "type", "identification", "data", "gm_identity"}
+    {
+        "id",
+        "gm_document_id",
+        "type",
+        "identification",
+        "data",
+        "gm_identity",
+        "gm_numeric_tokens",
+    }
 )