init

app.py

@@ -4,7 +4,7 @@ import os
 import shutil
 import tempfile
 import time
-from util import process_image_edit, process_local_image_edit, get_country_info_safe
+from util import process_image_edit, process_local_image_edit
 from nfsw import NSFWDetector
 
 # 配置参数
@@ -149,8 +149,6 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
         IP_Dict[client_ip] = 0
     IP_Dict[client_ip] += 1
 
-    # 获取IP属地信息
-    country_info = get_country_info_safe(client_ip)
     
     if input_image is None:
         return None, "Please upload an image first"
@@ -170,7 +168,7 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
             nsfw_result = nsfw_detector.predict_pil_label_only(input_image)
             
             if nsfw_result.lower() == "nsfw":
-                print(f"🔍 NSFW检测结果: ❌❌❌ {nsfw_result} - IP: {client_ip}({country_info})")
+                print(f"🔍 NSFW检测结果: ❌❌❌ {nsfw_result} - IP: {client_ip}")
                 # 检查NSFW频率限制
                 is_rate_limited, wait_time = check_nsfw_rate_limit(client_ip)
                 
@@ -178,7 +176,7 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
                     # 超过频率限制，显示等待提示并阻止继续
                     wait_minutes = int(wait_time / 60) + 1  # 向上取整到分钟
                     window_info = get_current_window_info(client_ip)
-                    print(f"⚠️ NSFW频率限制 - IP: {client_ip}({country_info})")
+                    print(f"⚠️ NSFW频率限制 - IP: {client_ip}")
                     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"
@@ -187,15 +185,12 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
                     record_nsfw_detection(client_ip)
                     window_info = get_current_window_info(client_ip)
             else:
-                print(f"🔍 NSFW检测结果: ✅✅✅ {nsfw_result} - IP: {client_ip}({country_info})")
+                print(f"🔍 NSFW检测结果: ✅✅✅ {nsfw_result} - IP: {client_ip}")
                 
         except Exception as e:
             print(f"⚠️ NSFW检测失败: {e}")
             # 检测失败时允许继续处理
     
-    if IP_Dict[client_ip]>10 and country_info.lower() in ["印度", "巴基斯坦"]:
-        print(f"❌ Content not allowed - IP: {client_ip}({country_info}), count: {IP_Dict[client_ip]}, prompt: {prompt.strip()}")
-        return None, "❌ Content not allowed. Please modify your prompt"
 
     result_url = None
     status_message = ""
@@ -207,17 +202,17 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
     
     try:
         # 打印成功访问的信息
-        print(f"✅ Processing started - IP: {client_ip}({country_info}), count: {IP_Dict[client_ip]}, prompt: {prompt.strip()}", flush=True)
+        print(f"✅ Processing started - IP: {client_ip}, count: {IP_Dict[client_ip]}, prompt: {prompt.strip()}", flush=True)
         
         # Call image editing processing function
         result_url, message = process_image_edit(input_image, prompt.strip(), progress_callback)
         
         if result_url:
-            print(f"✅ Processing completed successfully - IP: {client_ip}({country_info}), result_url: {result_url}", flush=True)
+            print(f"✅ Processing completed successfully - IP: {client_ip}, result_url: {result_url}", flush=True)
             progress(1.0, desc="Processing completed")
             return result_url, "✅ " + message
         else:
-            print(f"❌ Processing failed - IP: {client_ip}({country_info}), error: {message}", flush=True)
+            print(f"❌ Processing failed - IP: {client_ip}, error: {message}", flush=True)
             return None, "❌ " + message
             
     except Exception as e:
@@ -252,7 +247,12 @@ def use_local_output_as_input(output_image):
     if output_image is not None:
         # 对于局部编辑，我们需要创建一个新的ImageEditor格式
         # 将输出图片作为背景，不包含任何编辑层
-        return {"background": output_image, "layers": []}, output_image
+        editor_data = {
+            "background": output_image, 
+            "layers": [],
+            "composite": output_image  # 添加composite键以避免KeyError
+        }
+        return editor_data, output_image
     return None, None
 
 def load_global_input_from_state(state_image):
