aiteamutils 0.2.32__py3-none-any.whl → 0.2.34__py3-none-any.whl

aiteamutils/config.py

@@ -1,6 +1,7 @@
 """설정 모듈."""
 from typing import Union
 from .database import init_database_service
+from .exceptions import CustomException, ErrorCode
 
 class Settings:
     """기본 설정 클래스"""
@@ -74,8 +75,12 @@ def get_settings() -> Settings:
         Settings: 설정 객체
         
     Raises:
-        RuntimeError: 설정이 초기화되지 않은 경우
+        CustomException: 설정이 초기화되지 않은 경우
     """
     if _settings is None:
-        raise RuntimeError("Settings not initialized. Call init_settings first.")
+        raise CustomException(
+            ErrorCode.INTERNAL_ERROR,
+            detail="settings",
+            source_function="get_settings"
+        )
     return _settings 

aiteamutils/database.py

@@ -26,10 +26,14 @@ def get_database_service() -> 'DatabaseService':
         DatabaseService: DatabaseService 인스턴스
         
     Raises:
-        RuntimeError: DatabaseService가 초기화되지 않은 경우
+        CustomException: DatabaseService가 초기화되지 않은 경우
     """
     if _database_service is None:
-        raise RuntimeError("DatabaseService not initialized. Call init_settings with db_url first.")
+        raise CustomException(
+            ErrorCode.DB_CONNECTION_ERROR,
+            detail="database_service",
+            source_function="get_database_service"
+        )
     return _database_service
 
 async def get_db() -> AsyncGenerator[AsyncSession, None]:
@@ -100,13 +104,21 @@ class DatabaseService:
             )
             self.db = session
         else:
-            raise ValueError("Either db_url or session must be provided")
+            raise CustomException(
+                ErrorCode.DB_CONNECTION_ERROR,
+                detail="db_url|session",
+                source_function="DatabaseService.__init__"
+            )
 
     @asynccontextmanager
     async def get_session(self) -> AsyncGenerator[AsyncSession, None]:
         """데이터베이스 세션을 생성하고 반환하는 비동기 컨텍스트 매니저."""
         if self.session_factory is None:
-            raise RuntimeError("Session factory not initialized")
+            raise CustomException(
+                ErrorCode.DB_CONNECTION_ERROR,
+                detail="session_factory",
+                source_function="DatabaseService.get_session"
+            )
         
         async with self.session_factory() as session:
             try:

aiteamutils/dependencies.py

@@ -26,10 +26,14 @@ class ServiceRegistry:
             service_class (Type): Service 클래스
 
         Raises:
-            ValueError: 이미 등록된 서비스인 경우
+            CustomException: 이미 등록된 서비스인 경우
         """
         if name in self._services:
-            raise ValueError(f"Service '{name}' is already registered.")
+            raise CustomException(
+                ErrorCode.INTERNAL_ERROR,
+                detail=f"service|{name}",
+                source_function="ServiceRegistry.register"
+            )
         self._services[name] = (repository_class, service_class)
 
     def get(self, name: str) -> Tuple[Type, Type]:
@@ -42,10 +46,14 @@ class ServiceRegistry:
             Tuple[Type, Type]: (Repository 클래스, Service 클래스) 튜플
 
         Raises:
-            ValueError: 등록되지 않은 서비스인 경우
+            CustomException: 등록되지 않은 서비스인 경우
         """
         if name not in self._services:
-            raise ValueError(f"Service '{name}' is not registered.")
+            raise CustomException(
+                ErrorCode.NOT_FOUND,
+                detail=f"service|{name}",
+                source_function="ServiceRegistry.get"
+            )
         return self._services[name]
 
 # ServiceRegistry 초기화

aiteamutils/security.py

@@ -157,8 +157,19 @@ def verify_password(plain_password: str, hashed_password: str) -> bool:
         
     Returns:
         bool: 비밀번호 일치 여부
+        
+    Raises:
+        CustomException: 비밀번호 검증 실패 시
     """
-    return pwd_context.verify(plain_password, hashed_password)
+    try:
+        return pwd_context.verify(plain_password, hashed_password)
+    except Exception as e:
+        raise CustomException(
+            ErrorCode.INVALID_PASSWORD,
+            detail=plain_password,
+            source_function="security.verify_password",
+            original_error=e
+        )
 
 def hash_password(password: str) -> str:
     """비밀번호를 해시화합니다.
@@ -168,8 +179,19 @@ def hash_password(password: str) -> str:
         
     Returns:
         str: 해시된 비밀번호
