aiteamutils 0.2.38__tar.gz → 0.2.39__tar.gz

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: aiteamutils
3
- Version: 0.2.38
3
+ Version: 0.2.39
4
4
  Summary: AI Team Utilities
5
5
  Project-URL: Homepage, https://github.com/yourusername/aiteamutils
6
6
  Project-URL: Issues, https://github.com/yourusername/aiteamutils/issues
@@ -3,6 +3,7 @@ from fastapi import Depends, status
3
3
  from fastapi.security import OAuth2PasswordBearer
4
4
  from jose import JWTError, jwt
5
5
  from sqlalchemy.ext.asyncio import AsyncSession
6
+ import logging
6
7
 
7
8
  from .database import DatabaseService, get_database_service, get_db
8
9
  from .exceptions import CustomException, ErrorCode
@@ -12,10 +13,12 @@ class ServiceRegistry:
12
13
  """서비스 레지스트리를 관리하는 클래스"""
13
14
  def __init__(self):
14
15
  self._services: Dict[str, Tuple[Type, Type]] = {}
16
+ self._initialized = False
15
17
 
16
18
  def clear(self):
17
19
  """등록된 모든 서비스를 초기화합니다."""
18
20
  self._services.clear()
21
+ self._initialized = False
19
22
 
20
23
  def register(self, name: str, repository_class: Type, service_class: Type):
21
24
  """서비스를 레지스트리에 등록
@@ -28,13 +31,28 @@ class ServiceRegistry:
28
31
  Raises:
29
32
  CustomException: 이미 등록된 서비스인 경우
30
33
  """
31
- if name in self._services:
34
+ try:
35
+ if name in self._services:
36
+ logging.warning(f"Service '{name}' is already registered. Skipping...")
37
+ return
38
+
39
+ if not repository_class or not service_class:
40
+ raise CustomException(
41
+ ErrorCode.INTERNAL_ERROR,
42
+ detail=f"Invalid service classes for '{name}'",
43
+ source_function="ServiceRegistry.register"
44
+ )
45
+
46
+ self._services[name] = (repository_class, service_class)
47
+ logging.info(f"Service '{name}' registered successfully")
48
+
49
+ except Exception as e:
32
50
  raise CustomException(
33
51
  ErrorCode.INTERNAL_ERROR,
34
- detail=f"service|{name}",
35
- source_function="ServiceRegistry.register"
52
+ detail=f"Failed to register service '{name}': {str(e)}",
53
+ source_function="ServiceRegistry.register",
54
+ original_error=e
36
55
  )
37
- self._services[name] = (repository_class, service_class)
38
56
 
39
57
  def get(self, name: str) -> Tuple[Type, Type]:
40
58
  """등록된 서비스를 조회
@@ -50,11 +68,19 @@ class ServiceRegistry:
50
68
  """
51
69
  if name not in self._services:
52
70
  raise CustomException(
53
- ErrorCode.NOT_FOUND,
54
- detail=f"service|{name}",
71
+ ErrorCode.SERVICE_NOT_REGISTERED,
72
+ detail=f"Service '{name}' is not registered",
55
73
  source_function="ServiceRegistry.get"
56
74
  )
57
75
  return self._services[name]
76
+
77
+ def is_initialized(self) -> bool:
78
+ """서비스 레지스트리 초기화 여부를 반환합니다."""
79
+ return self._initialized
80
+
81
+ def set_initialized(self):
82
+ """서비스 레지스트리를 초기화 상태로 설정합니다."""
83
+ self._initialized = True
58
84
 
59
85
  # ServiceRegistry 초기화
60
86
  service_registry = ServiceRegistry()
