aiteamutils 0.2.71__tar.gz → 0.2.73__tar.gz

{aiteamutils-0.2.71 → aiteamutils-0.2.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.71
+Version: 0.2.73
 Summary: AI Team Utilities
 Project-URL: Homepage, https://github.com/yourusername/aiteamutils
 Project-URL: Issues, https://github.com/yourusername/aiteamutils/issues

aiteamutils-0.2.73/aiteamutils/base_service.py

@@ -0,0 +1,77 @@
+#기본 라이브러리
+from fastapi import Request
+from typing import TypeVar, Generic, Type, Dict, Any, Union, List
+from sqlalchemy.orm import DeclarativeBase
+from sqlalchemy.ext.asyncio import AsyncSession
+from datetime import datetime
+
+#패키지 라이브러리
+from .exceptions import ErrorCode, CustomException
+from .base_repository import BaseRepository
+from .database import (
+    process_response,
+    build_search_filters
+)
+
+ModelType = TypeVar("ModelType", bound=DeclarativeBase)
+
+class BaseService(Generic[ModelType]):
+    ##################
+    # 1. 초기화 영역 #
+    ##################
+    def __init__(
+            self,
+            model: Type[ModelType],
+            repository: BaseRepository[ModelType],
+            db_session: AsyncSession,
+            additional_models: Dict[str, Type[DeclarativeBase]] = None,
+    ):
+        self.model = model
+        self.repository = repository
+        self.db_session = db_session
+        self.additional_models = additional_models or {},
+
+    async def list(
+        self,
+        skip: int = 0,
+        limit: int = 100,
+        filters: Dict[str, Any] | None = None,
+        search_params: Dict[str, Any] | None = None,
+        model_name: str | None = None,
+        response_model: Any = None
+    ) -> List[Dict[str, Any]]:
+        try:
+            # 검색 조건 처리 및 필터 병합
+            if search_params:
+                search_filters = build_search_filters(search_params)
+                if filters:
+                    # 기존 filters와 search_filters 병합 (search_filters가 우선 적용)
+                    filters.update(search_filters)
+                else:
+                    filters = search_filters
+
+            # 모델 이름을 통한 동적 처리
+            if model_name:
+                if model_name not in self.additional_models:
+                    raise CustomException(
+                        ErrorCode.INVALID_REQUEST,
+                        detail=f"Model {model_name} not registered",
+                        source_function=f"{self.__class__.__name__}.list"
+                    )
+                model = self.additional_models[model_name]
+                return await self.repository.list(skip=skip, limit=limit, filters=filters, model=model)
+
+            return await self.repository.list(skip=skip, limit=limit, filters=filters)
+        except CustomException as e:
+            e.detail = f"Service list error for {self.repository.model.__tablename__}: {e.detail}"
+            e.source_function = f"{self.__class__.__name__}.list -> {e.source_function}"
+            raise e
+        except Exception as e:
+            raise CustomException(
+                ErrorCode.INTERNAL_ERROR,
+                detail=str(e),
+                source_function=f"{self.__class__.__name__}.list",
+                original_error=e
+            )
+
+

{aiteamutils-0.2.71 → aiteamutils-0.2.73}/aiteamutils/database.py

@@ -120,14 +120,12 @@ def process_response(
 # 조건 처리 #
 ##################
 def build_search_filters(
-        request: Dict[str, Any],
         search_params: Dict[str, Dict[str, Any]]
 ) -> Dict[str, Any]:
     """
-    요청 데이터와 검색 파라미터를 기반으로 필터 조건을 생성합니다.
+    검색 파라미터를 기반으로 필터 조건을 생성합니다.
 
     Args:
-        request: 요청 데이터 (key-value 형태).
         search_params: 검색 조건 설정을 위한 파라미터.
 
     Returns:
@@ -135,9 +133,9 @@ def build_search_filters(
     """
     filters = {}
     for key, param in search_params.items():
-        value = request.get(key)
+        value = param.get("value")
         if value is not None:
-            if param["like"]:
+            if param.get("like", False):
                 filters[key] = {"field": param["fields"][0], "operator": "like", "value": f"%{value}%"}
             else:
                 filters[key] = {"field": param["fields"][0], "operator": "eq", "value": value}

aiteamutils-0.2.73/aiteamutils/version.py

@@ -0,0 +1,2 @@
+"""버전 정보"""
+__version__ = "0.2.73"

aiteamutils-0.2.71/aiteamutils/base_service.py

@@ -1,47 +0,0 @@
-#기본 라이브러리
-from fastapi import Request
-from typing import TypeVar, Generic, Type, Dict, Any, Union, List
-from sqlalchemy.orm import DeclarativeBase
-from sqlalchemy.ext.asyncio import AsyncSession
-from datetime import datetime
-
-#패키지 라이브러리
-from .exceptions import ErrorCode, CustomException
-from .base_repository import BaseRepository
-from .database import (
-    process_response,
-    build_search_filters
-)
-
-ModelType = TypeVar("ModelType", bound=DeclarativeBase)
-
-class BaseService(Generic[ModelType]):
-    ##################
-    # 1. 초기화 영역 #
-    ##################
-    def __init__(
-            self,
-            model: Type[ModelType],
-            repository: BaseRepository[ModelType],
-            db_session: AsyncSession,
-            additional_models: Dict[str, Type[DeclarativeBase]] = None,
-    ):
-        self.model = model
-        self.repository = repository
-        self.db_session = db_session
-        self.additional_models = additional_models or {},
-
-    async def list(
-        self,
-        skip: int = 0,
-        limit: int = 100,
-        filters: Dict[str, Any] | None =
-        except Exception as e:
-            raise CustomException(
-                ErrorCode.INTERNAL_ERROR,
-                detail=str(e),
-                source_function=f"{self.__class__.__name__}.list",
-                original_error=e
-            )
-
-

aiteamutils-0.2.71/aiteamutils/version.py

@@ -1,2 +0,0 @@
-"""버전 정보"""
-__version__ = "0.2.71"