nlbone 0.7.29__tar.gz → 0.7.31__tar.gz

{nlbone-0.7.29 → nlbone-0.7.31}/PKG-INFO

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

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

nlbone-0.7.31/src/nlbone/adapters/i18n/__init__.py

@@ -0,0 +1,11 @@
+from pathlib import Path
+
+from nlbone.config.settings import get_settings
+
+from .engine import I18nAdapter
+from .loaders import JSONFileLoader, CompositeLoader
+
+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-0.7.29 → nlbone-0.7.31}/src/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-0.7.29 → nlbone-0.7.31}/src/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-0.7.29 → nlbone-0.7.31}/src/nlbone/adapters/i18n/locales/fa-IR.json

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

{nlbone-0.7.29 → nlbone-0.7.31}/src/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-0.7.29 → nlbone-0.7.31}/src/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-0.7.29 → nlbone-0.7.31}/src/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-0.7.29 → nlbone-0.7.31}/src/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/src/nlbone/adapters/i18n/__init__.py

@@ -1,7 +0,0 @@
-from pathlib import Path
-
-from .engine import I18nAdapter
-from .loaders import JSONFileLoader
-
-translator = I18nAdapter(loader=JSONFileLoader(locales_path=Path(__file__).parent.joinpath("./locales").__str__()),
-                         default_locale="fa")