aiteamutils 0.2.75__py3-none-any.whl → 0.2.77__py3-none-any.whl

aiteamutils/base_model.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, TypeVar, Generic, Optional
 from ulid import ULID
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
@@ -24,16 +24,17 @@ class BaseColumn(Base):
         nullable=False
     )
     created_at: Mapped[datetime] = mapped_column(
-        default=datetime.utcnow,
+        default=datetime.now(timezone.utc),
         index=True
     )
     updated_at: Mapped[datetime] = mapped_column(
-        default=datetime.utcnow,
-        onupdate=datetime.utcnow,
+        default=datetime.now(timezone.utc),
+        onupdate=datetime.now(timezone.utc),
         index=True
     )
     deleted_at: Mapped[datetime] = mapped_column(
         default=None,
+        nullable=True
     )
     is_deleted: Mapped[bool] = mapped_column(
         default=False,

aiteamutils/base_repository.py

@@ -39,12 +39,17 @@ class BaseRepository(Generic[ModelType]):
     #######################
     # 입력 및 수정, 삭제 #
     ####################### 
-    async def create(self, entity_data: Dict[str, Any]) -> ModelType:
+    async def create(
+        self,
+        entity_data: Dict[str, Any],
+        exclude_entities: List[str] | None = None
+    ) -> ModelType:
         try:
             return await create_entity(
                 session=self.session,
                 model=self.model,
-                entity_data=entity_data
+                entity_data=entity_data,
+                exclude_entities=exclude_entities
             )
         except CustomException as e:
             raise e

aiteamutils/base_service.py

@@ -46,21 +46,19 @@ class BaseService(Generic[ModelType]):
     ) -> ModelType:
         
         try:
-            # 고유 검사 수행
-            if unique_check:
-                await validate_unique_fields(self.db_session, unique_check, find_value=True)
-            # 외래 키 검사 수행
-            if fk_check:
-                await validate_unique_fields(self.db_session, fk_check, find_value=False)
-            # 비밀번호가 있으면 해시 처리
-            if "password" in entity_data:
-                entity_data["password"] = hash_password(entity_data["password"])
-            # 제외할 엔티티가 있으면 제외
-            if exclude_entities:
-                entity_data = {k: v for k, v in entity_data.items() if k not in exclude_entities}
+            async with self.db_session.begin():
+                # 고유 검사 수행
+                if unique_check:
+                    await validate_unique_fields(self.db_session, unique_check, find_value=True)
+                # 외래 키 검사 수행
+                if fk_check:
+                    await validate_unique_fields(self.db_session, fk_check, find_value=False)
 
-            # repository의 create 메서드를 트랜잭션 내에서 실행
-            return await self.repository.create(entity_data)
+                # repository의 create 메서드를 트랜잭션 내에서 실행
+                return await self.repository.create(
+                    entity_data=entity_data,
+                    exclude_entities=exclude_entities
+                )
         except CustomException as e:
             raise e
         except Exception as e:

aiteamutils/database.py

@@ -23,7 +23,6 @@ from sqlalchemy import MetaData, Table, insert
 #패키지 라이브러리
 from .exceptions import ErrorCode, CustomException
 
-
 ModelType = TypeVar("ModelType", bound=DeclarativeBase)
 
 ##################
@@ -32,8 +31,11 @@ ModelType = TypeVar("ModelType", bound=DeclarativeBase)
 def process_entity_data(
     model: Type[ModelType],
     entity_data: Dict[str, Any],
-    existing_data: Dict[str, Any] = None
+    existing_data: Dict[str, Any] = None,
+    exclude_entities: List[str] | None = None
 ) -> Dict[str, Any]:
