aiteamutils 0.2.79__tar.gz → 0.2.81__tar.gz

{aiteamutils-0.2.79 → aiteamutils-0.2.81}/PKG-INFO

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

{aiteamutils-0.2.79 → aiteamutils-0.2.81}/aiteamutils/base_repository.py

@@ -64,14 +64,16 @@ class BaseRepository(Generic[ModelType]):
     async def update(
         self,
         update_data: Dict[str, Any],
-        conditions: Dict[str, Any]
+        conditions: Dict[str, Any],
+        exclude_entities: List[str] | None = None
     ) -> ModelType:
         try:
             return await update_entity(
                 session=self.session,
                 model=self.model,
                 update_data=update_data,
-                conditions=conditions
+                conditions=conditions,
+                exclude_entities=exclude_entities
             )
         except CustomException as e:
             raise e
@@ -79,13 +81,13 @@ class BaseRepository(Generic[ModelType]):
     async def delete(
         self,
         conditions: Dict[str, Any]
-    ) -> None:
+    ) -> bool:
         await delete_entity(
             session=self.session,
             model=self.model,
             conditions=conditions
         )
-    
+        return True
     #########################
     # 조회 및 검색 메서드 #
     #########################
@@ -93,9 +95,10 @@ class BaseRepository(Generic[ModelType]):
         self,
         skip: int = 0,
         limit: int = 100,
-        filters: Optional[Dict[str, Any]] = None,
+        filters: Optional[List[Dict[str, Any]]] = None,
         explicit_joins: Optional[List[Any]] = None,
-        loading_joins: Optional[List[Any]] = None
+        loading_joins: Optional[List[Any]] = None,
+        order: Optional[List[Dict[str, str]]] = None
     ) -> List[ModelType]:
         """
         엔티티 목록 조회.
@@ -109,7 +112,8 @@ class BaseRepository(Generic[ModelType]):
                 limit=limit,
                 filters=filters,
                 explicit_joins=explicit_joins,
-                loading_joins=loading_joins
+                loading_joins=loading_joins,
+                order=order
             )
         except CustomException as e:
             raise e

{aiteamutils-0.2.79 → aiteamutils-0.2.81}/aiteamutils/base_service.py

@@ -38,7 +38,6 @@ class BaseService(Generic[ModelType]):
     async def create(
         self,
         entity_data: Dict[str, Any],
-        model_name: str | None = None,
         response_model: Any = None,
         exclude_entities: List[str] | None = None,
         unique_check: List[Dict[str, Any]] | None = None,
@@ -54,11 +53,17 @@ class BaseService(Generic[ModelType]):
                 if fk_check:
                     await validate_unique_fields(self.db_session, fk_check, find_value=False)
 
-                # repository의 create 메서드를 트랜잭션 내에서 실행
-                return await self.repository.create(
+                result = await self.repository.create(
                     entity_data=entity_data,
                     exclude_entities=exclude_entities
                 )
+
+                # 결과 반환
+                if response_model:
+                    return process_response(result, response_model)
+                else:
+                    return result
+
         except CustomException as e:
             raise e
         except Exception as e:
@@ -76,41 +81,43 @@ class BaseService(Generic[ModelType]):
         update_data: Dict[str, Any] | None = None,
         conditions: Dict[str, Any] | None = None,
         unique_check: List[Dict[str, Any]] | None = None,
-        exclude_entities: List[str] | None = None
+        exclude_entities: List[str] | None = None,
+        response_model: Any = None
     ) -> ModelType:
         try:
-            # 고유 검사 수행
-            if unique_check:
-                await validate_unique_fields(self.db_session, unique_check, find_value=True)
-            # 비밀번호가 있으면 해시 처리
-            if "password" in update_data:
-                update_data["password"] = hash_password(update_data["password"])
-            # 제외할 엔티티가 있으면 제외
-            if exclude_entities:
-                update_data = {k: v for k, v in update_data.items() if k not in exclude_entities}
-
-            if not ulid and not conditions:
-                raise CustomException(
-                    ErrorCode.INVALID_INPUT,
-                    detail="Either 'ulid' or 'conditions' must be provided.",
-                    source_function="database.update_entity"
-                )
+            async with self.db_session.begin():
+                # 고유 검사 수행
+                if unique_check:
+                    await validate_unique_fields(self.db_session, unique_check, find_value=True)
 
-            # ulid로 조건 생성
-            if ulid:
-                if not ULID.from_str(ulid):
+                if not ulid and not conditions:
                     raise CustomException(
-                        ErrorCode.VALIDATION_ERROR,
-                        detail=ulid,
-                        source_function=f"{self.__class__.__name__}.update"
+                        ErrorCode.INVALID_INPUT,
+                        detail="Either 'ulid' or 'conditions' must be provided.",
+                        source_function="database.update_entity"
                     )
-                
-                conditions = {"ulid": ulid}
 
-            return await self.repository.update(
-                update_data=update_data,
-                conditions=conditions
-            )
+                # ulid로 조건 생성
+                if ulid:
+                    if not ULID.from_str(ulid):
+                        raise CustomException(
+                            ErrorCode.VALIDATION_ERROR,
+                            detail=ulid,
+                            source_function=f"{self.__class__.__name__}.update"
+                        )
+                    
+                    conditions = {"ulid": ulid}
+
+                result = await self.repository.update(
+                    update_data=update_data,
+                    conditions=conditions,
+                    exclude_entities=exclude_entities
+                )
+
+                if response_model:
+                    return process_response(result, response_model)
+                else:
+                    return result
         except CustomException as e:
             raise e
         except Exception as e:
@@ -125,7 +132,7 @@ class BaseService(Generic[ModelType]):
         self,
         ulid: str | None = None,
         conditions: Dict[str, Any] | None = None
-    ) -> None:
+    ) -> bool:
         try:
             if not ULID.from_str(ulid):
                 raise CustomException(
@@ -168,35 +175,25 @@ class BaseService(Generic[ModelType]):
         skip: int = 0,
         limit: int = 100,
         filters: List[Dict[str, Any]] | None = None,
-        model_name: str | None = None,
         response_model: Any = None,
         explicit_joins: Optional[List[Any]] = None,
-        loading_joins: Optional[List[Any]] = None
+        loading_joins: Optional[List[Any]] = None,
+        order: Optional[str] = None
     ) -> List[Dict[str, Any]]:
         try:
-            # 모델 이름을 통한 동적 처리
-            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]
-                entities = await self.repository.list(
-                    skip=skip,
-                    limit=limit,
-                    filters=filters,
-                    model=model
-                )
-                return [process_response(entity, response_model) for entity in entities]
+            if order is None:
+                order = "created_at|desc"
+
+                order_by = order.split("|")
+                order = [{"field": order_by[0], "direction": order_by[1]}]
 
             entities = await self.repository.list(
                 skip=skip,
                 limit=limit,
                 filters=filters,
                 explicit_joins=explicit_joins,
-                loading_joins=loading_joins
+                loading_joins=loading_joins,
+                order=order
             )
             return [process_response(entity, response_model) for entity in entities]
         

{aiteamutils-0.2.79 → aiteamutils-0.2.81}/aiteamutils/database.py

@@ -298,7 +298,8 @@ async def update_entity(
     session: AsyncSession,
     model: Type[ModelType],
     conditions: Dict[str, Any],
-    update_data: Dict[str, Any]
+    update_data: Dict[str, Any],
+    exclude_entities: List[str] | None = None
 ) -> ModelType:
     """
     조건을 기반으로 엔티티를 조회하고 업데이트합니다.
