nlbone 0.8.1__tar.gz → 0.8.3__tar.gz

{nlbone-0.8.1 → nlbone-0.8.3}/PKG-INFO

@@ -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 → nlbone-0.8.3}/pyproject.toml

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

{nlbone-0.8.1 → nlbone-0.8.3}/src/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-0.8.1 → nlbone-0.8.3}/src/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-0.8.3/src/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)
+