aiteamutils 0.2.3__tar.gz → 0.2.9__tar.gz

{aiteamutils-0.2.3 → aiteamutils-0.2.9}/PKG-INFO

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

{aiteamutils-0.2.3 → aiteamutils-0.2.9}/aiteamutils/__init__.py

@@ -20,7 +20,6 @@ from .base_service import BaseService
 from .base_repository import BaseRepository
 from .validators import validate_with
 from .enums import ActivityType
-from .cache import CacheManager
 from .version import __version__
 
 __all__ = [
@@ -52,8 +51,5 @@ __all__ = [
     "validate_with",
     
     # Enums
-    "ActivityType",
-    
-    # Cache
-    "CacheManager"
+    "ActivityType"
 ] 

{aiteamutils-0.2.3 → aiteamutils-0.2.9}/aiteamutils/base_repository.py

@@ -1,12 +1,13 @@
 """기본 레포지토리 모듈."""
-from typing import TypeVar, Generic, Dict, Any, List, Optional, Type
-from sqlalchemy.orm import DeclarativeBase
+from typing import TypeVar, Generic, Dict, Any, List, Optional, Type, Union
+from sqlalchemy.orm import DeclarativeBase, Load
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy import select, or_, and_
-from .database import DatabaseManager
+from .database import DatabaseService
 from .exceptions import CustomException, ErrorCode
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql import Select
+from fastapi import Request
 
 ModelType = TypeVar("ModelType", bound=DeclarativeBase)
 
@@ -14,10 +15,10 @@ class BaseRepository(Generic[ModelType]):
    ##################
     # 1. 초기화 영역 #
     ##################
-    def __init__(self, db_service: DatabaseManager, model: Type[ModelType]):
+    def __init__(self, db_service: DatabaseService, model: Type[ModelType]):
         """
         Args:
-            db_service (DatabaseManager): 데이터베이스 서비스 인스턴스
+            db_service (DatabaseService): 데이터베이스 서비스 인스턴스
             model (Type[ModelType]): 모델 클래스
         """
         self.db_service = db_service

{aiteamutils-0.2.3 → aiteamutils-0.2.9}/aiteamutils/base_service.py

@@ -1,9 +1,9 @@
 """기본 서비스 모듈."""
 from datetime import datetime
 from typing import TypeVar, Generic, Dict, Any, List, Optional, Type, Union
-from sqlalchemy.orm import DeclarativeBase
+from sqlalchemy.orm import DeclarativeBase, Load
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
-from .database import DatabaseManager
+from .database import DatabaseService
 from .exceptions import CustomException, ErrorCode
 from .base_repository import BaseRepository
 from .security import hash_password

{aiteamutils-0.2.3 → aiteamutils-0.2.9}/aiteamutils/database.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, Optional, Type, AsyncGenerator, TypeVar, List, Union
 from sqlalchemy import select, update, and_, Table
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, AsyncEngine
-from sqlalchemy.orm import sessionmaker, Load, joinedload
+from sqlalchemy.orm import sessionmaker
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy.pool import QueuePool
 from contextlib import asynccontextmanager
@@ -18,32 +18,57 @@ from .config import settings
 T = TypeVar("T", bound=BaseColumn)
 
 class DatabaseService:
-    def __init__(self, db_url: str):
+    def __init__(
+        self,
+        db_url: str = None,
+        session: AsyncSession = None,
+        db_echo: bool = False,
+        db_pool_size: int = 5,
+        db_max_overflow: int = 10,
+        db_pool_timeout: int = 30,
+        db_pool_recycle: int = 1800
+    ):
         """DatabaseService 초기화.
         
         Args:
-            db_url: 데이터베이스 URL
+            db_url (str, optional): 데이터베이스 URL
+            session (AsyncSession, optional): 기존 세션
+            db_echo (bool, optional): SQL 로깅 여부
+            db_pool_size (int, optional): DB 커넥션 풀 크기
+            db_max_overflow (int, optional): 최대 초과 커넥션 수
+            db_pool_timeout (int, optional): 커넥션 풀 타임아웃
+            db_pool_recycle (int, optional): 커넥션 재활용 시간
         """
-        self.engine = create_async_engine(
-            db_url,
-            echo=settings.DB_ECHO,
-            pool_size=settings.DB_POOL_SIZE,
-            max_overflow=settings.DB_MAX_OVERFLOW,
-            pool_timeout=settings.DB_POOL_TIMEOUT,
-            pool_recycle=settings.DB_POOL_RECYCLE,
-            pool_pre_ping=True,
-            poolclass=QueuePool,
-        )
-        
-        self.async_session = sessionmaker(
-            bind=self.engine,
-            class_=AsyncSession,
-            expire_on_commit=False
-        )
-        
+        if db_url:
+            self.engine = create_async_engine(
+                db_url,
+                echo=db_echo,
+                pool_size=db_pool_size,
+                max_overflow=db_max_overflow,
+                pool_timeout=db_pool_timeout,
+                pool_recycle=db_pool_recycle,
+                pool_pre_ping=True,
+                poolclass=QueuePool,
+            )
+            self.async_session = sessionmaker(
+                bind=self.engine,
+                class_=AsyncSession,
+                expire_on_commit=False
+            )
+            self.db = None
+        elif session:
+            self.engine = session.bind
+            self.async_session = None
+            self.db = session
+        else:
+            raise ValueError("Either db_url or session must be provided")
+
     @asynccontextmanager
-    async def get_db(self) -> AsyncGenerator[AsyncSession, None]:
-        """데이터베이스 세션을 생성하고 반환하는 비동기 제너레이터."""
+    async def get_session(self) -> AsyncGenerator[AsyncSession, None]:
+        """데이터베이스 세션을 생성하고 반환하는 비동기 컨텍스트 매니저."""
+        if self.async_session is None:
+            raise RuntimeError("Session factory not initialized")
+        
         async with self.async_session() as session:
             try:
                 yield session

{aiteamutils-0.2.3 → aiteamutils-0.2.9}/aiteamutils/dependencies.py

@@ -1,10 +1,10 @@
-from typing import Type, Dict, Tuple, Any
+from typing import Type, Dict, Tuple, Any, AsyncGenerator, Callable
 from sqlalchemy.ext.asyncio import AsyncSession
 from fastapi import Depends, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
 
-from .database import get_db, DatabaseService
+from .database import DatabaseService
 from .exceptions import CustomException, ErrorCode
 
 class Settings:
@@ -14,16 +14,42 @@ class Settings:
         self.JWT_ALGORITHM = jwt_algorithm
 
 _settings: Settings | None = None
-
-def init_settings(jwt_secret: str, jwt_algorithm: str = "HS256"):
+_database_service: DatabaseService | None = None
+
+def init_settings(
+    jwt_secret: str,
+    jwt_algorithm: str = "HS256",
+    db_url: str = None,
+    db_echo: bool = False,
+    db_pool_size: int = 5,
+    db_max_overflow: int = 10,
+    db_pool_timeout: int = 30,
+    db_pool_recycle: int = 1800
+):
     """설정 초기화 함수
     
     Args:
         jwt_secret (str): JWT 시크릿 키
         jwt_algorithm (str, optional): JWT 알고리즘. Defaults to "HS256".
+        db_url (str, optional): 데이터베이스 URL
+        db_echo (bool, optional): SQL 로깅 여부
+        db_pool_size (int, optional): DB 커넥션 풀 크기
+        db_max_overflow (int, optional): 최대 초과 커넥션 수
+        db_pool_timeout (int, optional): 커넥션 풀 타임아웃
+        db_pool_recycle (int, optional): 커넥션 재활용 시간
     """
-    global _settings
+    global _settings, _database_service
     _settings = Settings(jwt_secret, jwt_algorithm)
+    
+    if 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
+        )
 
 def get_settings() -> Settings:
     """현재 설정을 반환하는 함수
@@ -38,6 +64,39 @@ def get_settings() -> Settings:
         raise RuntimeError("Settings not initialized. Call init_settings first.")
     return _settings
 
+def get_database_service() -> DatabaseService:
+    """DatabaseService 인스턴스를 반환하는 함수
+    
+    Returns:
+        DatabaseService: DatabaseService 인스턴스
+        
+    Raises:
+        RuntimeError: DatabaseService가 초기화되지 않은 경우
+    """
+    if _database_service is None:
+        raise RuntimeError("DatabaseService not initialized. Call init_settings with db_url first.")
+    return _database_service
+
+async def get_db() -> AsyncGenerator[AsyncSession, None]:
+    """데이터베이스 세션을 생성하고 반환하는 비동기 제너레이터."""
+    db_service = get_database_service()
+    async with db_service.get_session() as session:
+        try:
+            yield session
+        finally:
+            await session.close()
+
+def get_database_session(db: AsyncSession = Depends(get_db)) -> DatabaseService:
+    """DatabaseService 의존성
+
+    Args:
+        db (AsyncSession): 데이터베이스 세션
+
+    Returns:
+        DatabaseService: DatabaseService 인스턴스
+    """
+    return DatabaseService(session=db)
+
 class ServiceRegistry:
     """서비스 레지스트리를 관리하는 클래스"""
     def __init__(self):
@@ -81,17 +140,6 @@ class ServiceRegistry:
 # ServiceRegistry 초기화
 service_registry = ServiceRegistry()
 
-def get_database_service(db: AsyncSession = Depends(get_db)) -> DatabaseService:
-    """DatabaseService 의존성
-
-    Args:
-        db (AsyncSession): 데이터베이스 세션
-
-    Returns:
-        DatabaseService: DatabaseService 인스턴스
-    """
-    return DatabaseService(db)
-
 def get_service(name: str):
     """등록된 서비스를 가져오는 의존성 함수
 