@@ -339,7 +340,12 @@ async def update_entity(
         }
 
         # 데이터 병합 및 전처리
-        processed_data = process_entity_data(model, update_data, existing_data)
+        processed_data = process_entity_data(
+            model=model,
+            entity_data=update_data,
+            existing_data=existing_data,
+            exclude_entities=exclude_entities
+        )
 
         # 엔티티 데이터 업데이트
         for key, value in processed_data.items():
@@ -364,7 +370,7 @@ async def delete_entity(
     session: AsyncSession,
     model: Type[ModelType],
     conditions: Dict[str, Any]
-) -> None:
+) -> bool:
     try:
         stmt = select(model)
         for key, value in conditions.items():
@@ -386,6 +392,7 @@ async def delete_entity(
         await session.flush()
         await session.refresh(entity)
 
+        return True
     except SQLAlchemyError as e:
         raise CustomException(
             ErrorCode.DB_DELETE_ERROR,
@@ -398,19 +405,21 @@ async def purge_entity(
     session: AsyncSession,
     model: Type[ModelType],
     entity: ModelType
-) -> None:
+) -> bool:
     # 엔티티를 영구 삭제합니다.
     await session.delete(entity)
-    await session.commit()
+
+    return True
 
 async def list_entities(
     session: AsyncSession,
     model: Type[ModelType],
     skip: int = 0,
     limit: int = 100,
-    filters: Optional[Dict[str, Any]] = None,
+    filters: Optional[List[Dict[str, Any]]] = None,
     explicit_joins: Optional[List[Any]] = None,
-    loading_joins: Optional[List[Any]] = None
+    loading_joins: Optional[List[Any]] = None,
+    order: Optional[List[Dict[str, str]]] = None
 ) -> List[Dict[str, Any]]:
     """
     엔터티 리스트를 필터 및 조건에 따라 가져오는 함수.
@@ -456,6 +465,11 @@ async def list_entities(
             conditions = build_conditions(filters, model)
             query = query.where(and_(*conditions))
 
+        # 정렬 조건 적용
+        if order:
+            for order_item in order:
+                query = query.order_by(getattr(model, order_item["field"]).desc() if order_item["direction"] == "desc" else getattr(model, order_item["field"]).asc())
+
         # 페이지네이션 적용
         query = query.limit(limit).offset(skip)
 

{aiteamutils-0.2.79 → aiteamutils-0.2.81}/aiteamutils/exceptions.py

@@ -74,6 +74,8 @@ class ErrorCode(Enum):
     SERVICE_NOT_REGISTERED = ErrorResponse(5003, "GENERAL_SERVICE_UNAVAILABLE", 503, "서비스를 사용할 수 없습니다")
     LOGIN_ERROR = ErrorResponse(5004, "LOGIN_ERROR", 401, "로그인 오류")
     TOKEN_ERROR = ErrorResponse(5005, "TOKEN_ERROR", 401, "토큰 오류")
+    DELETE_ERROR = ErrorResponse(5006, "DELETE_ERROR", 400, "삭제 오류")
+
 
 class CustomException(Exception):
     """사용자 정의 예외 클래스"""

{aiteamutils-0.2.79 → aiteamutils-0.2.81}/aiteamutils/security.py

@@ -211,14 +211,47 @@ async def verify_jwt_token(
 ) -> Dict[str, Any]:
     """JWT 토큰을 검증합니다."""
     try:
+        # token_settings가 None인지 검증
+        if not token_settings:
+            raise CustomException(
+                ErrorCode.CONFIGURATION_ERROR,
+                detail="token_settings",
+                source_function="security.verify_jwt_token"
+            )
+
+        required_settings = ["JWT_SECRET", "JWT_ALGORITHM", "TOKEN_AUDIENCE", "TOKEN_ISSUER"]
+        missing_settings = [key for key in required_settings if key not in token_settings]
+        if missing_settings:
+            raise CustomException(
+                ErrorCode.CONFIGURATION_ERROR,
+                detail=f"token_settings|{'|'.join(missing_settings)}",
+                source_function="security.verify_jwt_token"
+            )
+
         # 토큰 디코딩
-        payload = jwt.decode(
-            token,
-            token_settings["JWT_SECRET"],
-            algorithms=[token_settings["JWT_ALGORITHM"]],
-            audience=token_settings["TOKEN_AUDIENCE"],
-            issuer=token_settings["TOKEN_ISSUER"]
-        )
+        try:
+            payload = jwt.decode(
+                token,
+                token_settings["JWT_SECRET"],
+                algorithms=[token_settings["JWT_ALGORITHM"]],
+                audience=token_settings["TOKEN_AUDIENCE"],
+                issuer=token_settings["TOKEN_ISSUER"]
+            )
+        except JWTError as e:
+            raise CustomException(
+                ErrorCode.INVALID_TOKEN,
+                detail=token,
+                source_function="security.verify_jwt_token",
+                original_error=e
+            )
+        
+        # payload가 None인지 확인
+        if not payload:
+            raise CustomException(
+                ErrorCode.INVALID_TOKEN,
+                detail=token,
+                source_function="security.verify_jwt_token"
+            )
         
         # 토큰 타입 검증
         token_type = payload.get("token_type")
@@ -232,22 +265,17 @@ async def verify_jwt_token(
         if expected_type and token_type != expected_type:
             raise CustomException(
                 ErrorCode.INVALID_TOKEN,
-                detail=token,
+                detail=f"token|{token_type}|{expected_type}",
                 source_function="security.verify_jwt_token"
             )
             
         return payload
         
-    except JWTError as e:
-        raise CustomException(
-            ErrorCode.INVALID_TOKEN,
-            detail=token,
-            source_function="security.verify_jwt_token",
-            original_error=e
-        )
     except CustomException as e:
+        # CustomException은 그대로 전달
         raise e
     except Exception as e:
+        # 예상치 못한 에러만 INTERNAL_ERROR로 변환
         raise CustomException(
             ErrorCode.INTERNAL_ERROR,
             detail=str(e),

aiteamutils-0.2.81/aiteamutils/version.py

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

aiteamutils-0.2.79/aiteamutils/version.py

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