GeneralManager 0.89.1__tar.gz → 0.89.2__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.89.1
+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.1 → 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.1 → 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",
+    }
 )