aiteamutils 0.2.33__py3-none-any.whl → 0.2.35__py3-none-any.whl

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

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

{aiteamutils-0.2.33.dist-info → aiteamutils-0.2.35.dist-info}/METADATA

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

@@ -8,9 +8,9 @@ aiteamutils/database.py,sha256=CaH73g8PPNcmLCz4Xr0DBtNSrLcpRlyt0F1zO5Tigfo,33811
 aiteamutils/dependencies.py,sha256=GgN8sFM7qGNmOfpLaFrhuHOgPlBVXWrEgxv29jxjEgI,4226
 aiteamutils/enums.py,sha256=ipZi6k_QD5-3QV7Yzv7bnL0MjDz-vqfO9I5L77biMKs,632
 aiteamutils/exceptions.py,sha256=YV-ISya4wQlHk4twvGo16I5r8h22-tXpn9wa-b3WwDM,15231
-aiteamutils/security.py,sha256=nqAyypyiZ26s-eKv7c6YPDTK6HcqimFnoCr12Wtg1DY,14449
+aiteamutils/security.py,sha256=NHiX0rIznYqMVqSIDFj1u2qjsJb6YFgC0GMjzVjnbWk,15135
 aiteamutils/validators.py,sha256=3N245cZFjgwtW_KzjESkizx5BBUDaJLbbxfNO4WOFZ0,7764
-aiteamutils/version.py,sha256=0u62c8uMhBIqtJ4INrTiDbrTgFVL2CBQ_nfjWnhrldU,42
-aiteamutils-0.2.33.dist-info/METADATA,sha256=DUbbkj6hQ_0C7ODwi8AuQJ1W1BYAMF8_45epV7wl27I,1718
-aiteamutils-0.2.33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.33.dist-info/RECORD,,
+aiteamutils/version.py,sha256=EyMFvZmBz50dmEyx34X_kMisbtOwF13_QxQIOzXl_7Y,42
+aiteamutils-0.2.35.dist-info/METADATA,sha256=jBx915Rd5tLYozslQYlNhhLzzXYtuy9TtCRrwq7jM6U,1718
+aiteamutils-0.2.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.35.dist-info/RECORD,,