+    from .security import hash_password
+
     """
     엔티티 데이터를 전처리하고 모델 속성과 extra_data를 분리합니다.
 
@@ -64,6 +66,9 @@ def process_entity_data(
     if existing_data and "extra_data" in existing_data:
         extra_data = existing_data["extra_data"].copy()
 
+    # 제외할 엔티티가 있으면 제거
+    if exclude_entities:
+        entity_data = {k: v for k, v in entity_data.items() if k not in exclude_entities}
 
     # Swagger 자동 생성 속성 패턴
     swagger_patterns = {"additionalProp1", "additionalProp2", "additionalProp3"}
@@ -73,9 +78,14 @@ def process_entity_data(
         if key in swagger_patterns:
             continue
 
+        # 패스워드 필드 처리
+        if key == "password":
+            value = hash_password(value)  # 비밀번호 암호화
+
         # 모델 속성에 있는 경우 model_data에 추가
         if key in model_attr:
             model_data[key] = value
+
         # 모델 속성에 없는 경우 extra_data에 추가
         else:
             extra_data[key] = value
@@ -237,7 +247,8 @@ def build_conditions(
 async def create_entity(
     session: AsyncSession,
     model: Type[ModelType],
-    entity_data: Dict[str, Any]
+    entity_data: Dict[str, Any],
+    exclude_entities: List[str] | None = None
 ) -> ModelType:
     """
     새로운 엔티티를 데이터베이스에 생성합니다.