@@ -73,13 +99,35 @@ def get_service(name: str):
73
99
  """
74
100
  def _get_service(db_service: DatabaseService = Depends(get_database_service)):
75
101
  try:
76
- repository_class, service_class = service_registry.get(name)
77
- repository = repository_class(db_service)
78
- return service_class(repository)
102
+ # 서비스 레지스트리에서 클래스 조회
103
+ try:
104
+ repository_class, service_class = service_registry.get(name)
105
+ except CustomException as e:
106
+ raise CustomException(
107
+ ErrorCode.SERVICE_NOT_REGISTERED,
108
+ detail=f"Service '{name}' is not registered",
109
+ source_function="dependencies.get_service",
110
+ original_error=e
111
+ )
112
+
113
+ # 서비스 인스턴스 생성
114
+ try:
115
+ repository = repository_class(db_service)
116
+ return service_class(repository)
117
+ except Exception as e:
118
+ raise CustomException(
119
+ ErrorCode.INTERNAL_ERROR,
120
+ detail=f"Failed to create service instance for '{name}': {str(e)}",
121
+ source_function="dependencies.get_service",
122
+ original_error=e
123
+ )
124
+
125
+ except CustomException as e:
126
+ raise e
79
127
  except Exception as e:
80
128
  raise CustomException(
81
- ErrorCode.SERVICE_NOT_REGISTERED,
82
- detail=f"Failed to create service {name}: {str(e)}",
129
+ ErrorCode.INTERNAL_ERROR,
130
+ detail=f"Unexpected error while creating service '{name}': {str(e)}",
83
131
  source_function="dependencies.get_service",
84
132
  original_error=e
85
133
  )
@@ -1,6 +1,6 @@
1
1
  """예외 처리 모듈."""
2
2
  import logging
3
- from enum import Enum
3
+ from enum import Enum, IntEnum
4
4
  from typing import Dict, Any, Optional, Tuple, List
5
5
  from fastapi import Request
6
6
  from fastapi.responses import JSONResponse
@@ -69,6 +69,7 @@ class ErrorCode(Enum):
69
69
  NOT_FOUND = ErrorResponse(5001, "GENERAL_NOT_FOUND", 404, "리소스를 찾을 수 없습니다")
70
70
  INTERNAL_ERROR = ErrorResponse(5002, "GENERAL_INTERNAL_ERROR", 500, "내부 서버 오류")
71
71
  SERVICE_UNAVAILABLE = ErrorResponse(5003, "GENERAL_SERVICE_UNAVAILABLE", 503, "서비스를 사용할 수 없습니다")
72
+ SERVICE_NOT_REGISTERED = ErrorResponse(5003, "GENERAL_SERVICE_UNAVAILABLE", 503, "서비스를 사용할 수 없습니다")
72
73
 
73
74
  class CustomException(Exception):
74
75
  """사용자 정의 예외 클래스"""
@@ -0,0 +1,2 @@
1
+ """버전 정보"""
2
+ __version__ = "0.2.39"
@@ -0,0 +1,54 @@
1
+ async def startup_event() -> None:
2
+ """Application startup event handler."""
3
+ try:
4
+ # 1. 설정 및 DB 초기화
5
+ init_settings(
6
+ jwt_secret=settings.JWT_SECRET,
7
+ jwt_algorithm=settings.JWT_ALGORITHM,
8
+ db_url=settings.CORE_DB_URL,
9
+ db_echo=settings.DB_ECHO,
10
+ db_pool_size=settings.DB_POOL_SIZE,
11
+ db_max_overflow=settings.DB_MAX_OVERFLOW,
12
+ db_pool_timeout=settings.DB_POOL_TIMEOUT,
13
+ db_pool_recycle=settings.DB_POOL_RECYCLE
14
+ )
15
+ db_service = get_database_service()
16
+
17
+ if not db_service or not db_service.engine:
18
+ raise RuntimeError("데이터베이스 서비스 초기화 실패")
19
+
20
+ # 2. DB 연결 테스트
21
+ async with db_service.engine.begin() as conn:
22
+ await conn.run_sync(lambda _: None)
23
+ logging.info("데이터베이스 연결 성공")
24
+
25
+ # 3. 테이블 생성
26
+ async with db_service.engine.begin() as conn:
27
+ await conn.run_sync(Base.metadata.create_all)
28
+ logging.info("데이터베이스 테이블 생성 완료")
29
+
30
+ # 4. 서비스 등록
31
+ register_services()
32
+ service_registry.set_initialized() # 서비스 등록 완료 표시
33
+
34
+ logging.info("서비스 등록 완료")
35
+
36
+ except Exception as e:
37
+ logging.error(f"애플리케이션 시작 실패: {str(e)}")
38
+ raise RuntimeError(f"애플리케이션 시작 실패: {str(e)}")
39
+
40
+ async def shutdown_event() -> None:
41
+ """Application shutdown event handler."""
42
+ try:
43
+ # 1. 서비스 레지스트리 초기화
44
+ service_registry.clear()
45
+ logging.info("서비스 레지스트리 초기화 완료")
46
+
47
+ # 2. 데이터베이스 연결 종료
48
+ db_service = get_database_service()
49
+ if db_service and db_service.engine:
50
+ await db_service.engine.dispose()
51
+ logging.info("데이터베이스 연결 종료")
52
+ except Exception as e:
53
+ logging.error(f"애플리케이션 종료 중 오류 발생: {str(e)}")
54
+ raise
@@ -1,2 +0,0 @@
1
- """버전 정보"""
2
- __version__ = "0.2.38"
File without changes
File without changes
File without changes
File without changes