nlbone 0.6.11__tar.gz → 0.6.13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.6.11
+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.11 → nlbone-0.6.13}/pyproject.toml

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

{nlbone-0.6.11 → nlbone-0.6.13}/src/nlbone/adapters/db/postgres/query_builder.py

@@ -28,6 +28,50 @@ class _InvalidEnum(Exception):
     pass
 
 
+from sqlalchemy.orm import aliased
+from sqlalchemy.inspection import inspect
+from sqlalchemy.orm.attributes import InstrumentedAttribute
+from sqlalchemy.orm.relationships import RelationshipProperty
+
+
+def _resolve_column_and_joins(entity, query, field_path: str, join_cache: dict[str, Any]):
+    parts = [p for p in field_path.split(".") if p]
+    if not parts:
+        return None, query
+
+    current_cls_or_alias = entity
+    current_path_key_parts: list[str] = []
+
+    for i, part in enumerate(parts):
+        current_path_key_parts.append(part)
+        path_key = ".".join(current_path_key_parts)
+
+        if not hasattr(current_cls_or_alias, part):
+            return None, query
+
+        attr = getattr(current_cls_or_alias, part)
+
+        prop = getattr(attr, "property", None)
+        if isinstance(prop, RelationshipProperty):
+            alias = join_cache.get(path_key)
+            if alias is None:
+                alias = aliased(prop.mapper.class_)
+                query = query.outerjoin(alias, attr)
+                join_cache[path_key] = alias
+            current_cls_or_alias = alias
+            continue
+
+        if isinstance(attr, InstrumentedAttribute):
+            if i == len(parts) - 1:
+                return attr, query
+            else:
+                return None, query
+
+        return None, query
+
+    return None, query
+
+
 def _apply_order(pagination: PaginateRequest, entity, query):
     order_clauses = []
 
@@ -112,6 +156,7 @@ def _apply_filters(pagination, entity, query):
         return query
 
     predicates = []
+    join_cache: dict[str, Any] = {}
 
     if getattr(pagination, "filters", None):
         for raw_field, value in pagination.filters.items():
@@ -120,10 +165,10 @@ def _apply_filters(pagination, entity, query):
 
             field, op_hint = _parse_field_and_op(raw_field)
 
-            if not hasattr(entity, field):
+            col, query2 = _resolve_column_and_joins(entity, query, field, join_cache)
+            if col is None:
                 continue
-
-            col = getattr(entity, field)
+            query = query2
             coltype = getattr(col, "type", None)
 
             def coerce(v):
@@ -259,13 +304,13 @@ def _serialize_item(item: Any, output_cls: OutputType) -> Any:
 
 
 def get_paginated_response(
-    pagination,
-    entity,
-    session: Session,
-    *,
-    with_count: bool = True,
-    output_cls: Optional[Type] = None,
-    eager_options: Optional[Sequence[LoaderOption]] = None,
+        pagination,
+        entity,
+        session: Session,
+        *,
+        with_count: bool = True,
+        output_cls: Optional[Type] = None,
+        eager_options: Optional[Sequence[LoaderOption]] = None,
 ) -> dict:
     query = session.query(entity)
     if eager_options:

{nlbone-0.6.11 → 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