aiteamutils 0.2.36__py3-none-any.whl → 0.2.38__py3-none-any.whl

aiteamutils/database.py

@@ -9,6 +9,7 @@ from sqlalchemy import or_
 from fastapi import Request, Depends
 from ulid import ULID
 from sqlalchemy.sql import Select
+import logging
 
 from .exceptions import ErrorCode, CustomException
 from .base_model import Base, BaseColumn
@@ -31,18 +32,33 @@ def get_database_service() -> 'DatabaseService':
     if _database_service is None:
         raise CustomException(
             ErrorCode.DB_CONNECTION_ERROR,
-            detail="database_service",
+            detail="Database service is not initialized. Call init_database_service() first.",
             source_function="get_database_service"
         )
     return _database_service
 
 async def get_db() -> AsyncGenerator[AsyncSession, None]:
-    """데이터베이스 세션을 생성하고 반환하는 비동기 제너레이터."""
+    """데이터베이스 세션을 생성하고 반환하는 비동기 제너레이터.
+    
+    Yields:
+        AsyncSession: 데이터베이스 세션
+        
+    Raises:
+        CustomException: 세션 생성 실패 시
+    """
     db_service = get_database_service()
-    async with db_service.get_session() as session:
-        try:
+    try:
+        async with db_service.get_session() as session:
             yield session
-        finally:
+    except Exception as e:
+        raise CustomException(
+            ErrorCode.DB_CONNECTION_ERROR,
+            detail=f"Failed to get database session: {str(e)}",
+            source_function="get_db",
+            original_error=e
+        )
+    finally:
+        if 'session' in locals():
             await session.close()
 
 def get_database_session(db: AsyncSession = Depends(get_db)) -> 'DatabaseService':
