init

app.py

@@ -12,8 +12,8 @@ from nfsw import NSFWDetector
 TIP_TRY_N = 4      # Show like button tip after 12 tries
 FREE_TRY_N = 10        # Free phase: first 15 tries without restrictions
 SLOW_TRY_N = 15       # Slow phase start: 25 tries
-SLOW2_TRY_N = 25        # Slow phase start: 32 tries
-RATE_LIMIT_60 = 30     # Full restriction: blocked after 40 tries
+SLOW2_TRY_N = 20        # Slow phase start: 32 tries
+RATE_LIMIT_60 = 25     # Full restriction: blocked after 40 tries
 
 # Time window configuration (minutes)
 PHASE_1_WINDOW = 2     # 15-25 tries: 5 minutes
@@ -25,6 +25,72 @@ IP_Dict = {}
 # IP generation statistics and time window tracking
 IP_Generation_Count = {}  # Record total generation count for each IP
 IP_Rate_Limit_Track = {}  # Record generation count and timestamp in current time window for each IP
+IP_Country_Cache = {}  # Cache IP country information to avoid repeated queries
+
+# Restricted countries list (these countries have lower usage limits)
+RESTRICTED_COUNTRIES = ["印度", "巴基斯坦"]
+RESTRICTED_COUNTRY_LIMIT = 5  # Max usage for restricted countries
+
+def query_ip_country(client_ip):
+    """
+    Query IP address country information (only query once per IP)
+    
+    Returns:
+        str: Country name, or None if query fails
+    """
+    # Check cache first - no API call for subsequent visits
+    if client_ip in IP_Country_Cache:
+        cached_country = IP_Country_Cache[client_ip]
+        print(f"💾 IP缓存命中 - IP: {client_ip}, 国家: {cached_country} (无需重复查询)")
+        return cached_country
+    
+    # First time visit - query API
+    print(f"🔍 首次IP访问，开始查询 - IP: {client_ip}")
+    try:
+        import requests
+        api_url = f"https://api.vore.top/api/IPdata?ip={client_ip}"
+        response = requests.get(api_url, timeout=5)
+        
+        if response.status_code == 200:
+            data = response.json()
+            if data.get("code") == 200 and "ipdata" in data:
+                country = data["ipdata"].get("info1", "Unknown")
+                IP_Country_Cache[client_ip] = country
+                print(f"🌍 API查询成功 - IP: {client_ip}, 国家: {country}")
+                return country
+        
+        # Query failed, cache as "Unknown" to avoid repeated queries
+        IP_Country_Cache[client_ip] = "Unknown"
+        print(f"⚠️ API查询失败 - IP: {client_ip}, 状态码: {response.status_code}")
+        return "Unknown"
+        
+    except Exception as e:
+        # Exception occurred, cache as "Unknown"
+        IP_Country_Cache[client_ip] = "Unknown"
+        print(f"⚠️ API查询异常 - IP: {client_ip}, 错误: {str(e)}")
+        return "Unknown"
+
+def is_restricted_country_ip(client_ip):
+    """
+    Check if IP is from a restricted country
+    
+    Returns:
+        bool: True if from restricted country
+    """
+    country = query_ip_country(client_ip)
+    return country in RESTRICTED_COUNTRIES
+
+def get_ip_max_limit(client_ip):
+    """
+    Get max usage limit for IP based on country
+    
+    Returns:
+        int: Max usage limit
+    """
+    if is_restricted_country_ip(client_ip):
+        return RESTRICTED_COUNTRY_LIMIT
+    else:
+        return RATE_LIMIT_60
 
 def get_ip_generation_count(client_ip):
     """
@@ -51,14 +117,29 @@ def get_ip_phase(client_ip):
         str: 'free', 'rate_limit_1', 'rate_limit_2', 'rate_limit_3', 'blocked'
     """
     count = get_ip_generation_count(client_ip)
+    max_limit = get_ip_max_limit(client_ip)
+    
+    # For restricted countries, check if they've reached their limit
+    if is_restricted_country_ip(client_ip):
+        if count >= max_limit:
+            return 'blocked'
+        elif count >= max_limit - 2:  # Last 2 attempts
+            return 'rate_limit_3'
+        elif count >= max_limit - 3:  # 3rd attempt from end
+            return 'rate_limit_2'
+        elif count >= max_limit - 4:  # 4th attempt from end
+            return 'rate_limit_1'
+        else:
+            return 'free'
     
+    # For normal countries, use standard limits
     if count < FREE_TRY_N:
         return 'free'
     elif count < SLOW_TRY_N:
         return 'rate_limit_1'        # NSFW blur + 5 minutes 2 images
     elif count < SLOW2_TRY_N:
         return 'rate_limit_2'        # NSFW blur + 10 minutes 2 images
-    elif count < RATE_LIMIT_60:
+    elif count < max_limit:
         return 'rate_limit_3'        # NSFW blur + 20 minutes 2 images
     else:
         return 'blocked'             # Generation blocked
@@ -239,7 +320,11 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
             '>&#128640; Unlimited Generation</a>
         </div>
         """
-        return None, f"❌ You have reached Hugging Face's free generation limit. Please visit https://omnicreator.net/#generator for unlimited generation", gr.update(value=blocked_button_html, visible=True)
+        
+        # Use same message for all users to avoid discrimination perception
+        blocked_message = f"❌ You have reached Hugging Face's free generation limit. Please visit https://omnicreator.net/#generator for unlimited generation"
+        
+        return None, blocked_message, gr.update(value=blocked_button_html, visible=True)
     
     # Check rate limit (applies to rate_limit phases)
     if current_phase in ['rate_limit_1', 'rate_limit_2', 'rate_limit_3']:
@@ -584,7 +669,11 @@ def local_edit_interface(image_dict, prompt, reference_image, request: gr.Reques
             '>&#128640; Unlimited Generation</a>
         </div>
         """
-        return None, f"❌ You have reached Hugging Face's free generation limit. Please visit https://omnicreator.net/#generator for unlimited generation", gr.update(value=blocked_button_html, visible=True)
+        
+        # Use same message for all users to avoid discrimination perception
+        blocked_message = f"❌ You have reached Hugging Face's free generation limit. Please visit https://omnicreator.net/#generator for unlimited generation"
+        
+        return None, blocked_message, gr.update(value=blocked_button_html, visible=True)
     
     # Check rate limit (applies to rate_limit phases)
     if current_phase in ['rate_limit_1', 'rate_limit_2', 'rate_limit_3']:

util.py

@@ -359,7 +359,7 @@ def check_task_status(task_id):
                         tasks_ahead = queue_info.get('tasks_ahead', 0)
                         current_priority = queue_info.get('current_priority', 0)
                         description = queue_info.get('description', '')
-                        print(f"📊 Queue Status - Tasks ahead: {tasks_ahead}, Priority: {current_priority}, Status: {status}")
+                        # print(f"📊 Queue Status - Tasks ahead: {tasks_ahead}, Priority: {current_priority}, Status: {status}")
                     
                     return status, image_url, task_data
                 else: