aiteamutils 0.2.80__py3-none-any.whl → 0.2.81__py3-none-any.whl

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
@@ -95,7 +97,8 @@ class BaseRepository(Generic[ModelType]):
         limit: int = 100,
         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/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:
@@ -170,15 +177,23 @@ class BaseService(Generic[ModelType]):
         filters: List[Dict[str, Any]] | 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 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/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():
@@ -412,7 +418,8 @@ async def list_entities(
     limit: int = 100,
     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]]:
     """
     엔터티 리스트를 필터 및 조건에 따라 가져오는 함수.
@@ -458,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/security.py

@@ -162,10 +162,10 @@ async def create_jwt_token(
                 "token_type": token_type,
                 
                 # 조직 관련 클레임
-                "organization_ulid": user_data.role.team.organization.ulid,
-                "organization_id": user_data.role.team.organization.id,
-                "organization_name": user_data.role.team.organization.name,
-                "company_name": user_data.role.team.organization.company.name
+                "organization_ulid": user_data.role.organization.ulid,
+                "organization_id": user_data.role.organization.id,
+                "organization_name": user_data.role.organization.name,
+                "company_name": user_data.role.organization.company.name
             }
         else:  # refresh token
             expires_at = datetime.now(timezone.utc) + timedelta(days=14)
@@ -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/version.py

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

{aiteamutils-0.2.80.dist-info → aiteamutils-0.2.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.80
+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.81.dist-info/RECORD

@@ -0,0 +1,15 @@
+aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
+aiteamutils/base_model.py,sha256=bnRJJaGXGS3TKxfCWWV3arFjdG0qLsPFDXuguYsDyVM,3008
+aiteamutils/base_repository.py,sha256=HKcgYyEb0JypojoXBFcIT39hPC5CqnjBkHT__GV-lfQ,4615
+aiteamutils/base_service.py,sha256=7DXjEn3e_dve_ZfNwUP1_WD7QnucWRXBq-bYuxVmyXI,8694
+aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
+aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
+aiteamutils/database.py,sha256=b4fN0XHNWxMJeS5M95JcJ7tujAJ1x3SPTAfDvJdB4sE,19696
+aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
+aiteamutils/exceptions.py,sha256=5yREcEUbJPzq2404pFJ4J9047I9_qx2QG5iBND1PjDI,15901
+aiteamutils/security.py,sha256=tS7gdkCvL0hfgC_FWDSWaCVrzy3zUFpw-PyiFn9yXMM,10839
+aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
+aiteamutils/version.py,sha256=w_eEoCaGdfblH2R8pC54VN-bdUU1cxm6KxYvvUVm6P0,42
+aiteamutils-0.2.81.dist-info/METADATA,sha256=hETQTyF40i30aB1erNKSaMsPQm5MajSGP4vwUKMnACM,1718
+aiteamutils-0.2.81.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.81.dist-info/RECORD,,

aiteamutils-0.2.80.dist-info/RECORD

@@ -1,15 +0,0 @@
-aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
-aiteamutils/base_model.py,sha256=bnRJJaGXGS3TKxfCWWV3arFjdG0qLsPFDXuguYsDyVM,3008
-aiteamutils/base_repository.py,sha256=-5kPNsB82ILj_Z9Hdf2tVxSb7owars1KBgDubIRXA7I,4430
-aiteamutils/base_service.py,sha256=6wCEbxPj9idhvMJbE3EK1uhXf5On97JVz2IFF-MILrw,8330
-aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
-aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=HezCvPVVFV2qyZOkuyy92z1g3bKBgwAnksZQVHuwYyw,19220
-aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
-aiteamutils/exceptions.py,sha256=5yREcEUbJPzq2404pFJ4J9047I9_qx2QG5iBND1PjDI,15901
-aiteamutils/security.py,sha256=JA7QGO07Jfmiwu3u429gIX6f8ESc3wQ4GeyOetLbHEo,9681
-aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=x9TYUs6I03uAB9NABtV3lwAjzbxNdHWdUxFrj6Xcfgg,42
-aiteamutils-0.2.80.dist-info/METADATA,sha256=ueFgVZRnNCHfe4Db8g0Is9NYOuAU44NUmlcRQa7aqz8,1718
-aiteamutils-0.2.80.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.80.dist-info/RECORD,,