nlbone 0.8.1__py3-none-any.whl → 0.8.3__py3-none-any.whl

nlbone/interfaces/api/additional_filed/assembler.py

@@ -14,6 +14,7 @@ def assemble_response(
     session,
     base_schema: type[BaseModel] | None,
     scope_map: dict[str, set[str]] = None,
+    **kwargs,
 ) -> Dict[str, Any]:
     base = {f: getattr(obj, f, None) for f in reg.default_fields - set(reg.rules.keys())}
     if base_schema:
@@ -24,6 +25,7 @@ def assemble_response(
         "entity": obj,
         "db": session,
         "pricing_service": Container.pricing_service(),
+        **kwargs,
     }
     roots = {name.split(".", 1)[0] for name in selected_rules.keys()}
     for root in roots:

nlbone/utils/http.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import json
 from typing import Any
-from urllib.parse import urlparse, urlunparse, urlsplit, urlunsplit
+from urllib.parse import urlparse, urlunparse
 
 from nlbone.utils.context import current_request
 
@@ -32,14 +32,6 @@ def normalize_https_base(url: str, enforce_https: bool = True) -> str:
 
 
 def get_service_base_url() -> str:
-    req = current_request()
-
-    base_url = req.base_url
-    if isinstance(base_url, (bytes, bytearray)):
-        base_url = base_url.decode("utf-8", "strict")
-
-    forwarded_proto = (req.headers.get("x-forwarded-proto") or "").split(",")[0].strip().lower()
-    scheme = forwarded_proto if forwarded_proto in {"http", "https"} else urlsplit(base_url).scheme or "http"
-
-    parts = urlsplit(base_url)
-    return urlunsplit((scheme, parts.netloc, parts.path, "", ""))
+    req = current_request()          # Starlette Request
+    url = req.base_url               # URL object
+    return str(url.replace(scheme="https"))

nlbone/utils/read_files.py

@@ -0,0 +1,13 @@
+import json
+from pathlib import Path
+
+
+def load_json_file(file_path: str) -> dict:
+    path = Path(file_path)
+
+    if not path.exists():
+        raise FileNotFoundError(f"No file found at {file_path}")
+
+    with path.open(mode='r', encoding='utf-8') as file:
+        return json.load(file)
+

{nlbone-0.8.1.dist-info → nlbone-0.8.3.dist-info}/METADATA

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

{nlbone-0.8.1.dist-info → nlbone-0.8.3.dist-info}/RECORD

@@ -75,7 +75,7 @@ nlbone/interfaces/api/exceptions.py,sha256=IggZxV9q6l4jqw-G7SWEmuyXnWgbNXJJT-rmn
 nlbone/interfaces/api/routers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/schemas.py,sha256=34Tz2EeXyf12rFL9iyYWaB2ftuaXUebQQQxSO9ouV94,133
 nlbone/interfaces/api/additional_filed/__init__.py,sha256=BWemliLSQV9iq1vdUaF733q0FOSipSWBOQk9eYj732Q,318
-nlbone/interfaces/api/additional_filed/assembler.py,sha256=80sFuNiquqdLPOcx7MoQ_ud9fAJtA327M77Z9V47pIU,1956
+nlbone/interfaces/api/additional_filed/assembler.py,sha256=E_TGxorIQ-hC5FiCup5WQ0MmbSGfNaypEf5Plc-rjJs,1988
 nlbone/interfaces/api/additional_filed/field_registry.py,sha256=IhIvzHWOMtKv8iTdFu7LzQboi4SFTLOyJqKdYPY8xFE,5418
 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
@@ -111,12 +111,13 @@ nlbone/utils/context.py,sha256=Wq3QLYsMzo_xUiVAHLgEPQUG6LhgJTmFn8MO5Qa7S8w,1837
 nlbone/utils/crypto.py,sha256=PX0Tlf2nqXcGbuv16J26MoUPzo2c4xcD4sZBXxhBXgQ,746
 nlbone/utils/flatten_dict.py,sha256=nkx8gAcJkjCKG3I5y9clqtjGMZCWyUWRhgD2R8zGEqM,299
 nlbone/utils/flatten_sqlalchemy_result.py,sha256=JGwQEauoJVjhzvXrOtqabj3wQ7zp2-OPwhuh44sUdUE,625
-nlbone/utils/http.py,sha256=Jr15AqXUZKcVfN7-_4SbIGXHr6RWb5TkDHChgCOTxMY,1451
+nlbone/utils/http.py,sha256=llb4aPDL-Uvrht3c_VwJdngdKeT4WsCu1pXSoeI7vWA,1114
 nlbone/utils/normalize_mobile.py,sha256=sGH4tV9gX-6eVKozviNWJhm1DN1J28Nj-ERldCYkS_E,732
+nlbone/utils/read_files.py,sha256=mx8dfvtaaARQFRp_U7OOiERg-GT62h09_lpTzIQsVhs,291
 nlbone/utils/redactor.py,sha256=-V4HrHmHwPi3Kez587Ek1uJlgK35qGSrwBOvcbw8Jas,1279
 nlbone/utils/time.py,sha256=DjjyQ9GLsfXoT6NK8RDW2rOlJg3e6sF04Jw6PBUrSvg,1268
-nlbone-0.8.1.dist-info/METADATA,sha256=usSyN8iAxBHjnqy16NmMevqKcKHc8G5bVLgyHtGzPx0,2294
-nlbone-0.8.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nlbone-0.8.1.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.8.1.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.8.1.dist-info/RECORD,,
+nlbone-0.8.3.dist-info/METADATA,sha256=b7l7LGRljEWHWYG8N-qglOOfhmjfsOQfoJOpAA6_Og8,2294
+nlbone-0.8.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nlbone-0.8.3.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.8.3.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.8.3.dist-info/RECORD,,