aiteamutils 0.2.76__tar.gz → 0.2.78__tar.gz

{aiteamutils-0.2.76 → aiteamutils-0.2.78}/PKG-INFO

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

{aiteamutils-0.2.76 → aiteamutils-0.2.78}/aiteamutils/base_model.py

@@ -24,15 +24,18 @@ class BaseColumn(Base):
         nullable=False
     )
     created_at: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=True),
         default=datetime.now(timezone.utc),
         index=True
     )
     updated_at: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=True),
         default=datetime.now(timezone.utc),
         onupdate=datetime.now(timezone.utc),
         index=True
     )
     deleted_at: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=True),
         default=None,
         nullable=True
     )

{aiteamutils-0.2.76 → aiteamutils-0.2.78}/aiteamutils/database.py

@@ -508,7 +508,7 @@ async def get_entity(
 ##################
 async def log_create(
     session: AsyncSession,
-    model: str,
+    model: Type[ModelType],
     log_data: Dict[str, Any],
     request: Optional[Request] = None
 ) -> None:

{aiteamutils-0.2.76 → aiteamutils-0.2.78}/aiteamutils/security.py

@@ -1,18 +1,19 @@
 """보안 관련 유틸리티."""
 from datetime import datetime, timedelta, timezone
-from typing import Dict, Any, Optional, Literal, Callable, TYPE_CHECKING
+from typing import Dict, Any, Optional, Literal, Callable, TYPE_CHECKING, TypeVar, Type
 from fastapi import Request, HTTPException, status
 from functools import wraps
 from jose import jwt, JWTError
 from passlib.context import CryptContext
 import logging
 from sqlalchemy.ext.asyncio import AsyncSession
-
+from sqlalchemy.orm import DeclarativeBase
 from .exceptions import CustomException, ErrorCode
 from .enums import ActivityType
 from .database import log_create
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+ModelType = TypeVar("ModelType", bound=DeclarativeBase)
 
 # 전역 rate limit 상태 저장
 _rate_limits: Dict[str, Dict[str, Any]] = {}
@@ -133,7 +134,7 @@ def rate_limit(
     return decorator
 
 async def create_jwt_token(
-    user_data: Dict[str, Any],
+    user_data: Type[ModelType],
     token_type: Literal["access", "refresh"],
     db_session: AsyncSession,
     token_settings: Dict[str, Any],
@@ -207,19 +208,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"]
         )
         
         # 토큰 타입 검증
@@ -257,14 +257,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-0.2.78/aiteamutils/version.py

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

aiteamutils-0.2.76/aiteamutils/version.py

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