nlbone 0.6.16__tar.gz → 0.6.17__tar.gz

{nlbone-0.6.16 → nlbone-0.6.17}/PKG-INFO

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

{nlbone-0.6.16 → nlbone-0.6.17}/pyproject.toml

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

{nlbone-0.6.16 → nlbone-0.6.17}/src/nlbone/interfaces/api/additional_filed/assembler.py

@@ -11,20 +11,33 @@ def assemble_response(
     obj: Any,
     reg: ResourceRegistry,
     selected_rules: Dict[str, FieldRule],
-    base_schema: type[BaseModel] | None,
     session,
+    base_schema: type[BaseModel] | None,
+    scope_map: dict[str, set[str]] = None,
 ) -> Dict[str, Any]:
     base = {f: getattr(obj, f, None) for f in reg.default_fields - set(reg.rules.keys())}
     if base_schema:
         base = base_schema.model_validate(base).model_dump()
 
-    ctx = {"file_service": Container.file_service(), "entity": obj, "db": session}
-    for name, rule in selected_rules.items():
+    ctx = {
+        "file_service": Container.file_service(),
+        "entity": obj,
+        "db": session,
+        "pricing_service": Container.pricing_service(),
+    }
+    roots = {name.split(".", 1)[0] for name in selected_rules.keys()}
+    for root in roots:
+        rule = reg.rules.get(root)
+        if not rule:
+            continue
+
         if rule.loader:
-            value = inject_dependencies(rule.loader, dependencies=ctx)
+            dependencies = ctx | {"scope": scope_map.get(root, {""})} if scope_map else ctx
+            value = inject_dependencies(rule.loader, dependencies=dependencies)
         else:
-            value = _get_nested_attr(obj, name)
-        _put_nested_key(base, name, value)
+            value = _get_nested_attr(obj, root)
+
+        _put_nested_key(base, root, value)
 
     return base
 

{nlbone-0.6.16 → nlbone-0.6.17}/src/nlbone/interfaces/api/additional_filed/field_registry.py

@@ -15,6 +15,10 @@ def _schema_fields(schema: Type[BaseModel], by_alias: bool = True) -> Set[str]:
     return names
 
 
