nlbone 0.2.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

nlbone/adapters/auth/keycloak.py

@@ -43,15 +43,23 @@ class KeycloakAuthService(AuthService):
             print(f"Failed to get client token: {e}")
             return None
 
-    def is_client_token(self, token: str, allowed_clients: set[str] | None = None) -> bool:
+    def get_client_id(self, token: str):
         data = self.verify_token(token)
         if not data:
-            return False
+            return None
 
-        is_service_account = bool(data.get("username").startswith('service-account-'))
+        is_service_account = bool(data.get("username").startswith("service-account-"))
         client_id = data.get("client_id")
 
         if not is_service_account or not client_id:
+            return None
+
+        return client_id
+
+    def is_client_token(self, token: str, allowed_clients: set[str] | None = None) -> bool:
+        client_id = self.get_client_id(token)
+
+        if not client_id:
             return False
 
         if allowed_clients is not None and client_id not in allowed_clients:
@@ -62,4 +70,4 @@ class KeycloakAuthService(AuthService):
     def client_has_access(self, token: str, permissions: list[str], allowed_clients: set[str] | None = None) -> bool:
         if not self.is_client_token(token, allowed_clients):
             return False
-        return self.has_access(token, permissions)
+        return self.has_access(token, permissions)

nlbone/adapters/db/__init__.py

@@ -1,2 +1,3 @@
 from .sqlalchemy.engine import init_async_engine, async_session, async_ping, init_sync_engine, sync_session, sync_ping
-from .sqlalchemy import *
+from .sqlalchemy import get_paginated_response, apply_pagination
+from .sqlalchemy.base import Base

nlbone/adapters/db/sqlalchemy/__init__.py

@@ -1,4 +1 @@
-from .query import apply_pagination, apply_filters, apply_order
-from .base import Base
-
-__all__ = ["apply_pagination", "apply_filters", "apply_order", "Base"]
+from .query_builder import get_paginated_response, apply_pagination

nlbone/adapters/db/{query_builder.py → sqlalchemy/query_builder.py}

@@ -1,4 +1,7 @@
+from typing import Union, Callable, Any, Optional, Type, Sequence
+
 from sqlalchemy import asc, desc, or_
+from sqlalchemy.orm.interfaces import LoaderOption
 from sqlalchemy.sql.sqltypes import (
     String, Text, Integer, BigInteger, SmallInteger, Numeric, Float, Boolean, Enum as SAEnum
 )
@@ -170,8 +173,9 @@ def _apply_filters(pagination, entity, query):
     return query
 
 
-def apply_pagination(pagination: PaginateRequest, entity, session: Session, limit=True) -> Query:
-    query = session.query(entity)
+def apply_pagination(pagination: PaginateRequest, entity, session: Session, limit=True, query=None) -> Query:
+    if not query:
+        query = session.query(entity)
     query = _apply_filters(pagination, entity, query)
     query = _apply_order(pagination, entity, query)
     if limit:
