nlbone 0.7.29__py3-none-any.whl → 0.7.31__py3-none-any.whl

nlbone/adapters/i18n/__init__.py

@@ -1,7 +1,11 @@
 from pathlib import Path
 
+from nlbone.config.settings import get_settings
+
 from .engine import I18nAdapter
-from .loaders import JSONFileLoader
+from .loaders import JSONFileLoader, CompositeLoader
 
-translator = I18nAdapter(loader=JSONFileLoader(locales_path=Path(__file__).parent.joinpath("./locales").__str__()),
-                         default_locale="fa")
+loader = CompositeLoader()
+loader.add_loader(JSONFileLoader(locales_path=Path(__file__).parent.joinpath("./locales").__str__()))
+JSONFileLoader(locales_path=lambda: get_settings().PROJECT_LOCALE_PATH)
+translator = I18nAdapter(loader=loader, default_locale="fa-IR")

nlbone/adapters/i18n/engine.py

@@ -7,12 +7,19 @@ from .loaders import BaseLoader
 
 
 class I18nAdapter(TranslationPort):
-    def __init__(self, loader: BaseLoader, default_locale: str = "fa"):
+    def __init__(self, loader: BaseLoader, default_locale: str = "fa-IR"):
         self.default_locale = default_locale
-        self._translations: Dict[str, Dict[str, str]] = loader.load()
+        self.loader = loader
+        self._translations: Optional[Dict[str, Dict[str, str]]] = None
+
+    def _ensure_loaded(self):
+        if self._translations is None:
+            self._translations = self.loader.load()
 
     def translate(self, key: str, locale: Optional[str] = None, **kwargs) -> str:
-        target_locale = locale or get_locale() or self.default_locale
+        self._ensure_loaded()
+
+        target_locale = locale or self.default_locale
 
         locale_data = self._translations.get(target_locale, {})
         text = locale_data.get(key)

nlbone/adapters/i18n/loaders.py

@@ -2,7 +2,7 @@ import json
 import logging
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any, Dict, List, Callable, Union
 
 logger = logging.getLogger(__name__)
 
@@ -13,33 +13,38 @@ class BaseLoader(ABC):
         pass
 
 
+from typing import Callable, Union
+
+
 class JSONFileLoader(BaseLoader):
-    def __init__(self, locales_path: str):
-        self.locales_path = locales_path
+    def __init__(self, locales_path: Union[str, Callable[[], str]]):
+        self.locales_path_provider = locales_path
 
     def load(self) -> Dict[str, Dict[str, str]]:
         translations: Dict[str, Dict[str, str]] = {}
 
-        path_obj = Path(self.locales_path)
+        if callable(self.locales_path_provider):
+            path_str = self.locales_path_provider()
+        else:
+            path_str = self.locales_path_provider
+
+        if not path_str:
+            return translations
+
+        path_obj = Path(path_str)
 
         if not path_obj.exists():
-            logger.warning(f"Locales directory not found at: {self.locales_path}")
             return translations
 
         for file_path in path_obj.glob("*.json"):
             try:
                 lang_code = file_path.stem
-
                 with open(file_path, "r", encoding="utf-8") as f:
                     data = json.load(f)
 
                 flat_data = self._flatten_dict(data)
                 translations[lang_code] = flat_data
 
-                logger.info(f"Loaded locale '{lang_code}' with {len(flat_data)} keys.")
-
-            except json.JSONDecodeError as e:
-                logger.error(f"Invalid JSON format in {file_path}: {e}")
             except Exception as e:
                 logger.error(f"Error loading locale {file_path}: {e}")
 
@@ -49,10 +54,28 @@ class JSONFileLoader(BaseLoader):
         items = []
         for k, v in d.items():
             new_key = f"{parent_key}{sep}{k}" if parent_key else k
-
             if isinstance(v, dict):
                 items.extend(self._flatten_dict(v, new_key, sep=sep).items())
             else:
                 items.append((new_key, str(v)))
-
         return dict(items)
+
+
+class CompositeLoader(BaseLoader):
+    def __init__(self):
+        self.loaders = []
+
+    def add_loader(self, loader: BaseLoader):
+        self.loaders.append(loader)
+
+    def load(self) -> Dict[str, Dict[str, str]]:
+        merged_translations: Dict[str, Dict[str, str]] = {}
+
+        for loader in self.loaders:
+            data = loader.load()
+            for lang, keys in data.items():
+                if lang not in merged_translations:
+                    merged_translations[lang] = {}
+                merged_translations[lang].update(keys)
+
+        return merged_translations

nlbone/adapters/i18n/locales/fa-IR.json