@@ -276,8 +276,6 @@ def local_edit_interface(image_dict, prompt, request: gr.Request, progress=gr.Pr
         IP_Dict[client_ip] = 0
     IP_Dict[client_ip] += 1
 
-    # 获取IP属地信息
-    country_info = get_country_info_safe(client_ip)
     
     if image_dict is None:
         return None, "Please upload an image and draw the area to edit"
@@ -306,14 +304,14 @@ def local_edit_interface(image_dict, prompt, request: gr.Request, progress=gr.Pr
             nsfw_result = nsfw_detector.predict_pil_label_only(base_image)
             
             if nsfw_result.lower() == "nsfw":
-                print(f"🔍 NSFW检测结果: ❌❌❌ {nsfw_result} - IP: {client_ip}({country_info})")
+                print(f"🔍 NSFW检测结果: ❌❌❌ {nsfw_result} - IP: {client_ip}")
                 # 检查NSFW频率限制
                 is_rate_limited, wait_time = check_nsfw_rate_limit(client_ip)
                 
                 if is_rate_limited:
                     wait_minutes = int(wait_time / 60) + 1
                     window_info = get_current_window_info(client_ip)
-                    print(f"⚠️ NSFW频率限制 - IP: {client_ip}({country_info})")
+                    print(f"⚠️ NSFW频率限制 - IP: {client_ip}")
                     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"
@@ -321,15 +319,12 @@ def local_edit_interface(image_dict, prompt, request: gr.Request, progress=gr.Pr
                     record_nsfw_detection(client_ip)
                     window_info = get_current_window_info(client_ip)
             else:
-                print(f"🔍 NSFW检测结果: ✅✅✅ {nsfw_result} - IP: {client_ip}({country_info})")
+                print(f"🔍 NSFW检测结果: ✅✅✅ {nsfw_result} - IP: {client_ip}")
                 
         except Exception as e:
             print(f"⚠️ NSFW检测失败: {e}")
     
     # IP访问限制检查
-    if IP_Dict[client_ip]>10 and country_info.lower() in ["印度", "巴基斯坦"]:
-        print(f"❌ Content not allowed - IP: {client_ip}({country_info}), count: {IP_Dict[client_ip]}, prompt: {prompt.strip()}")
-        return None, "❌ Content not allowed. Please modify your prompt"
 
     result_url = None
     status_message = ""
@@ -340,17 +335,17 @@ def local_edit_interface(image_dict, prompt, request: gr.Request, progress=gr.Pr
         progress(0.5, desc=message)
     
     try:
-        print(f"✅ Local editing started - IP: {client_ip}({country_info}), count: {IP_Dict[client_ip]}, prompt: {prompt.strip()}", flush=True)
+        print(f"✅ Local editing started - IP: {client_ip}, count: {IP_Dict[client_ip]}, prompt: {prompt.strip()}", flush=True)
         
         # 调用局部图像编辑处理函数
         result_url, message = process_local_image_edit(base_image, layers, prompt.strip(), progress_callback)
         
         if result_url:
-            print(f"✅ Local editing completed successfully - IP: {client_ip}({country_info}), result_url: {result_url}", flush=True)
+            print(f"✅ Local editing completed successfully - IP: {client_ip}, result_url: {result_url}", flush=True)
             progress(1.0, desc="Processing completed")
             return result_url, "✅ " + message
         else:
-            print(f"❌ Local editing processing failed - IP: {client_ip}({country_info}), error: {message}", flush=True)
+            print(f"❌ Local editing processing failed - IP: {client_ip}, error: {message}", flush=True)
             return None, "❌ " + message
             
     except Exception as e:

util.py

@@ -140,43 +140,6 @@ def upload_user_img_r2(clientIp, timeId, img):
     return res
 
 
-@func_timeout.func_set_timeout(10)
-def get_country_info(ip):
-    """Get country information for IP address"""
-    try:
-        # Use the new API URL
-        url = f"https://qifu-api.baidubce.com/ip/geo/v1/district?ip={ip}"
-        ret = requests.get(url)
-        ret.raise_for_status()  # Raises exception if request fails (e.g. 404, 500)
-        
-        json_data = ret.json()
-        
-        # Based on new JSON structure, country info is under 'data' -> 'country' path
-        if json_data.get("code") == "Success":
-            country = json_data.get("data", {}).get("country")
-            return country if country else "Unknown"
-        else:
-            # Handle API error codes
-            print(f"API request failed: {json_data.get('msg', 'Unknown error')}")
-            return "Unknown"
-            
-    except requests.exceptions.RequestException as e:
-        print(f"Network request failed: {e}")
-        return "Unknown"
-    except Exception as e:
-        print(f"Failed to get IP location: {e}")
-        return "Unknown"
-
-def get_country_info_safe(ip):
-    """Safely get IP location info, returns Unknown on error"""
-    try:
-        return get_country_info(ip)
-    except func_timeout.FunctionTimedOut:
-        print(f"IP location request timeout: {ip}")
-        return "Unknown"
-    except Exception as e:
-        print(f"Failed to get IP location: {e}")
-        return "Unknown"
 
 def create_mask_from_layers(base_image, layers):
     """