nlbone 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

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/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/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

{nlbone-0.9.3.dist-info → nlbone-0.9.5.dist-info}/METADATA

@@ -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.dist-info → nlbone-0.9.5.dist-info}/RECORD

@@ -4,7 +4,7 @@ nlbone/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/__init__.py,sha256=NzUmk4XPyp3GJOw7VSE86xkQMZLtG3MrOoXLeoB551M,41
 nlbone/adapters/snowflake.py,sha256=eC5eXWgkTIJlO5J44VFbD1-MXj8HYs0lCNp37paSfXY,2324
 nlbone/adapters/auth/__init__.py,sha256=hkDHvsFhw_UiOHG9ZSMqjiAhK4wumEforitveSZswVw,42
-nlbone/adapters/auth/auth_service.py,sha256=l8SyskSyswas940i-hXEnJ-gboTpjsXURm_GiAMQwMY,2591
+nlbone/adapters/auth/auth_service.py,sha256=CYfOX5M19SGsteHOTNiRLFohaVXx5X5NwmKQI2WLjCQ,2621
 nlbone/adapters/auth/keycloak.py,sha256=IhEriaFl5mjIGT6ZUCU9qROd678ARchvWgd4UJ6zH7s,4925
 nlbone/adapters/auth/token_provider.py,sha256=kzjFAaFY8SPnU0Tn6l-YVrhEOAiFV0QE3eit3D7u2VQ,1438
 nlbone/adapters/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -26,7 +26,7 @@ nlbone/adapters/db/redis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 nlbone/adapters/db/redis/client.py,sha256=cT9TCigE-ndB-ckcpuh8cTS1AOVKS3rWNG_WYxD0CAM,930
 nlbone/adapters/http_clients/__init__.py,sha256=w-Yr9CLuXMU71N0Ada5HbvP1DB53wqeP6B-i5rALlTo,150
 nlbone/adapters/http_clients/pricing/__init__.py,sha256=ElA9NFcAR9u4cqb_w3PPqKU3xGeyjNLQ8veJ0ql2iz0,81
-nlbone/adapters/http_clients/pricing/pricing_service.py,sha256=VJxOyatABcVN6Gjj01h-yN_2PqTdrC_2g6WvTDGMo4k,3441
+nlbone/adapters/http_clients/pricing/pricing_service.py,sha256=EIHxOPEJRGzUKwI3zaFQAawM15xt2Ox3D0Z_mu541_A,3764
 nlbone/adapters/http_clients/uploadchi/__init__.py,sha256=uBzEOuVtY22teWW2b36Pitkdk5yVdSqa6xbg22JfTNg,105
 nlbone/adapters/http_clients/uploadchi/uploadchi.py,sha256=erpjOees25FW0nuK1PkYS-oU0h8MeRV9Rhs1cf3gaEs,4881
 nlbone/adapters/http_clients/uploadchi/uploadchi_async.py,sha256=PQbVNeaYde5CmgT3vcnQoI1PGeSs9AxHlPFuB8biOmU,4717
@@ -82,7 +82,7 @@ nlbone/interfaces/api/additional_filed/default_field_rules/__init__.py,sha256=LU
 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=TZlFzT-mnPz1WBL0wh3nOlBXDjY-7B0-b4wBT8O6pLM,1890
-nlbone/interfaces/api/dependencies/auth.py,sha256=4WrjR3UgHI4S-HnBwdyLKEKBtofHkNuJ63Piayu9Dh4,3200
+nlbone/interfaces/api/dependencies/auth.py,sha256=H7xsvYfcnrgBR4mjhyMnfAMRHFf4QC18vAQ_c52rJUI,3200
 nlbone/interfaces/api/dependencies/client_credential.py,sha256=Bo4dYx75Qw0JzTKD9ZfV5EXDEOuwndJk2D-V37K2ePg,1293
 nlbone/interfaces/api/dependencies/db.py,sha256=-UD39J_86UU7ZJs2ZncpdND0yhAG0NeeeALrgSDuuFw,466
 nlbone/interfaces/api/dependencies/uow.py,sha256=QfLEvLYLNWZJQN1k-0q0hBVtUld3D75P4j39q_RjcnE,1181
@@ -116,8 +116,8 @@ nlbone/utils/normalize_mobile.py,sha256=sGH4tV9gX-6eVKozviNWJhm1DN1J28Nj-ERldCYk
 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.9.3.dist-info/METADATA,sha256=jBFvMHyALb-EjiTWG-9pCxKc-urXlztY-_hsah-4IgI,2294
-nlbone-0.9.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nlbone-0.9.3.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.9.3.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.9.3.dist-info/RECORD,,
+nlbone-0.9.5.dist-info/METADATA,sha256=lc5St2IMS1hkjpvAtPsrJWihPiUUD4NFS5V2y3ntg74,2294
+nlbone-0.9.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nlbone-0.9.5.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.9.5.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.9.5.dist-info/RECORD,,