GeneralManager 0.80.2__tar.gz → 0.80.4__tar.gz

{generalmanager-0.80.2/src/GeneralManager.egg-info → generalmanager-0.80.4}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.80.2
+Version: 0.80.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.80.2 → generalmanager-0.80.4}/src/general_manager/interface/excel_store.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 from collections.abc import Callable
 from copy import deepcopy
 from dataclasses import asdict, dataclass, field, fields
@@ -23,6 +24,17 @@ _locks: dict[str, FileLock] = {}
 _locks_guard = Lock()
 
 
+def _reset_locks_after_fork() -> None:
+    """Discard inherited lock state without acquiring the parent's thread guard."""
+    global _locks, _locks_guard
+    _locks = {}
+    _locks_guard = Lock()
+
+
+if hasattr(os, "register_at_fork"):
+    os.register_at_fork(after_in_child=_reset_locks_after_fork)
+
+
 @dataclass(slots=True)
 class ExcelMirror:
     rows: dict[Any, ExcelRowSnapshot] = field(default_factory=dict)

{generalmanager-0.80.2 → generalmanager-0.80.4}/src/general_manager/search/backends/meilisearch.py

@@ -6,6 +6,7 @@ import hashlib
 import time
 from collections.abc import Callable, Iterable
 from importlib import import_module
+from inspect import signature
 from typing import Mapping, Protocol, Sequence, cast
 
 from general_manager.search.backend import (
@@ -83,7 +84,7 @@ class _MeilisearchClientWithGetOrCreate(_MeilisearchClient, Protocol):
 class _MeilisearchClientWithWait(_MeilisearchClient, Protocol):
     """Client variant exposing server-side task waiting."""
 
-    def wait_for_task(self, task_uid: object) -> object: ...
+    def wait_for_task(self, task_uid: object, *, timeout_in_ms: int) -> object: ...
 
 
 class _MeilisearchClientWithGetTask(_MeilisearchClient, Protocol):
@@ -111,6 +112,7 @@ class MeilisearchBackend:
         url: str = "http://127.0.0.1:7700",
         api_key: str | None = None,
         client: _MeilisearchClient | None = None,
+        task_timeout_in_ms: int = 5000,
     ) -> None:
         """
         Initialize the backend with a provided Meilisearch client or a new one.
@@ -124,6 +126,10 @@ class MeilisearchBackend:
                 `meilisearch` package and instantiates a client with `url` and
                 `api_key`; if the package is not available, raises
                 SearchBackendClientMissingError("Meilisearch").
+            task_timeout_in_ms: Timeout in milliseconds forwarded to the client
+                `wait_for_task` method. Defaults to 5000 (five seconds). Does not
+                affect fallback polling for clients exposing only `get_task`
+                or legacy clients whose wait method does not accept the timeout.
 
         Raises:
             SearchBackendClientMissingError: The `meilisearch` package is not
@@ -137,6 +143,7 @@ class MeilisearchBackend:
             client_factory = cast(_MeilisearchModule, meilisearch_module).Client
             client = client_factory(url, api_key)
         self._client = client
+        self._task_timeout_in_ms = task_timeout_in_ms
 
     def ensure_index(self, index_name: str, settings: Mapping[str, object]) -> None:
         """
@@ -549,9 +556,24 @@ class MeilisearchBackend:
         if task_uid is None:
             return
         if hasattr(self._client, "wait_for_task"):
-            result = cast(_MeilisearchClientWithWait, self._client).wait_for_task(
-                task_uid
-            )
+            wait_for_task = cast(_MeilisearchClientWithWait, self._client).wait_for_task
+            supports_timeout = True
+            try:
+                wait_signature = signature(wait_for_task)
+            except (TypeError, ValueError):
+                # Uninspectable clients retain the standard Meilisearch call.
+                pass
+            else:
+                try:
+                    wait_signature.bind(
+                        task_uid, timeout_in_ms=self._task_timeout_in_ms
+                    )
+                except TypeError:
+                    supports_timeout = False
+            if supports_timeout:
+                result = wait_for_task(task_uid, timeout_in_ms=self._task_timeout_in_ms)
+            else:
+                result = cast(Callable[[object], object], wait_for_task)(task_uid)
             self._raise_for_failed_task(result)
             return
         if hasattr(self._client, "get_task"):