+        
+    Raises:
+        CustomException: 비밀번호 해시화 실패 시
     """
-    return pwd_context.hash(password)
+    try:
+        return pwd_context.hash(password)
+    except Exception as e:
+        raise CustomException(
+            ErrorCode.INTERNAL_ERROR,
+            detail=password,
+            source_function="security.hash_password",
+            original_error=e
+        )
 
 def rate_limit(
     max_requests: int,
@@ -177,7 +199,7 @@ def rate_limit(
     key_func: Optional[Callable] = None
 ):
     """Rate limiting 데코레이터."""
-    limiter = RateLimiter(max_requests, window_seconds)
+    rate_limits: Dict[str, Dict[str, Any]] = {}
     
     def decorator(func: Callable) -> Callable:
         @wraps(func)
@@ -194,39 +216,56 @@ def rate_limit(
                         request = arg
                         break
             if not request:
-                raise SecurityError(
+                raise CustomException(
                     ErrorCode.INTERNAL_ERROR,
                     detail="Request object not found",
                     source_function="rate_limit"
                 )
             
-            # Rate limit 키 생성
+            # 레이트 리밋 키 생성
             if key_func:
                 rate_limit_key = f"rate_limit:{key_func(request)}"
             else:
                 client_ip = request.client.host
                 rate_limit_key = f"rate_limit:{client_ip}:{func.__name__}"
             
-            try:
-                if not limiter.is_allowed(rate_limit_key):
-                    remaining_time = limiter.get_remaining_time(rate_limit_key)
+            now = datetime.now(UTC)
+            
+            # 현재 rate limit 정보 가져오기
+            rate_info = rate_limits.get(rate_limit_key)
+            
+            if rate_info is None or (now - rate_info["start_time"]).total_seconds() >= window_seconds:
+                # 새로운 rate limit 설정
+                rate_limits[rate_limit_key] = {
+                    "count": 1,
+                    "start_time": now
+                }
+            else:
+                # 기존 rate limit 업데이트
+                if rate_info["count"] >= max_requests:
+                    # rate limit 초과
+                    remaining_seconds = window_seconds - (now - rate_info["start_time"]).total_seconds()
                     raise RateLimitExceeded(
-                        detail=f"Rate limit exceeded. Try again in {int(remaining_time)} seconds",
+                        detail=rate_limit_key,
                         source_function=func.__name__,
-                        remaining_seconds=remaining_time,
+                        remaining_seconds=remaining_seconds,
                         max_requests=max_requests,
                         window_seconds=window_seconds
                     )
-                
+                rate_info["count"] += 1
+            
+            try:
+                # 원래 함수 실행
                 return await func(*args, **kwargs)
-                    
-            except (RateLimitExceeded, SecurityError) as e:
+            except CustomException as e:
+                # CustomException은 그대로 전파
                 raise e
             except Exception as e:
-                raise SecurityError(
+                # 다른 예외는 INTERNAL_ERROR로 래핑
+                raise CustomException(
                     ErrorCode.INTERNAL_ERROR,
                     detail=str(e),
-                    source_function="rate_limit",
+                    source_function=func.__name__,
                     original_error=e
                 )
                 
@@ -288,10 +327,10 @@ async def create_jwt_token(
         required_fields = {"username", "ulid"}
         missing_fields = required_fields - set(user_data.keys())
         if missing_fields:
-            raise TokenCreationError(
-                detail=f"Missing required fields: {', '.join(missing_fields)}",
-                source_function="create_jwt_token",
-                token_type=token_type
+            raise CustomException(
+                ErrorCode.REQUIRED_FIELD_MISSING,
+                detail="|".join(missing_fields),
+                source_function="security.create_jwt_token"
             )
         
         if token_type == "access":
@@ -337,10 +376,10 @@ async def create_jwt_token(
                 algorithm=settings.JWT_ALGORITHM
             )
         except Exception as e:
-            raise TokenCreationError(
-                detail="Failed to encode JWT token",
-                source_function="create_jwt_token",
-                token_type=token_type,
+            raise CustomException(
+                ErrorCode.INTERNAL_ERROR,
+                detail=f"token|{token_type}",
+                source_function="security.create_jwt_token",
                 original_error=e
             )
         
@@ -362,13 +401,13 @@ async def create_jwt_token(
         
         return token
         
-    except (TokenCreationError, SecurityError) as e:
+    except CustomException as e:
         raise e
     except Exception as e:
-        raise SecurityError(
+        raise CustomException(
             ErrorCode.INTERNAL_ERROR,
             detail=str(e),
-            source_function="create_jwt_token",
+            source_function="security.create_jwt_token",
             original_error=e
         )
 
@@ -376,7 +415,18 @@ async def verify_jwt_token(
     token: str,
     expected_type: Optional[Literal["access", "refresh"]] = None
 ) -> Dict[str, Any]:
-    """JWT 토큰을 검증합니다."""
+    """JWT 토큰을 검증합니다.
+    
+    Args:
+        token: 검증할 JWT 토큰
+        expected_type: 예상되는 토큰 타입
+        
+    Returns:
+        Dict[str, Any]: 토큰 페이로드
+        
+    Raises:
+        CustomException: 토큰 검증 실패 시
+    """
     try:
         settings = get_settings()
         # 토큰 디코딩
@@ -390,25 +440,27 @@ async def verify_jwt_token(
         
         # 토큰 타입 검증 (expected_type이 주어진 경우에만)
         if expected_type and payload.get("token_type") != expected_type:
-            raise TokenError(
-                detail=f"Expected {expected_type} token but got {payload.get('token_type')}",
-                source_function="verify_jwt_token"
+            raise CustomException(
+                ErrorCode.INVALID_TOKEN,
+                detail=f"token|{expected_type}|{payload.get('token_type')}",
+                source_function="security.verify_jwt_token"
             )
         
         return payload
         
     except JWTError as e:
-        raise TokenError(
-            detail=str(e),
-            source_function="verify_jwt_token",
+        raise CustomException(
+            ErrorCode.INVALID_TOKEN,
+            detail=token[:10] + "...",
+            source_function="security.verify_jwt_token",
             original_error=e
         )
-    except (TokenError, SecurityError) as e:
+    except CustomException as e:
         raise e
     except Exception as e:
-        raise SecurityError(
+        raise CustomException(
             ErrorCode.INTERNAL_ERROR,
             detail=str(e),
-            source_function="verify_jwt_token",
+            source_function="security.verify_jwt_token",
             original_error=e
         ) 

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.32"
+__version__ = "0.2.34"

{aiteamutils-0.2.32.dist-info → aiteamutils-0.2.34.dist-info}/METADATA

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

{aiteamutils-0.2.32.dist-info → aiteamutils-0.2.34.dist-info}/RECORD

@@ -3,14 +3,14 @@ aiteamutils/base_model.py,sha256=ODEnjvUVoxQ1RPCfq8-uZTfTADIA4c7Z3E6G4EVsSX0,270
 aiteamutils/base_repository.py,sha256=qdwQ7Sj2fUqxpDg6cWM48n_QbwPK_VUlG9zTSem8iCk,18968
 aiteamutils/base_service.py,sha256=E4dHGE0DvhmRyFplh46SwKJOSF_nUL7OAsCkf_ZJF_8,24733
 aiteamutils/cache.py,sha256=tr0Yn8VPYA9QHiKCUzciVlQ2J1RAwNo2K9lGMH4rY3s,1334
-aiteamutils/config.py,sha256=7pJHBml8RRXC9FpoRBx0emofFkvtxsyk9_Rcur2F9hI,2724
-aiteamutils/database.py,sha256=raYKRZjEfefM3SnoPYozPu7OUGm62XWOUqZzN4_cayw,33479
-aiteamutils/dependencies.py,sha256=t4bYFu_u6_rhSHZH65MRmQoN74GC_1IqVK-l-wDy3Hw,3984
+aiteamutils/config.py,sha256=kFKMeIx1KcuEwwx4VjZdCgoTOHCkG3ySYVJ0G6cvMoA,2849
+aiteamutils/database.py,sha256=CaH73g8PPNcmLCz4Xr0DBtNSrLcpRlyt0F1zO5Tigfo,33811
+aiteamutils/dependencies.py,sha256=GgN8sFM7qGNmOfpLaFrhuHOgPlBVXWrEgxv29jxjEgI,4226
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=YV-ISya4wQlHk4twvGo16I5r8h22-tXpn9wa-b3WwDM,15231
-aiteamutils/security.py,sha256=jxJsWSjJOMVlNaBFxroIXrAgseJYKl_vQ_kfmHblPIA,13498
+aiteamutils/security.py,sha256=NHiX0rIznYqMVqSIDFj1u2qjsJb6YFgC0GMjzVjnbWk,15135
 aiteamutils/validators.py,sha256=3N245cZFjgwtW_KzjESkizx5BBUDaJLbbxfNO4WOFZ0,7764
-aiteamutils/version.py,sha256=TS_f4LH3EJgdiSTWc718XoM6nVHoW3rx_v3DZlzWJyQ,42
-aiteamutils-0.2.32.dist-info/METADATA,sha256=giY2qyWUxWi5xCg_krbjwleHlrgmguEemTG6QNZ3a6E,1718
-aiteamutils-0.2.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.32.dist-info/RECORD,,
+aiteamutils/version.py,sha256=t69ncPrInx6hcKQn1rb-2H6AE0Aas3A-6K--9iJOFlg,42
+aiteamutils-0.2.34.dist-info/METADATA,sha256=Nq_9Q5465EIAShF1fdxThWkhL5WpELqkea3ffyic28g,1718
+aiteamutils-0.2.34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.34.dist-info/RECORD,,