nlbone 0.7.13__py3-none-any.whl → 0.7.15__py3-none-any.whl

nlbone/adapters/http_clients/pricing/pricing_service.py

@@ -86,7 +86,8 @@ class PricingService:
         r = self._client.post(
             f"{self._base_url}/price/calculate",
             params={"response": response},
-            headers=auth_headers(self._token_provider.get_access_token()),
+            headers={'X-Api-Key': get_settings().PRICING_API_SECRET, 'X-Client-Id': get_settings().KEYCLOAK_CLIENT_ID},
+            # headers=auth_headers(self._token_provider.get_access_token()),
             json=body,
             timeout=self._timeout,
             verify=False,

nlbone/config/settings.py

@@ -60,6 +60,7 @@ class Settings(BaseSettings):
     KEYCLOAK_REALM_NAME: str = Field(default="numberland")
     KEYCLOAK_CLIENT_ID: str = Field(default="nlbone")
     KEYCLOAK_CLIENT_SECRET: SecretStr = Field(default=SecretStr("dev-secret"))
+    PRICING_API_SECRET: str = ''
 
     AUTH_SERVICE_URL:  AnyHttpUrl = Field(default="https://auth.numberland.ir")
 

nlbone/interfaces/api/middleware/authentication.py

@@ -3,6 +3,7 @@ from typing import Callable, Optional, Union
 from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware
 
+from nlbone.config.settings import get_settings
 from nlbone.adapters.auth.auth_service import AuthService
 
 try:
@@ -71,9 +72,13 @@ class AuthenticationMiddleware(BaseHTTPMiddleware):
         self._get_auth = _to_factory(auth)
 
     async def dispatch(self, request: Request, call_next):
-        request.state.client_id = request.headers.get("X-Client-Id")
+        request.state.client_id = None
         request.state.user_id = None
         request.state.token = None
+        if request.headers.get('X-Client-Id') and request.headers.get("X-Api_Key"):
+            if request.headers.get("X-Api_Key") == get_settings().PRICING_API_SECRET:
+                request.state.client_id = request.headers.get("X-Client-Id")
+                return await call_next(request)
         if request.headers.get('X-Client-Id') == 'website' and request.headers.get("Authorization"):
             authenticate_user(request)
         elif request.cookies.get("access_token"):

nlbone/utils/cache.py

@@ -2,7 +2,7 @@ import asyncio
 import inspect
 import json
 from typing import Any, Callable, Iterable, Optional, Mapping
-
+import hashlib
 from makefun import wraps as mf_wraps
 
 from nlbone.interfaces.api.additional_filed import AdditionalFieldsRequest
@@ -78,7 +78,7 @@ def _key_from_template(
         payload,
         sort_keys=True,
     )
-    return f"{func.__module__}:{func.__qualname__}:{hash(payload)}"
+    return f"{func.__module__}:{func.__qualname__}:{hashlib.sha1(payload.encode('utf-8')).hexdigest()}"
 
 
 def _format_tags(

{nlbone-0.7.13.dist-info → nlbone-0.7.15.dist-info}/METADATA

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

{nlbone-0.7.13.dist-info → nlbone-0.7.15.dist-info}/RECORD

@@ -26,7 +26,7 @@ nlbone/adapters/db/redis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 nlbone/adapters/db/redis/client.py,sha256=5SUnwP2-GrueSFimUbiqDvrQsumvIE2aeozk8l-vOfQ,466
 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=fYfMQh3qW_YDNkBW19RkDkIet7zUDzb2HsIT5dr1Q7Y,3319
+nlbone/adapters/http_clients/pricing/pricing_service.py,sha256=RN9M0RPl5QMxUUb7OfCw3id0xWd1oR2qrEstChHnsls,3441
 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
@@ -43,7 +43,7 @@ nlbone/adapters/ticketing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 nlbone/adapters/ticketing/client.py,sha256=GAr0_4DVqVCDV7tT2gkxRyKIsvLwJRlT-xx8fsfOVJE,1303
 nlbone/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/config/logging.py,sha256=Ot6Ctf7EQZlW8YNB-uBdleqI6wixn5fH0Eo6QRgNkQk,4358
-nlbone/config/settings.py,sha256=o5kJBHuv-XKFOe_yQtkR0YrEbI2uZ89JpGjzDYhE7o4,4507
+nlbone/config/settings.py,sha256=BABYoUBWXazg09bO4QNZDc2Dxg1onCx0hO72ETC4Yb0,4540
 nlbone/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/application/base_worker.py,sha256=5brIToSd-vi6tw0ukhHnUZGZhOLq1SQ-NRRy-kp6D24,1193
@@ -83,7 +83,7 @@ nlbone/interfaces/api/dependencies/uow.py,sha256=QfLEvLYLNWZJQN1k-0q0hBVtUld3D75
 nlbone/interfaces/api/middleware/__init__.py,sha256=zbX2vaEAfxRMIYwO2MVY_2O6bqG5H9o7HqGpX14U3Is,158
 nlbone/interfaces/api/middleware/access_log.py,sha256=vIkxxxfy2HcjqqKb8XCfGCcSrivAC8u6ie75FMq5x-U,1032
 nlbone/interfaces/api/middleware/add_request_context.py,sha256=av-qs0biOYuF9R6RJOo2eYsFqDL9WRYWcjVakFhbt-w,1834
-nlbone/interfaces/api/middleware/authentication.py,sha256=TaGDvOFmtN5YLVHbEFsB-7xVWYNVpaqtTTgCPZ0T7P0,2799
+nlbone/interfaces/api/middleware/authentication.py,sha256=lSTxhRrbj3WK776uBYou9gxQZj2dWskzsJTFWePtiQc,3112
 nlbone/interfaces/api/pagination/__init__.py,sha256=pA1uC4rK6eqDI5IkLVxmgO2B6lExnOm8Pje2-hifJZw,431
 nlbone/interfaces/api/pagination/offset_base.py,sha256=AwuHLQELAKut58fQSL2hk-QhfwsG1coJWz-Jkh2gnmg,4113
 nlbone/interfaces/api/schema/__init__.py,sha256=LAqgynfupeqOQ6u0I5ucrcYnojRMZUg9yW8IjKSQTNI,119
@@ -98,7 +98,7 @@ nlbone/interfaces/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 nlbone/interfaces/jobs/dispatch_outbox.py,sha256=yLZSC3nvkgxT2LL4Pq_DYzCyf_tZB-FknrjjgN89GFg,809
 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=HyoVIJ9WDSQeSROgCoxY96-NUTajl3A1L2fhxRa1DN0,6988
+nlbone/utils/cache.py,sha256=3iJdPH896yF9iJfs_rGD-98CPamPOVCjn2LX0aGxFEA,7038
 nlbone/utils/cache_keys.py,sha256=Y2YSellHTbUOcoaNbl1jaD4r485VU_e4KXsfBWhYTBo,1075
 nlbone/utils/cache_registry.py,sha256=w28sEfUQZAhzCCqVH5TflWQY3nyDXyEcFWt8hkuHRHw,823
 nlbone/utils/context.py,sha256=MmclJ24BG2uvSTg1IK7J-Da9BhVFDQ5ag4Ggs2FF1_w,1600
@@ -107,8 +107,8 @@ nlbone/utils/http.py,sha256=MPDEyaC16AKsL0YH6sWCPp8NC2TgzEHpWERYK5HcaYQ,1001
 nlbone/utils/normalize_mobile.py,sha256=sGH4tV9gX-6eVKozviNWJhm1DN1J28Nj-ERldCYkS_E,732
 nlbone/utils/redactor.py,sha256=-V4HrHmHwPi3Kez587Ek1uJlgK35qGSrwBOvcbw8Jas,1279
 nlbone/utils/time.py,sha256=DjjyQ9GLsfXoT6NK8RDW2rOlJg3e6sF04Jw6PBUrSvg,1268
-nlbone-0.7.13.dist-info/METADATA,sha256=zRldYwqSoAeRrBOTmqRFV2OH_hZKJgzagNkYHQryokA,2295
-nlbone-0.7.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nlbone-0.7.13.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.7.13.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.7.13.dist-info/RECORD,,
+nlbone-0.7.15.dist-info/METADATA,sha256=4vijLQahgvuIahwx3IeCaXnAb2i9QzbRfpaTUQh779Q,2295
+nlbone-0.7.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nlbone-0.7.15.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.7.15.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.7.15.dist-info/RECORD,,