@@ -145,9 +193,16 @@ async def get_current_user(
             source_function="dependencies.py / get_current_user"
         )
 
-    from app.user.repository import UserRepository
-    user_repo = UserRepository(db_service)
-    user = await user_repo.get_user(user_ulid, by="ulid")
+    try:
+        repository_class, _ = service_registry.get("user")
+        user_repo = repository_class(db_service)
+        user = await user_repo.get_user(user_ulid, by="ulid")
+    except ValueError:
+        raise CustomException(
+            ErrorCode.SERVICE_NOT_REGISTERED,
+            detail="User service is not registered",
+            source_function="dependencies.py / get_current_user"
+        )
 
     if not user:
         raise CustomException(

{aiteamutils-0.2.3 → aiteamutils-0.2.9}/aiteamutils/validators.py

@@ -1,13 +1,16 @@
 """유효성 검사 관련 유틸리티 함수들을 모아둔 모듈입니다."""
 
-from typing import Any, Optional, Dict
+from typing import Type, Dict, Any, Callable, TypeVar, Optional, List, Union
+from functools import wraps
+from sqlalchemy import Table
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select
-from pydantic import field_validator
+from fastapi import Request
+from inspect import signature
+from pydantic import BaseModel, field_validator
 import re
 
 from .exceptions import ErrorCode, CustomException
-from .database import DatabaseManager
+from .database import DatabaseService
 from .base_model import Base
 
 def validate_with(validator_func, unique_check=None, skip_if_none=False):

aiteamutils-0.2.9/aiteamutils/version.py

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

aiteamutils-0.2.3/aiteamutils/version.py

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