nlbone 0.9.3__tar.gz → 0.9.5__tar.gz

{nlbone-0.9.3 → nlbone-0.9.5}/PKG-INFO

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

{nlbone-0.9.3 → nlbone-0.9.5}/pyproject.toml

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

{nlbone-0.9.3 → nlbone-0.9.5}/src/nlbone/adapters/auth/auth_service.py

@@ -35,7 +35,7 @@ class AuthService(BaseAuthService):
     def get_client_id(self, token: str):
         data = self.verify_token(token)
         if data:
-            return data["sub"] if data["sub"].startswith("service-account") else None
+            return data["preferred_username"] if data["preferred_username"].startswith("service-account") else None
         return None
 
     def get_client_token(self) -> dict | None:

{nlbone-0.9.3 → nlbone-0.9.5}/src/nlbone/adapters/http_clients/pricing/pricing_service.py

@@ -1,3 +1,4 @@
+import json
 from decimal import Decimal
 from enum import Enum
 from typing import Any, Dict, List, Literal, Optional, Union
@@ -66,13 +67,20 @@ class CalculatePriceOut(RootModel[Union[List[PricingRule], Dict[str, PricingRule
     pass
 
 
+class DecimalEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, Decimal):
+            return float(obj)
+        return super(DecimalEncoder, self).default(obj)
+
+
 class PricingService:
     def __init__(
-        self,
-        token_provider: ClientTokenProvider,
-        base_url: Optional[str] = None,
-        timeout_seconds: Optional[float] = None,
-        client: httpx.Client | None = None,
+            self,
+            token_provider: ClientTokenProvider,
+            base_url: Optional[str] = None,
+            timeout_seconds: Optional[float] = None,
+            client: httpx.Client | None = None,
     ) -> None:
         s = get_settings()
         self._base_url = normalize_https_base(base_url or str(s.PRICING_SERVICE_URL), enforce_https=False)
@@ -81,7 +89,11 @@ class PricingService:
         self._token_provider = token_provider
 
     def calculate(self, items: list[CalculatePriceIn], response: Literal["list", "dict"] = "dict") -> CalculatePriceOut:
-        body = {"items": [i.model_dump() for i in items]}
+        body = json.dumps(
+            {"items": [i.model_dump() for i in items]},
+            cls=DecimalEncoder
+        )
+        body = json.loads(body)
 
         r = self._client.post(
             f"{self._base_url}/price/calculate",

{nlbone-0.9.3 → nlbone-0.9.5}/src/nlbone/interfaces/api/dependencies/auth.py

@@ -65,11 +65,11 @@ def user_authenticated(func):
 
 
 def user_has_access_func(*, permissions=None):
-    if bypass_authz():
-        return True
     request = current_request()
     if not current_user_id():
         raise UnauthorizedException()
+    if bypass_authz():
+        return True
     if not get_auth_service().has_access(request.state.token, permissions=permissions):
         raise ForbiddenException(f"Forbidden {permissions}")
     return True