nlbone 0.6.16__py3-none-any.whl → 0.6.18__py3-none-any.whl

nlbone/adapters/db/postgres/query_builder.py

@@ -340,8 +340,10 @@ def get_paginated_response(
     with_count: bool = True,
     output_cls: Optional[Type] = None,
     eager_options: Optional[Sequence[LoaderOption]] = None,
+    query = None
 ) -> dict:
-    query = session.query(entity)
+    if not query:
+        query = session.query(entity)
     if eager_options:
         query = query.options(*eager_options)
 

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/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/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/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/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/interfaces/api/schema/base_response_model.py

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

nlbone/interfaces/jobs/dispatch_outbox.py

@@ -0,0 +1,7 @@
+import time
+from nlbone.adapters.messaging.event_bus import OutboxDispatcher
+
+def main(dispatcher: OutboxDispatcher, interval_sec: int = 2):
+    while True:
+        count = dispatcher.run_once()
+        time.sleep(interval_sec)

{nlbone-0.6.16.dist-info → nlbone-0.6.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.6.16
+Version: 0.6.18
 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.dist-info → nlbone-0.6.18.dist-info}/RECORD

@@ -15,7 +15,7 @@ nlbone/adapters/db/postgres/__init__.py,sha256=6JYJH0xZs3aR-zuyMpRhsdzFugmqz8npr
 nlbone/adapters/db/postgres/audit.py,sha256=8f5XOuW7_ybJyy_STam1FNzqmZAAVAu7tmMRUkCGJOM,4594
 nlbone/adapters/db/postgres/base.py,sha256=kha9xmklzhuQAK8QEkNBn-mAHq8dUKbOM-3abaBpWmQ,71
 nlbone/adapters/db/postgres/engine.py,sha256=UCegauVB1gvo42ThytYnn5VIcQBwR-5xhcXYFApRFNk,3448
-nlbone/adapters/db/postgres/query_builder.py,sha256=V-Eb98xi9ajhJaEAW1BMtZot9A3muZa5gO_NRhYR0bQ,12505
+nlbone/adapters/db/postgres/query_builder.py,sha256=wtOIsUJ3iM5-vFxIUfbkM6I13WE4fSw8pJKdVi4jgXY,12544
 nlbone/adapters/db/postgres/repository.py,sha256=J_DBE73JhHPYCk90c5-O7lQtZbxDgqjjN9OcWy4Omvs,1660
 nlbone/adapters/db/postgres/schema.py,sha256=NlE7Rr8uXypsw4oWkdZhZwcIBHQEPIpoHLxcUo98i6s,1039
 nlbone/adapters/db/postgres/uow.py,sha256=nRxNpY-WoWHpym-XeZ8VHm0MYvtB9wuopOeNdV_ebk8,2088
@@ -61,14 +61,14 @@ nlbone/interfaces/api/exceptions.py,sha256=mvpfTf_CUy1V3Y1iGLMGJh_yWfNlJs_ubrYtJ
 nlbone/interfaces/api/routers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/schemas.py,sha256=NIEKeTdJtwwIkIxL7WURNZF8g34I4TlRAqs-x1Uq7YI,108
 nlbone/interfaces/api/additional_filed/__init__.py,sha256=BWemliLSQV9iq1vdUaF733q0FOSipSWBOQk9eYj732Q,318
-nlbone/interfaces/api/additional_filed/assembler.py,sha256=MyB6YimAAzMe5WUZtHei7a4ITsOpYhrDWIWNAKq7tY8,1599
-nlbone/interfaces/api/additional_filed/field_registry.py,sha256=ScpMsjDBkuUdh_FaBmk1EXBeydERcNthyom1tcJK3BM,3820
-nlbone/interfaces/api/additional_filed/resolver.py,sha256=eVBPj6WsUkZbM3wGPyexwA6d5GThCSgbwNzzHImaOyU,3767
+nlbone/interfaces/api/additional_filed/assembler.py,sha256=80sFuNiquqdLPOcx7MoQ_ud9fAJtA327M77Z9V47pIU,1956
+nlbone/interfaces/api/additional_filed/field_registry.py,sha256=xrA-2pMqX6JA4vy7LliJv5btQdy-6AKctFxZZCpWVOI,5321
+nlbone/interfaces/api/additional_filed/resolver.py,sha256=jv1TIBBHN4LBIMwHGipcy4iq0uP0r6udyaqvhRzb8Bk,4655
 nlbone/interfaces/api/additional_filed/default_field_rules/__init__.py,sha256=LUSAOO3xRUt5ptlraIx7H-7dSkdr1D-WprmnqXRB16g,48
 nlbone/interfaces/api/additional_filed/default_field_rules/image_field_rules.py,sha256=ecKqPeXZ-YiF14RK9PmK7ln3PCzpCUc18S5zm5IF3fw,339
 nlbone/interfaces/api/dependencies/__init__.py,sha256=rnYRrFVZCfICQrp_PVFlzNg3BeC57yM08wn2DbOHCfk,359
 nlbone/interfaces/api/dependencies/async_auth.py,sha256=bfxgBXhp29WqevjTG4jrdPNR-75APm4jKyHdOOtxnp4,1825
