nlbone 0.7.10__tar.gz → 0.7.11__tar.gz

{nlbone-0.7.10 → nlbone-0.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.7.10
+Version: 0.7.11
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT

{nlbone-0.7.10 → nlbone-0.7.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nlbone"
-version = "0.7.10"
+version = "0.7.11"
 description = "Backbone package for interfaces and infrastructure in Python projects"
 readme = "README.md"
 requires-python = ">=3.10"

{nlbone-0.7.10 → nlbone-0.7.11}/src/nlbone/utils/cache.py

@@ -1,10 +1,12 @@
 import asyncio
 import inspect
 import json
-from typing import Any, Callable, Iterable, Optional
+from typing import Any, Callable, Iterable, Optional, Mapping
 
 from makefun import wraps as mf_wraps
 
+from nlbone.interfaces.api.additional_filed import AdditionalFieldsRequest
+from nlbone.interfaces.api.pagination import PaginateRequest
 from nlbone.utils.cache_registry import get_cache
 
 try:
@@ -25,11 +27,42 @@ def _bind(func: Callable, args, kwargs):
     return bound
 
 
+PRIMITIVES = (str, int, float, bool, type(None))
+
+
+def to_jsonable(obj):
+    if isinstance(obj, PRIMITIVES):
+        return obj
+
+    if isinstance(obj, dict):
+        return {str(k): to_jsonable(v) for k, v in obj.items()}
+
+    if isinstance(obj, (list, tuple, set)):
+        return [to_jsonable(v) for v in obj]
+
+    if isinstance(obj, PaginateRequest):
+        return {
+            "limit": obj.limit,
+            "offset": obj.offset,
+            "sort": obj.sort,
+            "filters": obj.filters,
+            "include_ids": obj.include_ids,
+        }
+
+    if isinstance(obj, AdditionalFieldsRequest):
+        return {
+            "fields": obj.fields,
+            "bundles": obj.bundles,
+        }
+
+    return f"<{obj.__class__.__name__}>"
+
+
 def _key_from_template(
-    tpl: Optional[str],
-    func: Callable,
-    args,
-    kwargs,
+        tpl: Optional[str],
+        func: Callable,
+        args,
+        kwargs,
 ) -> str:
     """Format key template with bound arguments or build a stable default."""
     bound = _bind(func, args, kwargs)
@@ -37,15 +70,22 @@ def _key_from_template(
         return tpl.format(**bound.arguments)
 
     # Default stable key: module:qualname:sha of args
-    payload = json.dumps(bound.arguments, sort_keys=True, default=str)
+
+    clean_args = to_jsonable(bound.arguments)
+    payload = json.dumps(clean_args, sort_keys=True)
+
+    payload = json.dumps(
+        payload,
+        sort_keys=True,
+    )
     return f"{func.__module__}:{func.__qualname__}:{hash(payload)}"
 
 
 def _format_tags(
-    tag_tpls: Optional[Iterable[str]],
-    func: Callable,
-    args,
-    kwargs,
+        tag_tpls: Optional[Iterable[str]],
+        func: Callable,
+        args,
+        kwargs,
 ) -> list[str] | None:
     if not tag_tpls:
         return None
@@ -84,13 +124,13 @@ def _run_maybe_async(func: Callable, *args, **kwargs):
 
 
 def cached(
-    *,
-    ttl: int,
-    key: str | None = None,
-    tags: Iterable[str] | None = None,
-    serializer: Callable[[Any], bytes] = default_serialize,
-    deserializer: Callable[[bytes], Any] = default_deserialize,
-    cache_resolver: Optional[Callable[[], Any]] = None,
+        *,
+        ttl: int,
+        key: str | None = None,
+        tags: Iterable[str] | None = None,
+        serializer: Callable[[Any], bytes] = default_serialize,
+        deserializer: Callable[[bytes], Any] = default_deserialize,
+        cache_resolver: Optional[Callable[[], Any]] = None,
 ):
     """
     Framework-agnostic caching for SYNC or ASYNC callables.