+def _prefix_name(prefix: str, name: str) -> str:
+    return f"{prefix}.{name}" if name else prefix
+
+
 @dataclass(frozen=True)
 class FieldRule:
     """
@@ -51,6 +55,7 @@ class ResourceRegistry:
     rules: Dict[str, FieldRule] = field(default_factory=dict)
     bundles: Dict[str, Set[str]] = field(default_factory=dict)
     _schema_fields_cache: Set[str] = field(default_factory=set, repr=False)
+    mounts: Dict[str, "ResourceRegistry"] = field(default_factory=dict)
 
     def add_rule(self, rule: FieldRule) -> "ResourceRegistry":
         self.rules[rule.name] = rule
@@ -103,3 +108,41 @@ class ResourceRegistry:
 
         self.default_fields = final
         return self
+
+    def mount(
+        self,
+        child: "ResourceRegistry",
+        *,
+        at: str,
+        include_child_defaults: bool = False,
+        include_child_bundles: bool = True,
+    ) -> "ResourceRegistry":
+        # 1) rules
+        for r in child.rules.values():
+            prefixed = FieldRule(
+                name=_prefix_name(at, r.name),
+                default=(include_child_defaults and r.default),
+                permission=r.permission,
+                deps=tuple(_prefix_name(at, d) for d in r.deps),
+                columns=r.columns,
+                join_paths=r.join_paths,
+                loader=None,  # load by parent
+            )
+            self.add_rule(prefixed)
+
+        if include_child_defaults:
+            self.default_fields |= {_prefix_name(at, f) for f in child.default_fields}
+
+        if include_child_bundles:
+            for bname, items in child.bundles.items():
+                pb = _prefix_name(at, bname)
+                prefixed_items = set()
+                for it in items:
+                    if it.startswith("@"):
+                        prefixed_items.add(_prefix_name(at, it))
+                    else:
+                        prefixed_items.add(_prefix_name(at, it))
+                self.add_bundle(pb, prefixed_items)
+
+        self.mounts[at] = child
+        return self

{nlbone-0.6.16 → nlbone-0.6.17}/src/nlbone/interfaces/api/additional_filed/resolver.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 from typing import Dict, List, Set, Tuple
 
 from nlbone.interfaces.api.additional_filed.field_registry import (
@@ -89,6 +90,18 @@ def resolve_requested_fields(
     for f in list(selected_rules.keys()):
         add_deps(f)
 
+    parents_to_add = set()
+    for f in list(final):
+        if "." in f:
+            parent = f.split(".", 1)[0]
+            if parent in reg.rules:
+                parents_to_add.add(parent)
+
+    final |= parents_to_add
+    for p in parents_to_add:
+        if p not in selected_rules and p in reg.rules:
+            selected_rules[p] = reg.rules[p]
+
     # validate deps too
     unknown_deps = {d for d in final if (d not in reg.default_fields and d not in reg.rules)}
     if unknown_deps:
@@ -130,3 +143,20 @@ def build_query_plan(
         columns.extend(r.columns or [])
         joins.extend(r.join_paths or [])
     return columns, joins
+
+
+def build_field_scope(requested_fields: Set[str]) -> dict[str, set[str]]:
+    """
+    {'variants', 'variants.cost', 'supplier.address.city'} →
+    {
+      'variants': {'', 'cost'},
+      'supplier': {'address.city'}
+    }
+    """
+    scope: dict[str, set[str]] = defaultdict(set)
+    for f in requested_fields:
+        parts = f.split(".", 1)
+        root = parts[0]
+        suffix = parts[1] if len(parts) == 2 else ""  # '' یعنی خود root
+        scope[root].add(suffix)
+    return scope

{nlbone-0.6.16 → nlbone-0.6.17}/src/nlbone/interfaces/api/dependencies/auth.py

@@ -78,10 +78,10 @@ def client_or_user_has_access_func(permissions=None, client_permissions=None):
     if not token:
         raise UnauthorizedException()
     needed = client_permissions or permissions
-    if client_has_access_func(permissions=needed):
-        return
-    if user_has_access_func(permissions=needed):
-        return
+    try:
+        client_has_access_func(permissions=needed)
+    except Exception:
+        user_has_access_func(permissions=needed)
 
 
 def client_or_user_has_access(*, permissions=None, client_permissions=None):

{nlbone-0.6.16 → nlbone-0.6.17}/src/nlbone/interfaces/api/pagination/offset_base.py

@@ -13,20 +13,20 @@ class PaginateRequest:
     """
 
     def __init__(
-            self,
-            limit: int = 10,
-            offset: int = 0,
-            sort: Optional[str] = None,
-            filters: Optional[str] = Query(None, description="e.g. title:abc"),
-            include: Optional[str] = None,
+        self,
+        limit: int = 10,
+        offset: int = 0,
+        sort: Optional[str] = None,
+        filters: Optional[str] = Query(None, description="e.g. title:abc"),
+        include: Optional[str] = None,
     ) -> None:
         self.limit = max(0, limit)
         self.offset = max(0, offset)
         self.sort = self._parse_sort(sort)
         self.filters = self._parse_filters(filters or "")
         self.include_ids: List[int] = ([int(x) for x in include.split(",") if x.strip().isdigit()] if include else [])[
-                                      :50
-                                      ]
+            :50
+        ]
 
     @staticmethod
     def _parse_sort(sort_str: Optional[str]) -> list[dict[str, str]]:
@@ -78,8 +78,8 @@ class PaginateRequest:
             filters_dict[key] = value_cast
         return filters_dict
 
-    def remove_deleted(self, deleted_at_field: str = 'deleted_at'):
-        self.filters = self.filters | {'deleted_at': None}
+    def remove_deleted(self, deleted_at_field: str = "deleted_at"):
+        self.filters = self.filters | {"deleted_at": None}
 
 
 class PaginateResponse:
@@ -88,12 +88,12 @@ class PaginateResponse:
     """
 
     def __init__(
-            self,
-            data: list[Any],
-            total_count: int | None,
-            limit: int,
-            offset: int,
-            use_data_key: bool = True,
+        self,
+        data: list[Any],
+        total_count: int | None,
+        limit: int,
+        offset: int,
+        use_data_key: bool = True,
     ) -> None:
         self.data = data
         self.total_count = total_count

{nlbone-0.6.16 → nlbone-0.6.17}/src/nlbone/interfaces/api/schema/base_response_model.py

@@ -1,4 +1,3 @@
-
 from pydantic import BaseModel, ConfigDict, model_serializer
 
 EXCLUDE_NONE = "exclude_none"