aiteamutils 0.2.71__py3-none-any.whl → 0.2.73__py3-none-any.whl

aiteamutils/base_service.py

@@ -35,7 +35,37 @@ class BaseService(Generic[ModelType]):
         self,
         skip: int = 0,
         limit: int = 100,
-        filters: Dict[str, Any] | None =
+        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,

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/version.py

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

{aiteamutils-0.2.71.dist-info → aiteamutils-0.2.73.dist-info}/METADATA

@@ -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.71.dist-info → aiteamutils-0.2.73.dist-info}/RECORD

@@ -1,15 +1,15 @@
 aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
 aiteamutils/base_model.py,sha256=ODEnjvUVoxQ1RPCfq8-uZTfTADIA4c7Z3E6G4EVsSX0,2708
 aiteamutils/base_repository.py,sha256=tG_xz4hHYAN3-wkrLvEPxyTucV4pzT6dihoKVJp2JIc,2079
-aiteamutils/base_service.py,sha256=dYDj01UW8dQlFc-8Dth0NQBCFhRMXHTosmuUjl6LxP4,1385
+aiteamutils/base_service.py,sha256=M02lAcDmzTul97VBC1H8i5OtNKV8a9En2_sNCz84e-w,2852
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=CbX7eNFwqz9O4ywVQMLlLrb6hDUJPtsgGg_Hgef-p2I,8126
+aiteamutils/database.py,sha256=4Z1baj7UISE8KsVC_KilKwtCR4Yp8qR-kbwB7CHpDtE,8032
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=_lKWXq_ujNj41xN6LDE149PwsecAP7lgYWbOBbLOntg,15368
 aiteamutils/security.py,sha256=xFVrjttxwXB1TTjqgRQQgQJQohQBT28vuW8FVLjvi-M,10103
 aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=1l2meDdBD47c5mMOjfptLRBjmt-ePXSJ2Sr6Zgi8zAc,42
-aiteamutils-0.2.71.dist-info/METADATA,sha256=6Jn_650khnReN9HdWa89k36lT7BHgR5EjmXSam2Pf8g,1718
-aiteamutils-0.2.71.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.71.dist-info/RECORD,,
+aiteamutils/version.py,sha256=p9Q6ycHvK4ulfUsk9t-OMhQk41NdIQmGrAm5soMo2OY,42
+aiteamutils-0.2.73.dist-info/METADATA,sha256=oGgO7P8aKOYwsEPaGzDSRRIxCXfs3PVqhDT9GCehssM,1718
+aiteamutils-0.2.73.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.73.dist-info/RECORD,,