-nlbone/interfaces/api/dependencies/auth.py,sha256=SVqdH78ek65MdT-81_tJo9QiEbnERAh9dR10pRdTDb8,2833
+nlbone/interfaces/api/dependencies/auth.py,sha256=uJONw74kBh_r-ycH6ra4huBQEE8aia95CjbULPJhyQ8,2834
 nlbone/interfaces/api/dependencies/db.py,sha256=-UD39J_86UU7ZJs2ZncpdND0yhAG0NeeeALrgSDuuFw,466
 nlbone/interfaces/api/dependencies/uow.py,sha256=QfLEvLYLNWZJQN1k-0q0hBVtUld3D75P4j39q_RjcnE,1181
 nlbone/interfaces/api/middleware/__init__.py,sha256=zbX2vaEAfxRMIYwO2MVY_2O6bqG5H9o7HqGpX14U3Is,158
@@ -76,14 +76,15 @@ nlbone/interfaces/api/middleware/access_log.py,sha256=vIkxxxfy2HcjqqKb8XCfGCcSri
 nlbone/interfaces/api/middleware/add_request_context.py,sha256=av-qs0biOYuF9R6RJOo2eYsFqDL9WRYWcjVakFhbt-w,1834
 nlbone/interfaces/api/middleware/authentication.py,sha256=ze7vCm492QsX9nPL6A-PqZCmC1C5ZgUE-OWI6fCLpsU,1809
 nlbone/interfaces/api/pagination/__init__.py,sha256=pA1uC4rK6eqDI5IkLVxmgO2B6lExnOm8Pje2-hifJZw,431
-nlbone/interfaces/api/pagination/offset_base.py,sha256=w44uBX268WW6JWvyV5hBtvTuN3Da8lSfwLDMgSP1CAQ,4044
+nlbone/interfaces/api/pagination/offset_base.py,sha256=65UgQZ70IlWUbP9Usd--IxVYW_V0hQLoyXHVffnLFZ0,3940
 nlbone/interfaces/api/schema/__init__.py,sha256=LAqgynfupeqOQ6u0I5ucrcYnojRMZUg9yW8IjKSQTNI,119
 nlbone/interfaces/api/schema/adaptive_schema.py,sha256=bdWBNpP2NfOJ_in4btXn0lrZOK70x-OqfmZ-NpIJdoQ,3347
-nlbone/interfaces/api/schema/base_response_model.py,sha256=Y-mqNzVheTaGkM4m2DsybK-GLhfODMhBUNyTRoaf_Zc,600
+nlbone/interfaces/api/schema/base_response_model.py,sha256=lkBs7k0IcQiSQdJ3KvqDQPr_zwqKNbwaQjcwAE_chnU,599
 nlbone/interfaces/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/cli/init_db.py,sha256=C67n2MsJ1vzkJxC8zfUYOxFdd6mEB_vT9agxN6jWoG8,790
 nlbone/interfaces/cli/main.py,sha256=pNldsTgplVyXa-Hx96dySO2I9gFRi49nDXv7J_dO73s,686
 nlbone/interfaces/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone/interfaces/jobs/dispatch_outbox.py,sha256=KeCz-fvqBKdD5pqRofNdtisGpkiEi5VWkb-sGD57eIU,227
 nlbone/interfaces/jobs/sync_tokens.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/utils/cache.py,sha256=hVfkR62o5vllDrE_nY4At10wK0It6qpZ45K1xoj10cQ,5931
@@ -93,8 +94,8 @@ nlbone/utils/context.py,sha256=MmclJ24BG2uvSTg1IK7J-Da9BhVFDQ5ag4Ggs2FF1_w,1600
 nlbone/utils/http.py,sha256=UXUoXgQdTRNT08ho8zl-C5ekfDsD8uf-JiMQ323ooqw,872
 nlbone/utils/redactor.py,sha256=-V4HrHmHwPi3Kez587Ek1uJlgK35qGSrwBOvcbw8Jas,1279
 nlbone/utils/time.py,sha256=DjjyQ9GLsfXoT6NK8RDW2rOlJg3e6sF04Jw6PBUrSvg,1268
-nlbone-0.6.16.dist-info/METADATA,sha256=z5PdS95EZDyFi5vrYuOlPi15vE-BkjX37l0SD4od30M,2228
-nlbone-0.6.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nlbone-0.6.16.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.6.16.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.6.16.dist-info/RECORD,,
+nlbone-0.6.18.dist-info/METADATA,sha256=OLYDCTskzO9n0jDia3Sg_vVvLQLY30w_djubvJinxwU,2228
+nlbone-0.6.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nlbone-0.6.18.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.6.18.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.6.18.dist-info/RECORD,,