aiteamutils 0.2.18__py3-none-any.whl → 0.2.20__py3-none-any.whl

aiteamutils/config.py

@@ -4,15 +4,28 @@ from .database import init_database_service
 
 class Settings:
     """기본 설정 클래스"""
-    def __init__(self, jwt_secret: str, jwt_algorithm: str = "HS256"):
+    def __init__(
+        self,
+        jwt_secret: str,
+        jwt_algorithm: str = "HS256",
+        access_token_expire_minutes: int = 30,
+        token_issuer: str = "ai-team",
+        token_audience: str = "ai-team"
+    ):
         self.JWT_SECRET = jwt_secret
         self.JWT_ALGORITHM = jwt_algorithm
+        self.ACCESS_TOKEN_EXPIRE_MINUTES = access_token_expire_minutes
+        self.TOKEN_ISSUER = token_issuer
+        self.TOKEN_AUDIENCE = token_audience
 
 _settings: Union[Settings, None] = None
 
 def init_settings(
     jwt_secret: str,
     jwt_algorithm: str = "HS256",
+    access_token_expire_minutes: int = 30,
+    token_issuer: str = "ai-team",
+    token_audience: str = "ai-team",
     db_url: str = None,
     db_echo: bool = False,
     db_pool_size: int = 5,
@@ -25,6 +38,9 @@ def init_settings(
     Args:
         jwt_secret (str): JWT 시크릿 키
         jwt_algorithm (str, optional): JWT 알고리즘. Defaults to "HS256".
+        access_token_expire_minutes (int, optional): 액세스 토큰 만료 시간(분). Defaults to 30.
+        token_issuer (str, optional): 토큰 발급자. Defaults to "ai-team".
+        token_audience (str, optional): 토큰 대상자. Defaults to "ai-team".
         db_url (str, optional): 데이터베이스 URL
         db_echo (bool, optional): SQL 로깅 여부
         db_pool_size (int, optional): DB 커넥션 풀 크기
@@ -33,7 +49,13 @@ def init_settings(
         db_pool_recycle (int, optional): 커넥션 재활용 시간
     """
     global _settings
-    _settings = Settings(jwt_secret, jwt_algorithm)
+    _settings = Settings(
+        jwt_secret=jwt_secret,
+        jwt_algorithm=jwt_algorithm,
+        access_token_expire_minutes=access_token_expire_minutes,
+        token_issuer=token_issuer,
+        token_audience=token_audience
+    )
     
     if db_url:
         init_database_service(

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

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

{aiteamutils-0.2.18.dist-info → aiteamutils-0.2.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.18
+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.18.dist-info → aiteamutils-0.2.20.dist-info}/RECORD

@@ -3,14 +3,14 @@ aiteamutils/base_model.py,sha256=ODEnjvUVoxQ1RPCfq8-uZTfTADIA4c7Z3E6G4EVsSX0,270
 aiteamutils/base_repository.py,sha256=qdwQ7Sj2fUqxpDg6cWM48n_QbwPK_VUlG9zTSem8iCk,18968
 aiteamutils/base_service.py,sha256=E4dHGE0DvhmRyFplh46SwKJOSF_nUL7OAsCkf_ZJF_8,24733
 aiteamutils/cache.py,sha256=tr0Yn8VPYA9QHiKCUzciVlQ2J1RAwNo2K9lGMH4rY3s,1334
-aiteamutils/config.py,sha256=1rqsrEiYEHbZAtDwS43139jDvPQYEFMn3GKPnZFR9cs,1843
-aiteamutils/database.py,sha256=09ihgJgKlCTouWPnb2dMhWqNH75n7lwB5GauEtr3oiQ,33226
-aiteamutils/dependencies.py,sha256=S6OWV4d3TONKKW9tRUP9whQlVX5DFfOq7U-7VUyPktA,3928
+aiteamutils/config.py,sha256=7pJHBml8RRXC9FpoRBx0emofFkvtxsyk9_Rcur2F9hI,2724
+aiteamutils/database.py,sha256=XSkyjzerqS6OOo-xACmx3la4KiUsuF32JRXcCA8mjfU,33516
+aiteamutils/dependencies.py,sha256=gy1G4DFb-UooFDFZOSIThEDDCUtsJn9odnm5dKV1kQM,4000
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=YV-ISya4wQlHk4twvGo16I5r8h22-tXpn9wa-b3WwDM,15231
 aiteamutils/security.py,sha256=2k5j8iV4jkp0IGRmOtEbVyoeuoDHbguzaYju0Wm-mmI,12715
 aiteamutils/validators.py,sha256=3N245cZFjgwtW_KzjESkizx5BBUDaJLbbxfNO4WOFZ0,7764
-aiteamutils/version.py,sha256=Sg4iiIem99YPfKGAPuPMcjzOHo_0DUVkFzUVuKBGb3E,44
-aiteamutils-0.2.18.dist-info/METADATA,sha256=rYXv8IYNGPEbLVPK_5EGOfpu_YmKQ7_YWgGV7Tnwt1k,1718
-aiteamutils-0.2.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.18.dist-info/RECORD,,
+aiteamutils/version.py,sha256=QU8rgwUP0RFiPXTax1Klj3C2oOhVbZIxSTH48xXwJiA,44
+aiteamutils-0.2.20.dist-info/METADATA,sha256=rluy_nzwvsfEouI6DLMLsefZz7w9zDzINHoPXIeLcLk,1718
+aiteamutils-0.2.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.20.dist-info/RECORD,,