aiteamutils 0.2.23__tar.gz → 0.2.25__tar.gz

{aiteamutils-0.2.23 → aiteamutils-0.2.25}/PKG-INFO

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

{aiteamutils-0.2.23 → aiteamutils-0.2.25}/aiteamutils/dependencies.py

@@ -52,19 +52,24 @@ class ServiceRegistry:
 service_registry = ServiceRegistry()
 
 def get_service(name: str):
-    """등록된 서비스를 가져오는 의존성 함수
-
-    Args:
-        name (str): 서비스 이름
-
-    Returns:
-        Callable: 서비스 인스턴스를 반환하는 의존성 함수
-    """
-    def _get_service(db: AsyncSession = Depends(get_db)):
-        db_service = DatabaseService(session=db)
+    def _get_service():
+        # 글로벌 DatabaseService 사용
+        db_service = get_database_service()
         repository_class, service_class = service_registry.get(name)
+        
+        # 이미 생성된 서비스가 있다면 재사용
+        if hasattr(service_registry, '_instances') and name in service_registry._instances:
+            return service_registry._instances[name]
+            
         repository = repository_class(db_service)
-        return service_class(repository, db_service)
+        instance = service_class(repository, db_service)
+        
+        # 생성된 인스턴스 캐싱
+        if not hasattr(service_registry, '_instances'):
+            service_registry._instances = {}
+        service_registry._instances[name] = instance
+        
+        return instance
     return _get_service
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/users/token")

{aiteamutils-0.2.23 → aiteamutils-0.2.25}/aiteamutils/security.py

@@ -1,6 +1,6 @@
 """보안 관련 유틸리티."""
 from datetime import datetime, timedelta, UTC
-from typing import Dict, Any, Optional, Literal, Callable
+from typing import Dict, Any, Optional, Literal, Callable, Type, Base
 from fastapi import Request, HTTPException, status
 from functools import wraps
 from jose import jwt, JWTError
@@ -262,7 +262,7 @@ async def create_jwt_token(
     user_data: Dict[str, Any],
     token_type: Literal["access", "refresh"],
     db_service: DatabaseService,
-    log_model: Any,
+    log_model: Type[Base],
     request: Optional[Request] = None
 ) -> str:
     """JWT 토큰을 생성하고 로그를 기록합니다.
@@ -271,7 +271,7 @@ async def create_jwt_token(
         user_data: 사용자 데이터 딕셔너리 (username, ulid, name, role_ulid, status, organization 정보 등)
         token_type: 토큰 타입 ("access" 또는 "refresh")
         db_service: 데이터베이스 서비스
-        log_model: 로그 모델
+        log_model: 로그 모델 클래스
         request: FastAPI 요청 객체
         
     Returns:
@@ -293,7 +293,6 @@ async def create_jwt_token(
                 token_type=token_type
             )
         
-        # 토큰 데이터 생성
         if token_type == "access":
             expires_at = datetime.now(UTC) + timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
             token_data = {

aiteamutils-0.2.25/aiteamutils/version.py

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

aiteamutils-0.2.23/aiteamutils/version.py

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

aiteamutils-0.2.23/app/app/auth/service.py

@@ -1,57 +0,0 @@
-async def login(self, username: str, password: str, request: Request = None) -> Dict[str, str]:
-        """사용자 로그인을 처리합니다.
-        
-        Args:
-            username (str): 사용자명
-            password (str): 비밀번호
-            request (Request, optional): FastAPI 요청 객체
-            
-        Returns:
-            Dict[str, str]: 액세스 토큰과 리프레시 토큰
-            
-        Raises:
-            CustomException: 인증 실패 시 예외
-        """
-        # 사용자 조회
-        user = await self.repository.get_user(username, by="username")
-        if not user:
-            raise CustomException(
-                ErrorCode.INVALID_CREDENTIALS,
-                source_function="AuthService.login"
-            )
-        
-        # 비밀번호 검증
-        if not verify_password(password, user.password):
-            raise CustomException(
-                ErrorCode.INVALID_CREDENTIALS,
-                source_function="AuthService.login"
-            )
-        
-        # 토큰 생성
-        user_data = {
-            "username": user.username,
-            "ulid": user.ulid,
-            "email": user.email
-        }
-        
-        access_token = await create_jwt_token(
-            user_data=user_data,
-            token_type="access",
-            db_service=self.db_service,
-            log_model=self.log_model,
-            request=request
-        )
-        
-        refresh_token = await create_jwt_token(
-            user_data=user_data,
-            token_type="refresh",
-            db_service=self.db_service,
-            log_model=self.log_model,
-            request=request
-        )
-        
-        return {
-            "access_token": access_token,
-            "refresh_token": refresh_token,
-            "token_type": "bearer"
-        }