aiteamutils 0.2.78__tar.gz → 0.2.80__tar.gz

{aiteamutils-0.2.78 → aiteamutils-0.2.80}/PKG-INFO

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

{aiteamutils-0.2.78 → aiteamutils-0.2.80}/aiteamutils/base_repository.py

@@ -79,13 +79,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,7 +93,7 @@ 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
     ) -> List[ModelType]:

{aiteamutils-0.2.78 → aiteamutils-0.2.80}/aiteamutils/base_service.py

@@ -125,7 +125,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,29 +168,11 @@ 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
     ) -> 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]
-
             entities = await self.repository.list(
                 skip=skip,
                 limit=limit,

{aiteamutils-0.2.78 → aiteamutils-0.2.80}/aiteamutils/database.py

@@ -364,7 +364,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 +386,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,17 +399,18 @@ 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
 ) -> List[Dict[str, Any]]:

{aiteamutils-0.2.78 → aiteamutils-0.2.80}/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.78 → aiteamutils-0.2.80}/aiteamutils/security.py

@@ -1,19 +1,17 @@
 """보안 관련 유틸리티."""
 from datetime import datetime, timedelta, timezone
-from typing import Dict, Any, Optional, Literal, Callable, TYPE_CHECKING, TypeVar, Type
+from typing import Dict, Any, Optional, Literal, Callable, TYPE_CHECKING, TypeVar
 from fastapi import Request, HTTPException, status
 from functools import wraps
 from jose import jwt, JWTError
 from passlib.context import CryptContext
 import logging
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import DeclarativeBase
 from .exceptions import CustomException, ErrorCode
 from .enums import ActivityType
-from .database import log_create
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-ModelType = TypeVar("ModelType", bound=DeclarativeBase)
+ModelType = TypeVar("ModelType")
 
 # 전역 rate limit 상태 저장
 _rate_limits: Dict[str, Dict[str, Any]] = {}
@@ -134,7 +132,7 @@ def rate_limit(
     return decorator
 
 async def create_jwt_token(
-    user_data: Type[ModelType],
+    user_data: Optional[ModelType],
     token_type: Literal["access", "refresh"],
     db_session: AsyncSession,
     token_settings: Dict[str, Any],
@@ -164,10 +162,10 @@ async def create_jwt_token(
                 "token_type": token_type,
                 
                 # 조직 관련 클레임
-                "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
+                "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
             }
         else:  # refresh token
             expires_at = datetime.now(timezone.utc) + timedelta(days=14)

aiteamutils-0.2.80/aiteamutils/version.py

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

aiteamutils-0.2.78/aiteamutils/version.py

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