aiteamutils 0.2.33__tar.gz → 0.2.35__tar.gz

{aiteamutils-0.2.33 → aiteamutils-0.2.35}/PKG-INFO

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

{aiteamutils-0.2.33 → aiteamutils-0.2.35}/aiteamutils/security.py

@@ -199,7 +199,7 @@ def rate_limit(
     key_func: Optional[Callable] = None
 ):
     """Rate limiting 데코레이터."""
-    limiter = RateLimiter(max_requests, window_seconds)
+    rate_limits: Dict[str, Dict[str, Any]] = {}
     
     def decorator(func: Callable) -> Callable:
         @wraps(func)
@@ -216,39 +216,56 @@ def rate_limit(
                         request = arg
                         break
             if not request:
-                raise SecurityError(
+                raise CustomException(
                     ErrorCode.INTERNAL_ERROR,
                     detail="Request object not found",
                     source_function="rate_limit"
                 )
             
-            # Rate limit 키 생성
+            # 레이트 리밋 키 생성
             if key_func:
                 rate_limit_key = f"rate_limit:{key_func(request)}"
             else:
                 client_ip = request.client.host
                 rate_limit_key = f"rate_limit:{client_ip}:{func.__name__}"
             
-            try:
-                if not limiter.is_allowed(rate_limit_key):
-                    remaining_time = limiter.get_remaining_time(rate_limit_key)
+            now = datetime.now(UTC)
+            
+            # 현재 rate limit 정보 가져오기
+            rate_info = rate_limits.get(rate_limit_key)
+            
+            if rate_info is None or (now - rate_info["start_time"]).total_seconds() >= window_seconds:
+                # 새로운 rate limit 설정
+                rate_limits[rate_limit_key] = {
+                    "count": 1,
+                    "start_time": now
+                }
+            else:
+                # 기존 rate limit 업데이트
+                if rate_info["count"] >= max_requests:
+                    # rate limit 초과
+                    remaining_seconds = window_seconds - (now - rate_info["start_time"]).total_seconds()
                     raise RateLimitExceeded(
-                        detail=f"Rate limit exceeded. Try again in {int(remaining_time)} seconds",
+                        detail=rate_limit_key,
                         source_function=func.__name__,
-                        remaining_seconds=remaining_time,
+                        remaining_seconds=remaining_seconds,
                         max_requests=max_requests,
                         window_seconds=window_seconds
                     )
-                
+                rate_info["count"] += 1
+            
+            try:
+                # 원래 함수 실행
                 return await func(*args, **kwargs)
-                    
-            except (RateLimitExceeded, SecurityError) as e:
+            except CustomException as e:
+                # CustomException은 그대로 전파
                 raise e
             except Exception as e:
-                raise SecurityError(
+                # 다른 예외는 INTERNAL_ERROR로 래핑
+                raise CustomException(
                     ErrorCode.INTERNAL_ERROR,
                     detail=str(e),
-                    source_function="rate_limit",
+                    source_function=func.__name__,
                     original_error=e
                 )
                 

aiteamutils-0.2.35/aiteamutils/version.py

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

aiteamutils-0.2.33/aiteamutils/version.py

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