@@ -1,11 +1,4 @@
 {
-  "general": {
-    "welcome": "خوش آمدید",
-    "buttons": {
-      "save": "ذخیره",
-      "cancel": "لغو"
-    }
-  },
   "auth": {
     "otp_sent": "کد تایید برای {mobile} ارسال شد."
   },

nlbone/config/settings.py

@@ -113,6 +113,8 @@ class Settings(BaseSettings):
     RABBITMQ_TICKETING_EXCHANGE: str = "crm_stage.ticket"
     RABBITMQ_TICKETING_ROUTING_KEY_CREATE_V1: str = "crm_stage.ticket.create.v1"
 
+    PROJECT_LOCALE_PATH: str = ""
+
     model_config = SettingsConfigDict(
         env_prefix="",
         env_file=None,

nlbone/interfaces/api/exception_handlers.py

@@ -60,7 +60,8 @@ def install_exception_handlers(
                 "http_error",
                 extra={"status": exc.status_code, "detail": exc.detail, "path": request.url.path},
             )
-        return _json_response(request, exc.status_code, detail=_(exc.detail))
+        locale = locale = getattr(request.state, "locale", None)
+        return _json_response(request, exc.status_code, detail=_(exc.detail, locale=locale))
 
     @app.exception_handler(FastAPIHTTPException)
     async def _handle_fastapi_http_exception(request: Request, exc: FastAPIHTTPException):
@@ -69,7 +70,8 @@ def install_exception_handlers(
                 "fastapi_http_error",
                 extra={"status": exc.status_code, "detail": exc.detail, "path": request.url.path},
             )
-        return _json_response(request, exc.status_code, detail=exc.detail)
+        locale = locale = getattr(request.state, "locale", None)
+        return _json_response(request, exc.status_code, detail=_(exc.detail, locale=locale))
 
     @app.exception_handler(StarletteHTTPException)
     async def _handle_starlette_http_exception(request: Request, exc: StarletteHTTPException):
@@ -78,7 +80,8 @@ def install_exception_handlers(
                 "starlette_http_error",
                 extra={"status": exc.status_code, "detail": exc.detail, "path": request.url.path},
             )
-        return _json_response(request, exc.status_code, detail=exc.detail)
+        locale = locale = getattr(request.state, "locale", None)
+        return _json_response(request, exc.status_code, detail=_(exc.detail, locale=locale))
 
     # 3) خطاهای اعتبارسنجی FastAPI (request body/query/path)
     @app.exception_handler(RequestValidationError)
@@ -107,4 +110,5 @@ def install_exception_handlers(
         if logger:
             logger.exception("unhandled_exception", extra={"trace_id": tid, "path": request.url.path})
         detail = str(exc) if expose_server_errors else "internal server error"
-        return _json_response(request, 500, detail=detail, trace_id=tid)
+        locale = locale = getattr(request.state, "locale", None)
+        return _json_response(request, 500, detail=_(detail, locale=locale), trace_id=tid)

nlbone/interfaces/api/exceptions.py

@@ -99,3 +99,10 @@ class GoneException(BaseHttpException):
             status_code=status.HTTP_410_GONE,
             detail=detail,
         )
+
+class TooManyRequestsException(BaseHttpException):
+    def __init__(self, detail: str = "TooManyRequests"):
+        super().__init__(
+            status_code=status.HTTP_429_TOO_MANY_REQUESTS,
+            detail=detail,
+        )

nlbone/interfaces/api/middleware/add_request_context.py

@@ -46,6 +46,7 @@ class AddRequestContextMiddleware(BaseHTTPMiddleware):
         ip = request.client.host if request.client else None
         ua = request.headers.get("user-agent")
         locale = request.headers.get("Accept-Language", 'fa-IR')
+        request.state.locale = locale
 
         tokens = bind_context(request=request, request_id=req_id, user_id=user_id, ip=ip, user_agent=ua, locale=locale)
         try:

{nlbone-0.7.29.dist-info → nlbone-0.7.31.dist-info}/METADATA

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

{nlbone-0.7.29.dist-info → nlbone-0.7.31.dist-info}/RECORD

@@ -30,10 +30,10 @@ nlbone/adapters/http_clients/pricing/pricing_service.py,sha256=_15vyEwJD3S2DJG-y
 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
-nlbone/adapters/i18n/__init__.py,sha256=19C_u8ZzWLQRfhG96FmEyk9x3pP9Iv8yEk59Or7UMU8,257
-nlbone/adapters/i18n/engine.py,sha256=f_nxxy-_T5CITnPp3vnxBl0hZZ8MSn0aA-PzajSx_dQ,908
-nlbone/adapters/i18n/loaders.py,sha256=Qz2B8YFaYx8u5OusO4Vo2zCwvnnVfTH7fetAOJZiK3c,1778
-nlbone/adapters/i18n/locales/fa-IR.json,sha256=SMShgJErN-tDLOSH3hAsjg08O8GPlDfDVyFGjIUQpGU,340
+nlbone/adapters/i18n/__init__.py,sha256=fS97TR7HEc7fiDC2ufQKoFOxXDNkGA4njAFIB3EmhLk,426
+nlbone/adapters/i18n/engine.py,sha256=55DbbVPPHG64o640BzWDsjaxRfu6GykZzVBqME03iDE,1078
+nlbone/adapters/i18n/loaders.py,sha256=7td0Cmn0ehjDO2S2qeH31zwl8UyWI7quzedP9PnPhWk,2381
+nlbone/adapters/i18n/locales/fa-IR.json,sha256=QL4XSuSIL82wYhBrvyOAoMM0rG9yjKuOue43_YItuSM,208
 nlbone/adapters/messaging/__init__.py,sha256=o6ZiMihm_MhRXfcEpcjHBB3JGQovQbg3pxe0qS6516c,41
 nlbone/adapters/messaging/event_bus.py,sha256=MSM70JPHoDK17efWlh20ATT1O0KW7xWnwZ5D-gI6U_w,3773
 nlbone/adapters/messaging/rabbitmq.py,sha256=Io3flSj8DMIHExJguh3hDgWT4LuDoPYb_xmQQ3k47Cs,1894
@@ -47,7 +47,7 @@ nlbone/adapters/ticketing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 nlbone/adapters/ticketing/client.py,sha256=J1-eT3qQDAJqrHcVpP1oqWNsRNnJ54dDdBeez-m9wyY,1291
 nlbone/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/config/logging.py,sha256=Ot6Ctf7EQZlW8YNB-uBdleqI6wixn5fH0Eo6QRgNkQk,4358
-nlbone/config/settings.py,sha256=2Kx7RZ7IwqTNTKB_0jLxy6G-qkeTWKGVqohLIIwA1DU,4750
+nlbone/config/settings.py,sha256=vOB8RQ5iBdbRpvcbBF7Cdpr9IwdarrHPz-ncQ_yQA8g,4785
 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
@@ -70,8 +70,8 @@ nlbone/core/ports/translation.py,sha256=pnqbxhdRCR7eprm8UI8ZKKx7VDUPntvBtlytrnTG
 nlbone/core/ports/uow.py,sha256=VhqSc-Ryt9m-rlNMiXTzD3dPGz6mM_JxND8D0UJGRu4,962
 nlbone/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone/interfaces/api/exception_handlers.py,sha256=pk7ehq15fZ6If57BvDjo_Ot-R5hTEFMhBP5KDwp61AM,4102
-nlbone/interfaces/api/exceptions.py,sha256=Phv0nXaEHCgJVEAuQ2q8QHxpn_diXahKarupSHOATY0,2964
+nlbone/interfaces/api/exception_handlers.py,sha256=jH2VAgx63auFSat1H3uQ0Z9JrJ6YYN57dFuqwKzT7EU,4431
+nlbone/interfaces/api/exceptions.py,sha256=06S677YplJgODjVaa3fP00dPy9i-bNIlDWg1t5Q8EZc,3194
 nlbone/interfaces/api/routers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/schemas.py,sha256=NIEKeTdJtwwIkIxL7WURNZF8g34I4TlRAqs-x1Uq7YI,108
 nlbone/interfaces/api/additional_filed/__init__.py,sha256=BWemliLSQV9iq1vdUaF733q0FOSipSWBOQk9eYj732Q,318
@@ -88,7 +88,7 @@ nlbone/interfaces/api/dependencies/db.py,sha256=-UD39J_86UU7ZJs2ZncpdND0yhAG0Nee
 nlbone/interfaces/api/dependencies/uow.py,sha256=QfLEvLYLNWZJQN1k-0q0hBVtUld3D75P4j39q_RjcnE,1181
 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=rRxsE34XvsefN3HufZQyXqPFzCeWhdn3qel0-cS2QZM,1914
+nlbone/interfaces/api/middleware/add_request_context.py,sha256=o8mdo-D6fODM9OyHunE5UodkVxsh4F__5tDv8ju8Sxg,1952
 nlbone/interfaces/api/middleware/authentication.py,sha256=Bt6sYu4KtXAyUQnSIp-Z2Z1yKNNtfRy9Y3rOZcYTFhw,3299
 nlbone/interfaces/api/pagination/__init__.py,sha256=pA1uC4rK6eqDI5IkLVxmgO2B6lExnOm8Pje2-hifJZw,431
 nlbone/interfaces/api/pagination/offset_base.py,sha256=60X8a9uDOSd3qG45M49dqNG_FUjSxEDrgEyb9JD9V-o,4113
@@ -114,8 +114,8 @@ nlbone/utils/http.py,sha256=0yeI34j5FfelqvX3PJnKknSXji1jl15VYbVIIvrSbXg,997
 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.29.dist-info/METADATA,sha256=BjeBTqBMp4Ob1lqx8s8ihRQ5URDcY3e-P8sc5hTyaxY,2295
-nlbone-0.7.29.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nlbone-0.7.29.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.7.29.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.7.29.dist-info/RECORD,,
+nlbone-0.7.31.dist-info/METADATA,sha256=18DKVQix7O0AX3SAPyjkekbvQpeNzlizIQ0KVPW3E8s,2295
+nlbone-0.7.31.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nlbone-0.7.31.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.7.31.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.7.31.dist-info/RECORD,,