nlbone 0.6.12__tar.gz → 0.6.13__tar.gz

{nlbone-0.6.12 → nlbone-0.6.13}/PKG-INFO

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

{nlbone-0.6.12 → nlbone-0.6.13}/pyproject.toml

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

{nlbone-0.6.12 → nlbone-0.6.13}/src/nlbone/container.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from typing import Any, Mapping, Optional
+from typing import Dict, Optional
 
 from dependency_injector import containers, providers
+from pydantic_settings import BaseSettings
 
 from nlbone.adapters.auth.keycloak import KeycloakAuthService
 from nlbone.adapters.auth.token_provider import ClientTokenProvider
@@ -15,7 +16,6 @@ from nlbone.adapters.http_clients import PricingService
 from nlbone.adapters.http_clients.uploadchi import UploadchiClient
 from nlbone.adapters.http_clients.uploadchi.uploadchi_async import UploadchiAsyncClient
 from nlbone.adapters.messaging import InMemoryEventBus
-from nlbone.config.settings import Settings
 from nlbone.core.ports import EventBusPort
 from nlbone.core.ports.cache import AsyncCachePort, CachePort
 from nlbone.core.ports.files import AsyncFileServicePort, FileServicePort
@@ -35,7 +35,7 @@ class Container(containers.DeclarativeContainer):
     event_bus: providers.Singleton[EventBusPort] = providers.Singleton(InMemoryEventBus)
 
     # --- Services ---
-    auth: providers.Singleton[KeycloakAuthService] = providers.Singleton(KeycloakAuthService, settings=config)
+    auth: providers.Singleton[KeycloakAuthService] = providers.Singleton(KeycloakAuthService)
     token_provider = providers.Singleton(ClientTokenProvider, auth=auth, skew_seconds=30)
     file_service: providers.Singleton[FileServicePort] = providers.Singleton(
         UploadchiClient, token_provider=token_provider
@@ -60,15 +60,11 @@ class Container(containers.DeclarativeContainer):
     )
 
 
-def create_container(settings: Optional[Any] = None) -> Container:
+def create_container(settings: Optional[BaseSettings | Dict] = None) -> Container:
     c = Container()
     if settings is not None:
-        if isinstance(settings, Settings):
-            c.config.override(settings)
-        elif hasattr(settings, "model_dump"):
-            c.config.from_dict(settings.model_dump())  # Pydantic v2
-        elif hasattr(settings, "dict"):
-            c.config.from_dict(settings.dict())  # Pydantic v1
-        elif isinstance(settings, Mapping):
-            c.config.from_dict(dict(settings))
+        if isinstance(settings, BaseSettings):
+            c.config.from_pydantic(settings)
+        elif isinstance(settings, Dict):
+            c.config.from_dict(settings)
     return c