aiteamutils 0.2.8__py3-none-any.whl → 0.2.9__py3-none-any.whl

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/dependencies.py

@@ -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()
 
-async def get_database_service(db: AsyncSession) -> DatabaseService:
-    """DatabaseService 의존성
-
-    Args:
-        db (AsyncSession): 데이터베이스 세션
-
-    Returns:
-        DatabaseService: DatabaseService 인스턴스
-    """
-    return DatabaseService(db)
-
 def get_service(name: str):
     """등록된 서비스를 가져오는 의존성 함수
 

aiteamutils/version.py

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

{aiteamutils-0.2.8.dist-info → aiteamutils-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.8
+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.8.dist-info → aiteamutils-0.2.9.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=vC6k6E2-Y4mD0E0kw6WVgSatCl9K_BtTwrVFhLrhCzs,665
-aiteamutils/database.py,sha256=U71cexPsSmMTKgp098I574PupqnuPltujI4QKHBG2Cc,29952
-aiteamutils/dependencies.py,sha256=vzhPBbm_5eBj27hCPWkn7D1jInqhpWrkc8O7o3ElDYY,5111
+aiteamutils/database.py,sha256=PRzdG6SiBzxCjsDjGRcfCbUHziSy1ycm9tDYsqkg1Og,30972
+aiteamutils/dependencies.py,sha256=M_sgSo1xmfJMMwtDdiTVxxiH2udvBjNODfxN5Uwxotw,6836
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=YV-ISya4wQlHk4twvGo16I5r8h22-tXpn9wa-b3WwDM,15231
 aiteamutils/security.py,sha256=AZszaTxVEGi1jU1sX3QXHGgshp1lVvd0xXvZejXvs_w,12643
 aiteamutils/validators.py,sha256=3N245cZFjgwtW_KzjESkizx5BBUDaJLbbxfNO4WOFZ0,7764
-aiteamutils/version.py,sha256=dHgfYIoXma4GXf9wzfmg8NaD9W8NvLM1qdXO8RZxcAU,43
-aiteamutils-0.2.8.dist-info/METADATA,sha256=arI-TV-0mrj766iRc582_FkaeKllkbebJnfAYxOK4KE,1717
-aiteamutils-0.2.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.8.dist-info/RECORD,,
+aiteamutils/version.py,sha256=-wgeOcidZCJ0zY2W2v_U4jlTLvmpNajEoP8_LpJPn9g,43
+aiteamutils-0.2.9.dist-info/METADATA,sha256=OsmuCIXUPq700xe2US-ak5LYb9fd6fz7V36ipfMOAtg,1717
+aiteamutils-0.2.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.9.dist-info/RECORD,,