@@ -179,11 +183,74 @@ def apply_pagination(pagination: PaginateRequest, entity, session: Session, limi
     return query
 
 
-def get_paginated_response(pagination: PaginateRequest, entity, session: Session, with_count=True) -> PaginateResponse:
-    query = apply_pagination(pagination, entity, session, not with_count)
+OutputType = Union[type, Callable[[Any], Any], None]
+
+
+def _serialize_item(item: Any, output_cls: OutputType) -> Any:
+    """Serialize a single ORM item based on output_cls (Pydantic v1/v2 or custom mapper)."""
+    if output_cls is None:
+        return item
+
+    if callable(output_cls) and not isinstance(output_cls, type):
+        return output_cls(item)
+
+    if hasattr(output_cls, "model_validate"):
+        try:
+            model = output_cls.model_validate(item, from_attributes=True)  # type: ignore[attr-defined]
+            if hasattr(model, "model_dump"):
+                return model.model_dump()  # type: ignore[attr-defined]
+            return model
+        except Exception:
+            pass
+
+    if hasattr(output_cls, "from_orm"):
+        try:
+            model = output_cls.from_orm(item)  # type: ignore[attr-defined]
+            if hasattr(model, "dict"):
+                return model.dict()  # type: ignore[attr-defined]
+            return model
+        except Exception:
+            pass
+
+    try:
+        obj = output_cls(item)  # type: ignore[call-arg]
+        try:
+            from dataclasses import is_dataclass, asdict
+            if is_dataclass(obj):
+                return asdict(obj)
+        except Exception:
+            pass
+        return obj
+    except Exception:
+        return item
+
+
+def get_paginated_response(
+    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:
+        query = query.options(*eager_options)
+
+    query = apply_pagination(pagination, entity, session, not with_count, query=query)
+
     total_count = None
     if with_count:
         total_count = query.count()
         query = query.limit(pagination.limit).offset(pagination.offset)
-    return PaginateResponse(total_count=total_count, data=query.all(), limit=pagination.limit,
-                            offset=pagination.offset).to_dict()
+
+    rows = query.all()
+
+    if output_cls is not None:
+        data = [output_cls.model_validate(r, from_attributes=True).model_dump() for r in rows]
+    else:
+        data = rows
+    return PaginateResponse(total_count=total_count, data=data, limit=pagination.limit,
+                            offset=pagination.offset).to_dict()

nlbone/interfaces/api/dependencies/auth.py

@@ -5,6 +5,20 @@ from nlbone.interfaces.api.exceptions import ForbiddenException, UnauthorizedExc
 from nlbone.utils.context import current_request
 
 
+def current_user_id() -> int:
+    user_id = current_request().state.user_id
+    if user_id is not None:
+        return int(user_id)
+    raise UnauthorizedException()
+
+
+def current_client_id() -> str:
+    request = current_request()
+    if client_id := KeycloakAuthService().get_client_id(request.state.token):
+        return str(client_id)
+    raise UnauthorizedException()
+
+
 def client_has_access(*, permissions=None):
     def decorator(func):
         @functools.wraps(func)
@@ -19,12 +33,10 @@ def client_has_access(*, permissions=None):
     return decorator
 
 
-
 def user_authenticated(func):
     @functools.wraps(func)
     async def wrapper(*args, **kwargs):
-        request = current_request()
-        if not request.state.user_id:
+        if not current_user_id():
             raise UnauthorizedException()
         return await func(*args, **kwargs)
 
@@ -36,7 +48,7 @@ def has_access(*, permissions=None):
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
             request = current_request()
-            if not request.state.user_id:
+            if not current_user_id():
                 raise UnauthorizedException()
             if not KeycloakAuthService().has_access(request.state.token, permissions=permissions):
                 raise ForbiddenException(f"Forbidden {permissions}")
@@ -44,5 +56,4 @@ def has_access(*, permissions=None):
             return func(*args, **kwargs)
 
         return wrapper
-    return decorator
-
+    return decorator

nlbone/interfaces/api/exception_handlers.py

@@ -0,0 +1,107 @@
+from __future__ import annotations
+from typing import Any, Optional, Mapping
+from uuid import uuid4
+
+from fastapi import FastAPI, Request
+from fastapi.responses import JSONResponse
+from fastapi.exceptions import RequestValidationError
+from pydantic import ValidationError
+from fastapi import HTTPException as FastAPIHTTPException
+from starlette.exceptions import HTTPException as StarletteHTTPException
+
+from .exceptions import BaseHttpException
+
+
+# ---- Helpers ---------------------------------------------------------------
+
+def _ensure_trace_id(request: Request) -> str:
+    rid = request.headers.get("X-Request-Id") or request.headers.get("X-Trace-Id")
+    return rid or str(uuid4())
+
+
+def _json_response(
+        request: Request,
+        status_code: int,
+        *,
+        detail: Any,
+        headers: Optional[Mapping[str, str]] = None,
+        trace_id: Optional[str] = None,
+        extra: Optional[Mapping[str, Any]] = None,
+) -> JSONResponse:
+    payload: dict[str, Any] = {"detail": detail}
+    if extra:
+        payload.update(extra)
+    tid = trace_id or _ensure_trace_id(request)
+
+    payload.setdefault("trace_id", tid)
+
+    base_headers = {"X-Trace-Id": tid}
+    if headers:
+        base_headers.update(headers)
+
+    return JSONResponse(status_code=status_code, content=payload, headers=base_headers)
+
+
+# ---- Public Installer ------------------------------------------------------
+
+def install_exception_handlers(
+        app: FastAPI,
+        *,
+        logger: Any = None,
+        expose_server_errors: bool = False,
+) -> None:
+    @app.exception_handler(BaseHttpException)
+    async def _handle_base_http_exception(request: Request, exc: BaseHttpException):
+        if logger:
+            logger.warning(
+                "http_error",
+                extra={"status": exc.status_code, "detail": exc.detail, "path": request.url.path},
+            )
+        return _json_response(request, exc.status_code, detail=exc.detail)
+
+    @app.exception_handler(FastAPIHTTPException)
+    async def _handle_fastapi_http_exception(request: Request, exc: FastAPIHTTPException):
+        if logger:
+            logger.warning(
+                "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)
+
+    @app.exception_handler(StarletteHTTPException)
+    async def _handle_starlette_http_exception(request: Request, exc: StarletteHTTPException):
+        if logger:
+            logger.warning(
+                "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)
+
+    # 3) خطاهای اعتبارسنجی FastAPI (request body/query/path)
+    @app.exception_handler(RequestValidationError)
+    async def _handle_request_validation_error(request: Request, exc: RequestValidationError):
+        errors = exc.errors()
+        if logger:
+            logger.info(
+                "request_validation_error",
+                extra={"errors": errors, "path": request.url.path},
+            )
+        return _json_response(request, 422, detail=errors)
+
+    @app.exception_handler(ValidationError)
+    async def _handle_pydantic_validation_error(request: Request, exc: ValidationError):
+        errors = exc.errors()
+        if logger:
+            logger.info(
+                "pydantic_validation_error",
+                extra={"errors": errors, "path": request.url.path},
+            )
+        return _json_response(request, 422, detail=errors)
+
+    @app.exception_handler(Exception)
+    async def _handle_unexpected_exception(request: Request, exc: Exception):
+        tid = _ensure_trace_id(request)
+        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)

nlbone/interfaces/api/exceptions.py

@@ -2,66 +2,80 @@ from typing import Any, Iterable
 from fastapi import HTTPException, status
 
 
-def _error_entry(loc: Iterable[Any] | None, msg: str, type_: str) -> dict:
+def _error_entry(loc: Iterable[Any] | None, detail: str, type_: str) -> dict:
     return {
         "loc": list(loc) if loc else [],
-        "msg": msg,
+        "msg": detail,
         "type": type_,
     }
 
 
-def _errors(loc: Iterable[Any] | None, msg: str, type_: str) -> list[dict]:
-    return [_error_entry(loc, msg, type_)]
+def _errors(loc: Iterable[Any] | None, detail: str, type_: str) -> list[dict]:
+    return [_error_entry(loc, detail, type_)]
 
 
-class BadRequestException(HTTPException):
-    def __init__(self, msg: str):
+class BaseHttpException(HTTPException):
+    pass
+
+
+class BadRequestException(BaseHttpException):
+    def __init__(self, detail: str):
         super().__init__(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail=msg,
+            detail=detail,
         )
 
 
-class UnauthorizedException(HTTPException):
-    def __init__(self, msg: str = "unauthorized"):
+class UnauthorizedException(BaseHttpException):
+    def __init__(self, detail: str = "unauthorized"):
         super().__init__(
             status_code=status.HTTP_401_UNAUTHORIZED,
-            detail=msg,
+            detail=detail,
         )
 
 
-class ForbiddenException(HTTPException):
-    def __init__(self, msg: str = "forbidden"):
+class ForbiddenException(BaseHttpException):
+    def __init__(self, detail: str = "forbidden"):
         super().__init__(
             status_code=status.HTTP_403_FORBIDDEN,
-            detail=msg,
+            detail=detail,
         )
 
 
-class NotFoundException(HTTPException):
-    def __init__(self, msg: str = "not found"):
+class NotFoundException(BaseHttpException):
+    def __init__(self, detail: str = "not found"):
         super().__init__(
             status_code=status.HTTP_404_NOT_FOUND,
-            detail=msg,
+            detail=detail,
         )
 
 
-class ConflictException(HTTPException):
-    def __init__(self, msg: str = "conflict"):
+class ConflictException(BaseHttpException):
+    def __init__(self, detail: str = "conflict"):
         super().__init__(
             status_code=status.HTTP_409_CONFLICT,
-            detail=msg,
+            detail=detail,
+        )
+
+
+class NotSupportedException(BaseHttpException):
+    def __init__(self, detail: str = "NotSupported"):
+        super().__init__(
+            status_code=status.HTTP_501_NOT_IMPLEMENTED,
+            detail=detail,
         )
 
 
-class UnprocessableEntityException(HTTPException):
-    def __init__(self, msg: str, loc: Iterable[Any] | None = None, type_: str = "unprocessable_entity"):
+class UnprocessableEntityException(BaseHttpException):
+    def __init__(self, detail: str, loc: Iterable[Any] | None = None, type_: str = "unprocessable_entity"):
         super().__init__(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=_errors(loc, msg, type_),
+            detail=_errors(loc, detail, type_),
         )
 
 
 class LogicalValidationException(UnprocessableEntityException):
-    def __init__(self, msg: str, loc: Iterable[Any] | None = None, type_: str = "logical_error"):
-        super().__init__(msg=msg, loc=loc, type_=type_)
+    def __init__(self, detail: str, loc: Iterable[Any] | None = None, type_: str = "logical_error"):
+        super().__init__(detail=detail, loc=loc, type_=type_)
+
+

nlbone/interfaces/api/pagination/__init__.py

@@ -1,3 +1,5 @@
+from typing import Generic, List, Optional, TypeVar
+from pydantic import BaseModel
 from fastapi import Depends
 
 from .offset_base import PaginateResponse, PaginateRequest
@@ -7,3 +9,12 @@ def get_pagination(
         req: PaginateRequest = Depends(PaginateRequest)
 ) -> PaginateRequest:
     return req
+
+
+T = TypeVar("T")
+
+
+class Paginated(BaseModel, Generic[T]):
+    total_count: Optional[int]
+    total_page: Optional[int]
+    data: List[T]

{nlbone-0.2.0.dist-info → nlbone-0.3.1.dist-info}/METADATA

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

{nlbone-0.2.0.dist-info → nlbone-0.3.1.dist-info}/RECORD

@@ -3,21 +3,15 @@ nlbone/container.py,sha256=KO8y8hfEt0graWhUi-FU_rG-WPckl-uF7H9JGcwEu38,1321
 nlbone/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/auth/__init__.py,sha256=Eh9kWjY1I8vi17gK0oOzBLJwJX_GFuUcJIN7cLU6lJg,41
-nlbone/adapters/auth/keycloak.py,sha256=lPmRmCwBuDj9fUJsGMUCOuk_MsuLBQYBrO3QvBBaV8I,2451
-nlbone/adapters/db/__init__.py,sha256=aHur2GuykZd26RpEmIbkAfflkksZuKWAlYLJMIYotQE,144
+nlbone/adapters/auth/keycloak.py,sha256=8UjT1GMenzolR-XAzlKERJDWh3TLBrxaIasMenRYfw4,2614
+nlbone/adapters/db/__init__.py,sha256=VzhE_VOTFxDE0yUOw-f8UCLFCVhdyKnrrhbqzZUy76A,218
 nlbone/adapters/db/memory.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/db/postgres.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone/adapters/db/query_builder.py,sha256=xrhBiWRSsyLHzGft0weHwqRPOiP2i6ajqcxJOruHOF4,6606
-nlbone/adapters/db/sqlalchemy/__init__.py,sha256=REK4P8SF6kvDNYgkZIbSowhHPivyFVnMCYGfYT1dlxk,158
+nlbone/adapters/db/sqlalchemy/__init__.py,sha256=1yw3keC1GYqQ6AM4283if_TpeB0xbm0-FBD7XUf5bcg,67
 nlbone/adapters/db/sqlalchemy/base.py,sha256=-5FnCMKETJ2xykhViHQuNBdbRMaxuieuatgiEl4Lllw,73
 nlbone/adapters/db/sqlalchemy/engine.py,sha256=m3nVY7KU12ksM3vK9fEgYEobrz9L8hfsgjI8cSNtBMY,3030
+nlbone/adapters/db/sqlalchemy/query_builder.py,sha256=mgj0mE0tbBVOAm1nd2nfR3p4EgV_NPYASsfP_4lF6yA,8504
 nlbone/adapters/db/sqlalchemy/schema.py,sha256=iiE42UT-DJh-ohezLFBWTBFN5WtrfZdtKToQDNLvoOs,1044
-nlbone/adapters/db/sqlalchemy/query/__init__.py,sha256=9SFkoNkklaji6kZt_Nl6X6vqMFE92GiqW36Zezr5PuE,129
-nlbone/adapters/db/sqlalchemy/query/builder.py,sha256=AzUX2MlfrMGY-EITzVJoq9naM5sTL9h9yzI7cCeEBRk,886
-nlbone/adapters/db/sqlalchemy/query/coercion.py,sha256=uYClfEuew_W4r-vbwj2c5MVpayejhpOMl6h4iUrMotQ,2142
-nlbone/adapters/db/sqlalchemy/query/filters.py,sha256=GL6r2l8zY-9Ys6Ge6slI0FTZ8NUrYZzbvd5OwHFyJCg,2421
-nlbone/adapters/db/sqlalchemy/query/ordering.py,sha256=THbuxZmoFZzJIa28KfDQ6ioS88MVvwLBb9iIj6QnEGM,490
-nlbone/adapters/db/sqlalchemy/query/types.py,sha256=M2j6SOSyFkLuyXq4kvPYgZQYz5TKCBe3osoIIN1yfBI,287
 nlbone/adapters/http_clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/http_clients/email_gateway.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/http_clients/uploadchi.py,sha256=qguGDQ2NGNSN3BOFSFUINn8mKS4LI23UGURJNhDUH2E,4647
@@ -43,17 +37,18 @@ nlbone/core/ports/messaging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 nlbone/core/ports/repo.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone/interfaces/api/exceptions.py,sha256=mw0nZHO2oKml3-d7cdSBTQeVGKFQCjLn_TJy6rxcrU0,1901
+nlbone/interfaces/api/exception_handlers.py,sha256=Z3_dTGAmpHfgaMe_HTW89OpRtq-aamzaMTNkMIOdW3w,4092
+nlbone/interfaces/api/exceptions.py,sha256=uJWNEu5-cgoMedYebNHuIFJioXl_fnBhO89E6FINT2A,2259
 nlbone/interfaces/api/routers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/schemas.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/dependencies/__init__.py,sha256=XrTGkHS8xqryfyr8XSm_s9sIzp4E0b44XQ40sVWcKMY,46
-nlbone/interfaces/api/dependencies/auth.py,sha256=XwzKga9GkcvCKUg37zEnVw8m30MbR-4wh1CTeLG2jH8,1445
+nlbone/interfaces/api/dependencies/auth.py,sha256=GHUlZ5L2N6ilOaOJqRicHrORB3AD3z2Y-qrO9Q2dNr4,1774
 nlbone/interfaces/api/dependencies/db.py,sha256=IqDVq1lcCCxd22FBUg523lVANM_j71BYAQtsbrHc4M8,465
 nlbone/interfaces/api/middleware/__init__.py,sha256=Xcxg9Oy8uToPXaTSdBTKhst-hZwsaIEhqxx4mmo1bZI,157
 nlbone/interfaces/api/middleware/access_log.py,sha256=dEjk_m4fyQ72S2xLzDydDoaw2F9Tvmfl_acat1YThE0,972
 nlbone/interfaces/api/middleware/add_request_context.py,sha256=i8EV4BvZyrBcNfU-uTkybr7J7ypYvJq8mXSntM6oel4,1816
 nlbone/interfaces/api/middleware/authentication.py,sha256=-jfV-Ry04qsFd1cJh7KGoGpfnUKIogPF2fK42ZTFgBk,1806
-nlbone/interfaces/api/pagination/__init__.py,sha256=dduTd8cOUnKOipqpbsi5gANXKsD3uUttdzu4S5ObS_U,203
+nlbone/interfaces/api/pagination/__init__.py,sha256=zrfmxpaeYoAQ5AjX-AKivs8Zq5Qbr4hJmGzQU4UIN14,426
 nlbone/interfaces/api/pagination/offset_base.py,sha256=2MINXX4wXoynOTPgn28lp_UQufBUluLh_qjF-5AYFxk,3655
 nlbone/interfaces/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/cli/init_db.py,sha256=6Q05gwcPa6ywwz3Dzi0hiV8bycg0zU_3eWGsL6VNVRk,479
@@ -63,7 +58,7 @@ nlbone/interfaces/jobs/sync_tokens.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 nlbone/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/utils/context.py,sha256=AUiN1jM0ebNMopZQoJSqWTfUHuVrp-HV8x6g7QsbEJ8,1601
 nlbone/utils/time.py,sha256=dC0ucyAmHdNf3wpA_JPinl2VJRubWqx2vcRpJsT3-0k,102
-nlbone-0.2.0.dist-info/METADATA,sha256=VVTESRwO-HZwMfXeb_EszCLS52Jv7y-zXWC54Wtmt8w,2298
-nlbone-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nlbone-0.2.0.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.2.0.dist-info/RECORD,,
+nlbone-0.3.1.dist-info/METADATA,sha256=WJBTZ953uoswagIj1JRD-iZnykfYhQqjEFRogKc56ZU,2298
+nlbone-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nlbone-0.3.1.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.3.1.dist-info/RECORD,,

nlbone/adapters/db/sqlalchemy/query/__init__.py

@@ -1,3 +0,0 @@
-from .builder import apply_pagination, apply_filters, apply_order
-
-__all__ = ["apply_pagination", "apply_filters", "apply_order"]

nlbone/adapters/db/sqlalchemy/query/builder.py

@@ -1,21 +0,0 @@
-from __future__ import annotations
-from sqlalchemy.orm import Session, Query
-
-from nlbone.adapters.db.sqlalchemy.query.filters import apply_filters_to_query
-from nlbone.adapters.db.sqlalchemy.query.ordering import apply_order_to_query
-
-
-def apply_pagination(pagination, entity, session: Session, limit: bool = True) -> Query:
-    q: Query = session.query(entity)
-    q = apply_filters_to_query(pagination, entity, q)
-    from nlbone.adapters.db.sqlalchemy.query.ordering import apply_order_to_query
-    q = apply_order_to_query(pagination, entity, q)
-    if limit:
-        q = q.limit(pagination.limit).offset(pagination.offset)
-    return q
-
-def apply_filters(pagination, entity, query: Query) -> Query:
-    return apply_filters_to_query(pagination, entity, query)
-
-def apply_order(pagination, entity, query: Query) -> Query:
-    return apply_order_to_query(pagination, entity, query)

nlbone/adapters/db/sqlalchemy/query/coercion.py

@@ -1,64 +0,0 @@
-from sqlalchemy.sql.sqltypes import (
-    String, Text, Integer, BigInteger, SmallInteger, Numeric, Float, Boolean, Enum as SAEnum
-)
-try:
-    from sqlalchemy.dialects.postgresql import ENUM as PGEnum
-except Exception:
-    PGEnum = type("PGEnum", (), {})
-
-from .types import InvalidEnum
-
-def is_text_type(coltype) -> bool:
-    return isinstance(coltype, (String, Text))
-
-def looks_like_wildcard(s: str) -> bool:
-    return isinstance(s, str) and ("*" in s or "%" in s)
-
-def to_like_pattern(s: str) -> str:
-    s = (s or "")
-    s = s.replace("*", "%")
-    return s if "%" in s else f"%{s}%"
-
-def _coerce_enum(col_type, raw):
-    if raw is None:
-        return None
-    enum_cls = getattr(col_type, "enum_class", None)
-    if enum_cls is not None:
-        if isinstance(raw, enum_cls):
-            return raw
-        if isinstance(raw, str):
-            low = raw.strip().lower()
-            for m in enum_cls:
-                if m.name.lower() == low or str(m.value).lower() == low:
-                    return m
-        raise InvalidEnum(f"'{raw}' is not one of {[m.name for m in enum_cls]}")
-    choices = list(getattr(col_type, "enums", []) or [])
-    if isinstance(raw, str):
-        low = raw.strip().lower()
-        for c in choices:
-            if c.lower() == low:
-                return c
-    raise InvalidEnum(f"'{raw}' is not one of {choices or '[no choices defined]'}")
-
-def coerce_value_for_column(coltype, v):
-    if v is None:
-        return None
-    if isinstance(coltype, (SAEnum, PGEnum)):
-        return _coerce_enum(coltype, v)
-    if is_text_type(coltype):
-        return str(v)
-    if isinstance(coltype, (Integer, BigInteger, SmallInteger)):
-        return int(v)
-    if isinstance(coltype, (Float, Numeric)):
-        return float(v)
-    if isinstance(coltype, Boolean):
-        if isinstance(v, bool):
-            return v
-        if isinstance(v, (int, float)):
-            return bool(v)
-        if isinstance(v, str):
-            vl = v.strip().lower()
-            if vl in {"true", "1", "yes", "y", "t"}: return True
-            if vl in {"false", "0", "no", "n", "f"}: return False
-        return None
-    return v

nlbone/adapters/db/sqlalchemy/query/filters.py

@@ -1,57 +0,0 @@
-from __future__ import annotations
-from sqlalchemy import or_
-from sqlalchemy.orm import Query
-
-try:
-    from sqlalchemy.dialects.postgresql import ENUM as PGEnum  # اختیاری
-except Exception:
-    PGEnum = type("PGEnum", (), {})  # fallback dummy
-
-from nlbone.interfaces.api.exceptions import UnprocessableEntityException
-from nlbone.interfaces.api.pagination import PaginateRequest
-from .coercion import coerce_value_for_column, to_like_pattern, is_text_type, looks_like_wildcard
-from .types import NULL_SENTINELS, InvalidEnum, parse_field_and_op
-
-def apply_filters_to_query(pagination: PaginateRequest, entity, query: Query) -> Query:
-    if not getattr(pagination, "filters", None):
-        return query
-
-    for raw_field, value in pagination.filters.items():
-        if value is None or value in NULL_SENTINELS or value == [] or value == {}:
-            value = None
-
-        field, op_hint = parse_field_and_op(raw_field)
-        if not hasattr(entity, field):
-            continue
-
-        col = getattr(entity, field)
-        coltype = getattr(col, "type", None)
-
-        def _use_ilike(v) -> bool:
-            if op_hint == "ilike":
-                return True
-            return is_text_type(coltype) and isinstance(v, str) and looks_like_wildcard(v)
-
-        try:
-            if isinstance(value, (list, tuple, set)):
-                vals = [v for v in value if v not in (None, "", "null", "None")]
-                if not vals:
-                    continue
-                if any(_use_ilike(v) for v in vals) and is_text_type(coltype):
-                    patterns = [to_like_pattern(str(v)) for v in vals]
-                    query = query.filter(or_(*[col.ilike(p) for p in patterns]))
-                else:
-                    coerced = [coerce_value_for_column(coltype, v) for v in vals]
-                    if not coerced:
-                        continue
-                    query = query.filter(col.in_(coerced))
-            else:
-                if _use_ilike(value) and is_text_type(coltype):
-                    query = query.filter(col.ilike(to_like_pattern(str(value))))
-                else:
-                    v = coerce_value_for_column(coltype, value)
-                    query = query.filter(col.is_(None) if v is None else (col == v))
-        except InvalidEnum as e:
-            raise UnprocessableEntityException(str(e), loc=["query", "filters", raw_field]) from e
-
-    return query

nlbone/adapters/db/sqlalchemy/query/ordering.py

@@ -1,14 +0,0 @@
-from sqlalchemy import asc, desc
-from sqlalchemy.orm import Query
-
-def apply_order_to_query(pagination, entity, query: Query) -> Query:
-    if not pagination.sort:
-        return query
-    clauses = []
-    for s in pagination.sort:
-        field = s["field"]
-        order = s["order"]
-        if hasattr(entity, field):
-            col = getattr(entity, field)
-            clauses.append(asc(col) if order == "asc" else desc(col))
-    return query.order_by(*clauses) if clauses else query

nlbone/adapters/db/sqlalchemy/query/types.py

@@ -1,11 +0,0 @@
-NULL_SENTINELS = {"None", "null", ""}
-
-class InvalidEnum(Exception):
-    pass
-
-def parse_field_and_op(field: str) -> tuple[str, str]:
-    if "__" in field:
-        base, op = field.rsplit("__", 1)
-        if op.lower() == "ilike":
-            return base, "ilike"
-    return field, "eq"