@@ -255,9 +266,11 @@ async def create_entity(
     """
     try:
         # 엔티티 데이터 전처리
-        processed_data = process_entity_data(model, entity_data)
-
-        # 외래 키 필드 검증
+        processed_data = process_entity_data(
+            model=model,
+            entity_data=entity_data,
+            exclude_entities=exclude_entities
+        )
         
         # 새로운 엔티티 생성
         entity = model(**processed_data)
@@ -267,7 +280,6 @@ async def create_entity(
         
         # 데이터베이스에 커밋
         await session.flush()
-        await session.commit()
         await session.refresh(entity)
         
         # 생성된 엔티티 반환
@@ -336,7 +348,6 @@ async def update_entity(
 
         # 변경 사항 커밋
         await session.flush()
-        await session.commit()
         await session.refresh(entity)
 
         return entity
@@ -373,7 +384,6 @@ async def delete_entity(
         entity.deleted_at = datetime.now()
 
         await session.flush()
-        await session.commit()
         await session.refresh(entity)
 
     except SQLAlchemyError as e:
@@ -498,33 +508,25 @@ async def get_entity(
 ##################
 async def log_create(
     session: AsyncSession,
-    table_name: str,
+    model: str,
     log_data: Dict[str, Any],
-    request: Request = None
+    request: Optional[Request] = None
 ) -> None:
     try:
-        # ULID 생성
-        if "ulid" not in log_data:
-            log_data["ulid"] = ULID()
-
         # 사용자 에이전트 및 IP 주소 추가
         if request:
             log_data["user_agent"] = request.headers.get("user-agent")
             log_data["ip_address"] = request.headers.get("x-forwarded-for") or request.client.host
 
-        # 동적으로 테이블 로드
-        metadata = MetaData(bind=session.bind)
-        table = Table(table_name, metadata, autoload_with=session.bind)
-
-        # 데이터 삽입
-        insert_stmt = insert(table).values(log_data)
-        await session.execute(insert_stmt)
-        await session.commit()
-
+        await create_entity(
+            session=session,
+            model=model,
+            entity_data=log_data
+        )
     except Exception as e:
         raise CustomException(
             ErrorCode.INTERNAL_ERROR,
-            detail=f"{model.__name__}|{str(e)}",
+            detail=f"{model}|{str(e)}",
             source_function="database.log_create",
             original_error=e
         )

aiteamutils/security.py

@@ -1,5 +1,5 @@
 """보안 관련 유틸리티."""
-from datetime import datetime, timedelta, UTC
+from datetime import datetime, timedelta, timezone
 from typing import Dict, Any, Optional, Literal, Callable, TYPE_CHECKING
 from fastapi import Request, HTTPException, status
 from functools import wraps
@@ -85,7 +85,7 @@ def rate_limit(
                 rate_limit_key = f"rate_limit:{client_ip}:{func.__name__}"
             
             try:
-                now = datetime.now(UTC)
+                now = datetime.now(timezone.utc)
                 
                 # 현재 rate limit 정보 가져오기
                 rate_info = _rate_limits.get(rate_limit_key)
@@ -136,54 +136,54 @@ async def create_jwt_token(
     user_data: Dict[str, Any],
     token_type: Literal["access", "refresh"],
     db_session: AsyncSession,
-    token_settings: Dict[str, str],
-    request: Optional[Request] = None,
+    token_settings: Dict[str, Any],
 ) -> str:
     """JWT 토큰을 생성하고 로그를 기록합니다."""
     try:
         # 토큰 데이터 구성
         if token_type == "access":
-            expires_at = datetime.now(UTC) + timedelta(minutes=token_settings.ACCESS_TOKEN_EXPIRE_MINUTES)
+            expires_at = datetime.now(timezone.utc) + timedelta(minutes=token_settings["ACCESS_TOKEN_EXPIRE_MINUTES"])
+            
             token_data = {
                 # 등록 클레임
-                "iss": token_settings.TOKEN_ISSUER,
-                "sub": user_data["username"],
-                "aud": token_settings.TOKEN_AUDIENCE,
+                "iss": token_settings["TOKEN_ISSUER"],
+                "sub": user_data.username,
+                "aud": token_settings["TOKEN_AUDIENCE"],
                 "exp": expires_at,
                 
                 # 공개 클레임
-                "username": user_data["username"],
-                "name": user_data.get("name"),
+                "username": user_data.username,
+                "name": user_data.name,
                 
                 # 비공개 클레임
-                "user_ulid": user_data["ulid"],
-                "role_ulid": user_data.get("role_ulid"),
-                "status": user_data.get("status"),
-                "last_login": datetime.now(UTC).isoformat(),
+                "user_ulid": user_data.ulid,
+                "role_ulid": user_data.role_ulid,
+                "status": user_data.status,
+                "last_login": datetime.now(timezone.utc).isoformat(),
                 "token_type": token_type,
                 
                 # 조직 관련 클레임
-                "organization_ulid": user_data.get("organization_ulid"),
-                "organization_id": user_data.get("organization_id"),
-                "organization_name": user_data.get("organization_name"),
-                "company_name": user_data.get("company_name")
+                "organization_ulid": user_data.role.organization.ulid,
+                "organization_id": user_data.role.organization.id,
+                "organization_name": user_data.role.organization.name,
+                "company_name": user_data.role.organization.company.name
             }
         else:  # refresh token
-            expires_at = datetime.now(UTC) + timedelta(days=14)
+            expires_at = datetime.now(timezone.utc) + timedelta(days=14)
             token_data = {
-                "iss": token_settings.TOKEN_ISSUER,
-                "sub": user_data["username"],
+                "iss": token_settings["TOKEN_ISSUER"],
+                "sub": user_data.username,
                 "exp": expires_at,
                 "token_type": token_type,
-                "user_ulid": user_data["ulid"]
+                "user_ulid": user_data.ulid
             }
 
         # JWT 토큰 생성
         try:
             token = jwt.encode(
                 token_data,
-                token_settings.JWT_SECRET,
-                algorithm=token_settings.JWT_ALGORITHM
+                token_settings["JWT_SECRET"],
+                algorithm=token_settings["JWT_ALGORITHM"]
             )
         except Exception as e:
             raise CustomException(
@@ -192,26 +192,6 @@ async def create_jwt_token(
                 source_function="security.create_jwt_token",
                 original_error=e
             )
-        
-        # 로그 생성
-        try:
-            log_data = {
-                "type": ActivityType.ACCESS_TOKEN_ISSUED if token_type == "access" else ActivityType.REFRESH_TOKEN_ISSUED,
-                "user_ulid": user_data["ulid"],
-                "token": token
-            }
-
-            # log_create 함수 호출
-            await log_create(
-                session=db_session,
-                table_name="user_logs",
-                log_data=log_data,
-                request=request
-            )
-        except Exception as e:
-            # 로그 생성 실패는 토큰 생성에 영향을 주지 않음
-            logging.error(f"Failed to create token log: {str(e)}")
-        
         return token
         
     except CustomException as e:
@@ -227,19 +207,18 @@ async def create_jwt_token(
 
 async def verify_jwt_token(
     token: str,
-    expected_type: Optional[Literal["access", "refresh"]] = None
+    expected_type: Optional[Literal["access", "refresh"]] = None,
+    token_settings: Dict[str, Any] = None
 ) -> Dict[str, Any]:
     """JWT 토큰을 검증합니다."""
     try:
-        settings = get_settings()
-        
         # 토큰 디코딩
         payload = jwt.decode(
             token,
-            settings.jwt_secret,
-            algorithms=[settings.jwt_algorithm],
-            audience=settings.token_audience,
-            issuer=settings.token_issuer
+            token_settings["JWT_SECRET"],
+            algorithms=[token_settings["JWT_ALGORITHM"]],
+            audience=token_settings["TOKEN_AUDIENCE"],
+            issuer=token_settings["TOKEN_ISSUER"]
         )
         
         # 토큰 타입 검증
@@ -277,14 +256,16 @@ async def verify_jwt_token(
             original_error=e
         )
 
-def validate_token(token: str) -> Dict[str, Any]:
+def validate_token(
+    token: str,
+    token_settings: Dict[str, Any] = None
+) -> Dict[str, Any]:
     """JWT 토큰을 검증하고 페이로드를 반환합니다."""
     try:
-        settings = get_settings()
         payload = jwt.decode(
             token, 
-            settings.jwt_secret, 
-            algorithms=[settings.jwt_algorithm]
+            token_settings["JWT_SECRET"], 
+            algorithms=[token_settings["JWT_ALGORITHM"]]
         )
         return payload
     except JWTError as e:

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.75"
+__version__ = "0.2.77"

{aiteamutils-0.2.75.dist-info → aiteamutils-0.2.77.dist-info}/METADATA

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

aiteamutils-0.2.77.dist-info/RECORD

@@ -0,0 +1,15 @@
+aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
+aiteamutils/base_model.py,sha256=SWifZPzlUGyKAjmV7Uoe7PUhedm215efD7zOay8DhNc,2906
+aiteamutils/base_repository.py,sha256=VLCLLVkNnYLmZ6EMcr3Tu0RkMqDyMhtCO3M_2j6q-R8,4409
+aiteamutils/base_service.py,sha256=GmO_fqrSEbIs_Jc5BoRBTLfaJaS6CIxYPAs4B4TdtaU,9123
+aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
+aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
+aiteamutils/database.py,sha256=zf5Ab5ZFYQBrtvxW9te9RoVsWlMkOpTdmJ8rDwfvINs,19192
+aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
+aiteamutils/exceptions.py,sha256=3FUCIqXgYmMqonnMgUlh-J2xtApiiCgg4WM-2UV4vmQ,15823
+aiteamutils/security.py,sha256=I8X_ABREYHObUZt1xi70v0dTCGUgGCmI6NxieZCN1qo,9648
+aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
+aiteamutils/version.py,sha256=73Vlr-_6fNkFw1Zd12TlIw0hBU7AOnfd-bV9rDxyz3Q,42
+aiteamutils-0.2.77.dist-info/METADATA,sha256=64hwUhsBPM-DwlehLu8fXmUwJOnkRQSKWr05BxUFNxI,1718
+aiteamutils-0.2.77.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.77.dist-info/RECORD,,

aiteamutils-0.2.75.dist-info/RECORD

@@ -1,15 +0,0 @@
-aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
-aiteamutils/base_model.py,sha256=TJiiA7bFhePObPJEzF1Qz4ekPfFoIxKGpe848BBdHLc,2840
-aiteamutils/base_repository.py,sha256=oTZP3mrkqZwAGv8cNqi0tp9wellvTuO6EXN1P1o7zRs,4285
-aiteamutils/base_service.py,sha256=tkGGVN8wrx9dmCVVnRSsoYGPmVD2H7NmEz-PoifIvW0,9300
-aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
-aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=8T8c7RpcPEcBXO-AU_-1UhnTI4RwkPLxWF0eWQYwnME,19080
-aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
-aiteamutils/exceptions.py,sha256=3FUCIqXgYmMqonnMgUlh-J2xtApiiCgg4WM-2UV4vmQ,15823
-aiteamutils/security.py,sha256=7cKY6XhiSEkQJe-XYE2tyYc2u1JLYeXUEjg7AUzEnQY,10277
-aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=FgfB6O4LkLSpldQbG5FG5Fai_x5fo9cg9AQ85w_3RF8,42
-aiteamutils-0.2.75.dist-info/METADATA,sha256=QtxRHW3XcGt5NndEB95Fue80VRGgM54zWbLtssOtkcI,1718
-aiteamutils-0.2.75.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.75.dist-info/RECORD,,