aiteamutils 0.2.19__tar.gz → 0.2.20__tar.gz

{aiteamutils-0.2.19 → aiteamutils-0.2.20}/PKG-INFO

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

{aiteamutils-0.2.19 → aiteamutils-0.2.20}/aiteamutils/database.py

@@ -85,7 +85,7 @@ class DatabaseService:
                 pool_pre_ping=True,
                 poolclass=QueuePool,
             )
-            self.async_session = sessionmaker(
+            self.session_factory = sessionmaker(
                 bind=self.engine,
                 class_=AsyncSession,
                 expire_on_commit=False
@@ -93,7 +93,11 @@ class DatabaseService:
             self.db = None
         elif session:
             self.engine = session.bind
-            self.async_session = None
+            self.session_factory = sessionmaker(
+                bind=self.engine,
+                class_=AsyncSession,
+                expire_on_commit=False
+            )
             self.db = session
         else:
             raise ValueError("Either db_url or session must be provided")
@@ -788,9 +792,13 @@ class DatabaseService:
             CustomException: 데이터베이스 작업 중 오류 발생 시
         """
         try:
-            async with self.db as session:
-                result = await session.execute(query)
+            if self.db:
+                result = await self.db.execute(query)
                 return result
+            else:
+                async with self.session_factory() as session:
+                    result = await session.execute(query)
+                    return result
         except Exception as e:
             raise CustomException(
                 ErrorCode.DB_QUERY_ERROR,

{aiteamutils-0.2.19 → aiteamutils-0.2.20}/aiteamutils/dependencies.py

@@ -2,6 +2,7 @@ from typing import Type, Dict, Tuple, Any, Callable
 from fastapi import Depends, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from .database import DatabaseService, get_database_service
 from .exceptions import CustomException, ErrorCode
@@ -59,7 +60,8 @@ def get_service(name: str):
     Returns:
         Callable: 서비스 인스턴스를 반환하는 의존성 함수
     """
-    def _get_service(db_service: DatabaseService = Depends(get_database_service)):
+    def _get_service(db: AsyncSession = Depends(get_db)):
+        db_service = DatabaseService(session=db)
         repository_class, service_class = service_registry.get(name)
         repository = repository_class(db_service)
         return service_class(repository, db_service)

aiteamutils-0.2.20/aiteamutils/version.py

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

aiteamutils-0.2.19/aiteamutils/version.py

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

aiteamutils-0.2.19/app/auth/service.py

@@ -1,4 +0,0 @@
-from aiteamutils.config import get_settings
-
-# settings를 사용하는 곳에서는 get_settings()를 호출하여 사용
-settings = get_settings()