init

app.py

@@ -4,7 +4,6 @@ import os
 import shutil
 import tempfile
 import time
-from collections import defaultdict, deque
 from util import process_image_edit, get_country_info_safe, get_location_info_safe, contains_chinese
 from nfsw import NSFWDetector
 
@@ -14,11 +13,38 @@ NSFW_LIMIT = 6        # 限制次数：6次
 
 IP_Dict = {}
 NSFW_Dict = {}  # 记录每个IP的NSFW违规次数
-NSFW_Time_Dict = defaultdict(deque)  # 记录每个IP的NSFW检测时间戳
+NSFW_Time_Dict = {}  # 记录每个IP在特定时间窗口的NSFW检测次数，键格式: "ip_timestamp"
+
+def get_current_time_window():
+    """
+    获取当前的整点时间窗口
+    
+    Returns:
+        tuple: (窗口开始时间戳, 窗口结束时间戳)
+    """
+    current_time = time.time()
+    # 获取当前时间的分钟数
+    current_struct = time.localtime(current_time)
+    current_minute = current_struct.tm_min
+    
+    # 计算当前5分钟时间窗口的开始分钟
+    window_start_minute = (current_minute // NSFW_TIME_WINDOW) * NSFW_TIME_WINDOW
+    
+    # 构建窗口开始时间
+    window_start_struct = time.struct_time((
+        current_struct.tm_year, current_struct.tm_mon, current_struct.tm_mday,
+        current_struct.tm_hour, window_start_minute, 0,
+        current_struct.tm_wday, current_struct.tm_yday, current_struct.tm_isdst
+    ))
+    
+    window_start_time = time.mktime(window_start_struct)
+    window_end_time = window_start_time + (NSFW_TIME_WINDOW * 60)
+    
+    return window_start_time, window_end_time
 
 def check_nsfw_rate_limit(client_ip):
     """
-    检查IP的NSFW检测频率限制
+    检查IP的NSFW检测频率限制（基于整点时间窗口）
     
     Args:
         client_ip (str): 客户端IP地址
@@ -27,36 +53,81 @@ def check_nsfw_rate_limit(client_ip):
         tuple: (是否超过限制, 剩余等待时间)
     """
     current_time = time.time()
-    time_window_start = current_time - (NSFW_TIME_WINDOW * 60)  # 5分钟前的时间戳
+    window_start_time, window_end_time = get_current_time_window()
+    
+    # 清理不在当前时间窗口的记录
+    current_window_key = f"{client_ip}_{int(window_start_time)}"
+    
+    # 如果没有当前窗口的记录，创建新的
+    if current_window_key not in NSFW_Time_Dict:
+        NSFW_Time_Dict[current_window_key] = 0
     
-    # 清理过期的时间戳
-    while NSFW_Time_Dict[client_ip] and NSFW_Time_Dict[client_ip][0] < time_window_start:
-        NSFW_Time_Dict[client_ip].popleft()
+    # 清理旧的窗口记录（保持内存清洁）
+    keys_to_remove = []
+    for key in NSFW_Time_Dict:
+        if key.startswith(client_ip + "_"):
+            window_time = int(key.split("_")[1])
+            if window_time < window_start_time:
+                keys_to_remove.append(key)
     
-    # 检查是否超过限制
-    if len(NSFW_Time_Dict[client_ip]) >= NSFW_LIMIT:
-        # 计算需要等待的时间
-        oldest_timestamp = NSFW_Time_Dict[client_ip][0]
-        wait_time = oldest_timestamp + (NSFW_TIME_WINDOW * 60) - current_time
+    for key in keys_to_remove:
+        del NSFW_Time_Dict[key]
+    
+    # 检查当前窗口是否超过限制
+    if NSFW_Time_Dict[current_window_key] >= NSFW_LIMIT:
+        # 计算到下一个时间窗口的等待时间
+        wait_time = window_end_time - current_time
         return True, max(0, wait_time)
     
     return False, 0
 
 def record_nsfw_detection(client_ip):
     """
-    记录IP的NSFW检测时间
+    记录IP的NSFW检测时间（基于整点时间窗口）
     
     Args:
         client_ip (str): 客户端IP地址
     """
-    current_time = time.time()
-    NSFW_Time_Dict[client_ip].append(current_time)
+    window_start_time, _ = get_current_time_window()
+    current_window_key = f"{client_ip}_{int(window_start_time)}"
+    
+    # 增加当前窗口的计数
+    if current_window_key not in NSFW_Time_Dict:
+        NSFW_Time_Dict[current_window_key] = 0
+    NSFW_Time_Dict[current_window_key] += 1
     
     # 记录到NSFW_Dict中（兼容现有逻辑）
     if client_ip not in NSFW_Dict:
         NSFW_Dict[client_ip] = 0
     NSFW_Dict[client_ip] += 1
 
+def get_current_window_info(client_ip):
+    """
+    获取当前窗口的统计信息（用于调试）
+    
+    Args:
+        client_ip (str): 客户端IP地址
+        
+    Returns:
+        dict: 当前窗口的统计信息
+    """
+    window_start_time, window_end_time = get_current_time_window()
+    current_window_key = f"{client_ip}_{int(window_start_time)}"
+    
+    current_count = NSFW_Time_Dict.get(current_window_key, 0)
+    
+    # 格式化时间显示
+    start_time_str = time.strftime("%H:%M:%S", time.localtime(window_start_time))
+    end_time_str = time.strftime("%H:%M:%S", time.localtime(window_end_time))
+    
+    return {
+        "window_start": start_time_str,
+        "window_end": end_time_str,
+        "current_count": current_count,
+        "limit": NSFW_LIMIT,
+        "window_key": current_window_key
+    }
+
 # 初始化NSFW检测器（从Hugging Face���载）
 try:
     nsfw_detector = NSFWDetector()  # 自动从Hugging Face下载falconsai_yolov9_nsfw_model_quantized.pt
@@ -105,7 +176,7 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
     #         warning_msg = f"您的ip地址为{client_ip}，地点为{prov}-{city}，您的网络服务商为{isp_name}，检测到您目前正在浏览，制作淫秽内容，已经上报给 {city_name}市公安局，已加急处理，请耐心等待警察上门调查"
     #         return None, f"❌ {warning_msg}"
     #     else:
-    #         return None, f"❌ Your ip {client_ip}，your region has been blocked for too much nsfw content"
+    #         return None, f"❌ Your ip {client_ip}, your region has been blocked for too much nsfw content"
     
     if input_image is None:
         return None, "Please upload an image first"
@@ -130,40 +201,21 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
                 is_rate_limited, wait_time = check_nsfw_rate_limit(client_ip)
                 
                 if is_rate_limited:
-                    # 超过频率限制，显示等待提示
+                    # 超过频率限制，显示等待提示并阻止继续
                     wait_minutes = int(wait_time / 60) + 1  # 向上取整到分钟
-                    print(f"⚠️ NSFW频率限制 - IP: {client_ip}({country_info}), 需要等待 {wait_minutes} 分钟")
-                    return None, f"❌ 请等待 {wait_minutes} 分钟后继续生成"
-                
-                # 记录NSFW检测
-                record_nsfw_detection(client_ip)
-                
-                # # 检查是否需要特殊处理（中文prompt或中国IP）
-                # has_chinese = contains_chinese(prompt.strip())
-                # is_china_ip = location_info.get("country", "").lower() == "中国"
-                # if has_chinese or is_china_ip:
-                #     # 构建特殊警告信息
-                #     prov = location_info.get("prov", "未知省份")
-                #     city = location_info.get("city", "未知城市")
-                #     isp = location_info.get("isp", "Unknown")
-                    
-                #     # 处理城市名称
-                #     city_name = city.replace("市", "") if city != "未知城市" else "当地"
-                    
-                #     # 处理ISP名称，去掉"中国"前缀
-                #     isp_name = isp.replace("中国", "") if isp != "Unknown" else "未知"
-                    
-                #     warning_msg = f"您的ip地址为{client_ip}，地点为{prov}-{city}，您的网络服务商为{isp_name}，检测到您目前正在浏览，制作淫秽内容，已经上报给 {city_name}市公安局，已加急处理，请耐心等待警察上门调查"
-                    
-                #     print(f"⚠️ 特殊NSFW警告 - IP: {client_ip}, 位置: {prov}-{city}, ISP: {isp_name}, 中文Prompt: {has_chinese}, 中国IP: {is_china_ip}")
-                #     print(warning_msg)
-                    
-                #     return None, f"❌ {warning_msg}"
-                # else:
-                #     # 常规NSFW提示
-                #     print(f"❌ NSFW image detected - IP: {client_ip}({country_info}), violations: {NSFW_Dict[client_ip]}")
-                #     return None, f"❌ Your ip {client_ip}，your region has been blocked for too much nsfw content"
-                
+                    window_info = get_current_window_info(client_ip)
+                    print(f"⚠️ NSFW频率限制 - IP: {client_ip}({country_info})")
+                    print(f"   时间窗口: {window_info['window_start']} - {window_info['window_end']}")
+                    print(f"   当前计数: {window_info['current_count']}/{NSFW_LIMIT}, 需要等待 {wait_minutes} 分钟")
+                    return None, f"❌ Please wait {wait_minutes} minutes before generating again"
+                else:
+                    # 未超过频率限制，记录此次检测但允许继续处理
+                    record_nsfw_detection(client_ip)
+                    window_info = get_current_window_info(client_ip)
+                    # print(f"🔍 NSFW检测记录 - IP: {client_ip}({country_info})")
+                    # print(f"   时间窗口: {window_info['window_start']} - {window_info['window_end']}")
+                    # print(f"   当前计数: {window_info['current_count']}/{NSFW_LIMIT}, 允许继续处理")
+                    # 不return，允许继续处理图片编辑
                 
         except Exception as e:
             print(f"⚠️ NSFW检测失败: {e}")

util.py

@@ -265,11 +265,11 @@ def submit_image_edit_task(user_image_url, prompt):
             if result.get('code') == 0:
                 return result['data']['task_id'], None
             else:
-                return None, f"API 错误: {result.get('message', '未知错误')}"
+                return None, f"API Error: {result.get('message', 'Unknown error')}"
         else:
-            return None, f"HTTP 错误: {response.status_code}"
+            return None, f"HTTP Error: {response.status_code}"
     except Exception as e:
-        return None, f"请求异常: {str(e)}"
+        return None, f"Request Exception: {str(e)}"
 
 
 def check_task_status(task_id):
@@ -298,11 +298,11 @@ def check_task_status(task_id):
                 task_data = result['data']
                 return task_data['status'], task_data.get('output1'), task_data
             else:
-                return 'error', None, result.get('message', '未知错误')
+                return 'error', None, result.get('message', 'Unknown error')
         else:
-            return 'error', None, f"HTTP 错误: {response.status_code}"
+            return 'error', None, f"HTTP Error: {response.status_code}"
     except Exception as e:
-        return 'error', None, f"请求异常: {str(e)}"
+        return 'error', None, f"Request Exception: {str(e)}"
 
 
 def process_image_edit(img_input, prompt, progress_callback=None):
@@ -369,7 +369,7 @@ def process_image_edit(img_input, prompt, progress_callback=None):
                 if output_url:
                     return output_url, "image edit completed"
                 else:
-                    return None, "任务完成但未返回结果图片"
+                    return None, "Task completed but no result image returned"
             elif status == 'error' or status == 'failed':
                 return None, f"task processing failed: {task_data}"
             elif status in ['queued', 'processing', 'running', 'created', 'working']: