aiteamutils 0.2.13__py3-none-any.whl → 0.2.14__py3-none-any.whl

aiteamutils/database.py

@@ -6,17 +6,52 @@ from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy.pool import QueuePool
 from contextlib import asynccontextmanager
 from sqlalchemy import or_
-from fastapi import Request
+from fastapi import Request, Depends
 from ulid import ULID
 from sqlalchemy.sql import Select
 
 from .exceptions import ErrorCode, CustomException
 from .base_model import Base, BaseColumn
 from .enums import ActivityType
-from .config import settings
 
 T = TypeVar("T", bound=BaseColumn)
 
+# 전역 데이터베이스 서비스 인스턴스
+_database_service: 'DatabaseService' | None = None
+
+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 DatabaseService:
     def __init__(
         self,

aiteamutils/dependencies.py

@@ -1,10 +1,9 @@
-from typing import Type, Dict, Tuple, Any, AsyncGenerator, Callable
-from sqlalchemy.ext.asyncio import AsyncSession
+from typing import Type, Dict, Tuple, Any, Callable
 from fastapi import Depends, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
 
-from .database import DatabaseService
+from .database import DatabaseService, get_database_service
 from .exceptions import CustomException, ErrorCode
 
 class Settings:
@@ -14,7 +13,6 @@ class Settings:
         self.JWT_ALGORITHM = jwt_algorithm
 
 _settings: Settings | None = None
-_database_service: DatabaseService | None = None
 
 def init_settings(
     jwt_secret: str,
@@ -38,10 +36,11 @@ def init_settings(
         db_pool_timeout (int, optional): 커넥션 풀 타임아웃
         db_pool_recycle (int, optional): 커넥션 재활용 시간
     """
-    global _settings, _database_service
+    global _settings
     _settings = Settings(jwt_secret, jwt_algorithm)
     
     if db_url:
+        from .database import _database_service
         _database_service = DatabaseService(
             db_url=db_url,
             db_echo=db_echo,
@@ -64,39 +63,6 @@ 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):

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.13" 
+__version__ = "0.2.14" 

{aiteamutils-0.2.13.dist-info → aiteamutils-0.2.14.dist-info}/METADATA

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

{aiteamutils-0.2.13.dist-info → aiteamutils-0.2.14.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=AN-84p9ytiBcuC-plliCGl9EyzZKTnEms9t80jOxN7U,30990
-aiteamutils/dependencies.py,sha256=M_sgSo1xmfJMMwtDdiTVxxiH2udvBjNODfxN5Uwxotw,6836
+aiteamutils/database.py,sha256=iaqfPTSH3DqauLvwzFQO5XBBsKsL3KrYnu2AuWaTqgQ,32147
+aiteamutils/dependencies.py,sha256=6YAR2QmGOeL5t9EyWLJHypUopX_CsLDDmmX_3YOSGQQ,5704
 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=O1RGVlF9YD2O2f-fwKjZnpK60hVIiyyFd2w4lGbsbbE,44
-aiteamutils-0.2.13.dist-info/METADATA,sha256=c3ZTR8by8NIFXhNEHVYj8VlVKBG8olU60ZVBqmCC-p4,1718
-aiteamutils-0.2.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.13.dist-info/RECORD,,
+aiteamutils/version.py,sha256=QQqBt1NyP0N-ZlMtrZ_b51lA-ybgTt3nzbsfJxQS0U8,44
+aiteamutils-0.2.14.dist-info/METADATA,sha256=On-N3O2UklbAe7Qr8eGvkw831AyfE7iU11JPdJUa3-A,1718
+aiteamutils-0.2.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.14.dist-info/RECORD,,