aiteamutils 0.2.76__py3-none-any.whl → 0.2.78__py3-none-any.whl

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

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

{aiteamutils-0.2.76.dist-info → aiteamutils-0.2.78.dist-info}/METADATA

@@ -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.dist-info → aiteamutils-0.2.78.dist-info}/RECORD

@@ -1,15 +1,15 @@
 aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
-aiteamutils/base_model.py,sha256=SWifZPzlUGyKAjmV7Uoe7PUhedm215efD7zOay8DhNc,2906
+aiteamutils/base_model.py,sha256=bnRJJaGXGS3TKxfCWWV3arFjdG0qLsPFDXuguYsDyVM,3008
 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/database.py,sha256=Q2rwVfhS8Rpnj89EwtcLtmsDpANkJ1AlprlqQsgIQAg,19204
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=3FUCIqXgYmMqonnMgUlh-J2xtApiiCgg4WM-2UV4vmQ,15823
-aiteamutils/security.py,sha256=xjuSTwn3_DeLHqUb17GwDU58nH7wDyk_7Wq8CPskXo8,9579
+aiteamutils/security.py,sha256=6rpRLh1mY6R1t-Ij0q5jTp6zl33ClqQsH8BFu8T4_EY,9762
 aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=sAzd6RPEDU8drCBs0LCLhJkj0zQgL2FdPYnX-PVpUrs,42
-aiteamutils-0.2.76.dist-info/METADATA,sha256=EVxAPwXRwIYNWzHV8ekVUIKXKlyY_RogJn1wWK5fE58,1718
-aiteamutils-0.2.76.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.76.dist-info/RECORD,,
+aiteamutils/version.py,sha256=4hreD0PLKNdhKwNzr6cbGFmIvKZ63UUY7PvxlEaJsQU,42
+aiteamutils-0.2.78.dist-info/METADATA,sha256=1VCxA1hJpW0i-L8CY4Jv5bVRMboL3pkhxUAc2o4SjtE,1718
+aiteamutils-0.2.78.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.78.dist-info/RECORD,,