@@ -921,14 +937,40 @@ def init_database_service(
         
     Returns:
         DatabaseService: 초기화된 데이터베이스 서비스 인스턴스
+        
+    Raises:
+        CustomException: 데이터베이스 초기화 실패 시
     """
-    global _database_service
-    _database_service = DatabaseService(
-        db_url=db_url,
-        db_echo=db_echo,
-        db_pool_size=db_pool_size,
-        db_max_overflow=db_max_overflow,
-        db_pool_timeout=db_pool_timeout,
-        db_pool_recycle=db_pool_recycle
-    )
-    return _database_service
+    try:
+        global _database_service
+        if _database_service is not None:
+            logging.info("Database service already initialized")
+            return _database_service
+            
+        logging.info(f"Initializing database service with URL: {db_url}")
+        _database_service = DatabaseService(
+            db_url=db_url,
+            db_echo=db_echo,
+            db_pool_size=db_pool_size,
+            db_max_overflow=db_max_overflow,
+            db_pool_timeout=db_pool_timeout,
+            db_pool_recycle=db_pool_recycle
+        )
+        
+        if not _database_service.engine:
+            raise CustomException(
+                ErrorCode.DB_CONNECTION_ERROR,
+                detail="Database engine initialization failed",
+                source_function="init_database_service"
+            )
+            
+        logging.info("Database service initialized successfully")
+        return _database_service
+    except Exception as e:
+        logging.error(f"Failed to initialize database service: {str(e)}")
+        raise CustomException(
+            ErrorCode.DB_CONNECTION_ERROR,
+            detail=f"Failed to initialize database service: {str(e)}",
+            source_function="init_database_service",
+            original_error=e
+        )

aiteamutils/dependencies.py

@@ -67,11 +67,22 @@ def get_service(name: str):
 
     Returns:
         Callable: 서비스 인스턴스를 반환하는 의존성 함수
+        
+    Raises:
+        CustomException: 서비스 생성 실패 시
     """
     def _get_service(db_service: DatabaseService = Depends(get_database_service)):
-        repository_class, service_class = service_registry.get(name)
-        repository = repository_class(db_service)
-        return service_class(repository, db_service)
+        try:
+            repository_class, service_class = service_registry.get(name)
+            repository = repository_class(db_service)
+            return service_class(repository)
+        except Exception as e:
+            raise CustomException(
+                ErrorCode.SERVICE_NOT_REGISTERED,
+                detail=f"Failed to create service {name}: {str(e)}",
+                source_function="dependencies.get_service",
+                original_error=e
+            )
     return _get_service
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/users/token")

aiteamutils/security.py

@@ -15,6 +15,9 @@ from .config import get_settings
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
+# 전역 rate limit 상태 저장
+_rate_limits: Dict[str, Dict[str, Any]] = {}
+
 class RateLimitExceeded(CustomException):
     """Rate limit 초과 예외."""
     
@@ -200,14 +203,10 @@ def rate_limit(
     key_func: Optional[Callable] = None
 ):
     """Rate limiting 데코레이터."""
-    rate_limits: Dict[str, Dict[str, Any]] = {}
-    
     def decorator(func: Callable) -> Callable:
         @wraps(func)
         async def wrapper(*args, **kwargs):
             logging.info(f"[rate_limit] Starting rate limit check for {func.__name__}")
-            logging.info(f"[rate_limit] Args: {args}")
-            logging.info(f"[rate_limit] Kwargs: {kwargs}")
             
             # Request 객체 찾기
             request = None
@@ -240,16 +239,16 @@ def rate_limit(
             now = datetime.now(UTC)
             
             # 현재 rate limit 정보 가져오기
-            rate_info = rate_limits.get(rate_limit_key)
+            rate_info = _rate_limits.get(rate_limit_key)
             logging.info(f"[rate_limit] Current rate info: {rate_info}")
             
             if rate_info is None or (now - rate_info["start_time"]).total_seconds() >= window_seconds:
                 # 새로운 rate limit 설정
-                rate_limits[rate_limit_key] = {
+                _rate_limits[rate_limit_key] = {
                     "count": 1,
                     "start_time": now
                 }
-                logging.info(f"[rate_limit] Created new rate limit: {rate_limits[rate_limit_key]}")
+                logging.info(f"[rate_limit] Created new rate limit: {_rate_limits[rate_limit_key]}")
             else:
                 # 기존 rate limit 업데이트
                 if rate_info["count"] >= max_requests:
@@ -268,14 +267,6 @@ def rate_limit(
             
             try:
                 logging.info(f"[rate_limit] Executing original function: {func.__name__}")
-                # db_service가 있는지 확인
-                for arg in args:
-                    if hasattr(arg, 'db_service'):
-                        logging.info(f"[rate_limit] Found db_service in args: {arg.db_service}")
-                for value in kwargs.values():
-                    if hasattr(value, 'db_service'):
-                        logging.info(f"[rate_limit] Found db_service in kwargs: {value.db_service}")
-                
                 result = await func(*args, **kwargs)
                 logging.info("[rate_limit] Function executed successfully")
                 return result
@@ -290,7 +281,7 @@ def rate_limit(
                     source_function=func.__name__,
                     original_error=e
                 )
-                
+        
         return wrapper
     return decorator
 

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.36"
+__version__ = "0.2.38"

{aiteamutils-0.2.36.dist-info → aiteamutils-0.2.38.dist-info}/METADATA

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

{aiteamutils-0.2.36.dist-info → aiteamutils-0.2.38.dist-info}/RECORD

@@ -4,13 +4,13 @@ aiteamutils/base_repository.py,sha256=qdwQ7Sj2fUqxpDg6cWM48n_QbwPK_VUlG9zTSem8iC
 aiteamutils/base_service.py,sha256=E4dHGE0DvhmRyFplh46SwKJOSF_nUL7OAsCkf_ZJF_8,24733
 aiteamutils/cache.py,sha256=tr0Yn8VPYA9QHiKCUzciVlQ2J1RAwNo2K9lGMH4rY3s,1334
 aiteamutils/config.py,sha256=kFKMeIx1KcuEwwx4VjZdCgoTOHCkG3ySYVJ0G6cvMoA,2849
-aiteamutils/database.py,sha256=CaH73g8PPNcmLCz4Xr0DBtNSrLcpRlyt0F1zO5Tigfo,33811
-aiteamutils/dependencies.py,sha256=GgN8sFM7qGNmOfpLaFrhuHOgPlBVXWrEgxv29jxjEgI,4226
+aiteamutils/database.py,sha256=ATFiwG_o6o1eeUa0VVQ_2E_ExC2Yg-Ui_eA62SL6vQk,35344
+aiteamutils/dependencies.py,sha256=ShbGAWAEfZCe_8tfWW8D5zm7JA_OkcGEXX7sJr0xqfI,4605
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=YV-ISya4wQlHk4twvGo16I5r8h22-tXpn9wa-b3WwDM,15231
-aiteamutils/security.py,sha256=U6EjpruMK6PB_gfUsX1kbrnv5pdkrg-vbJ266HDmelU,16563
+aiteamutils/security.py,sha256=9gvEqDtE3RJaoCWqELPCjkg-IsSqZVrpMP6XPZaodWU,16024
 aiteamutils/validators.py,sha256=3N245cZFjgwtW_KzjESkizx5BBUDaJLbbxfNO4WOFZ0,7764
-aiteamutils/version.py,sha256=xIPwqXH-2Fd8zt8Gh1JwJx_ISWM3WKZzxCLLIcTS6JU,42
-aiteamutils-0.2.36.dist-info/METADATA,sha256=0StxHP94IIzkjMUHtwHz2vJ-n9lFKhhMh3aSax2LZ3g,1718
-aiteamutils-0.2.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.36.dist-info/RECORD,,
+aiteamutils/version.py,sha256=ALyTk2taueqibsmGUnkLfV7gD0h49jnn_qqd8wQoe7M,42
+aiteamutils-0.2.38.dist-info/METADATA,sha256=YuD1Vi-w0zGdm0tK3YdTBcpuBOVjdO1nlR3x1Onq45A,1718
+aiteamutils-0.2.38.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.38.dist-info/RECORD,,