init

app.py

@@ -16,7 +16,7 @@ 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
+PHASE_1_WINDOW = 3     # 15-25 tries: 5 minutes
 PHASE_2_WINDOW = 10    # 25-32 tries: 10 minutes
 PHASE_3_WINDOW = 20    # 32-40 tries: 20 minutes
 MAX_IMAGES_PER_WINDOW = 2  # Max images per time window
@@ -27,25 +27,27 @@ 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
 
+# Country usage statistics
+Country_Usage_Stats = {}  # Track usage count by country
+Total_Request_Count = 0  # Total request counter for periodic printing
+PRINT_STATS_INTERVAL = 10  # Print stats every N requests
+
 # 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)
+    Query IP address geo information (only query once per IP)
     
     Returns:
-        str: Country name, or None if query fails
+        dict: {"country": str, "region": str, "city": str}
     """
     # 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
+        return IP_Country_Cache[client_ip]
     
-    # First time visit - query API
-    print(f"🔍 首次IP访问，开始查询 - IP: {client_ip}")
+    # First time visit - query API (silent query)
     try:
         import requests
         api_url = f"https://api.vore.top/api/IPdata?ip={client_ip}"
@@ -54,21 +56,25 @@ def query_ip_country(client_ip):
         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
+                ipdata = data["ipdata"]
+                geo_info = {
+                    "country": ipdata.get("info1", "Unknown"),
+                    "region": ipdata.get("info2", "Unknown"),
+                    "city": ipdata.get("info3", "Unknown")
+                }
+                IP_Country_Cache[client_ip] = geo_info
+                return geo_info
         
-        # 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"
+        # Query failed, cache as default
+        default_geo = {"country": "Unknown", "region": "Unknown", "city": "Unknown"}
+        IP_Country_Cache[client_ip] = default_geo
+        return default_geo
         
     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"
+        # Exception occurred, cache as default
+        default_geo = {"country": "Unknown", "region": "Unknown", "city": "Unknown"}
+        IP_Country_Cache[client_ip] = default_geo
+        return default_geo
 
 def is_restricted_country_ip(client_ip):
     """
@@ -77,7 +83,8 @@ def is_restricted_country_ip(client_ip):
     Returns:
         bool: True if from restricted country
     """
-    country = query_ip_country(client_ip)
+    geo_info = query_ip_country(client_ip)
+    country = geo_info["country"]
     return country in RESTRICTED_COUNTRIES
 
 def get_ip_max_limit(client_ip):
@@ -196,6 +203,39 @@ def check_rate_limit_for_phase(client_ip, phase):
     
     return False, 0, track_data['count']
 
+def update_country_stats(client_ip):
+    """
+    Update country usage statistics and print periodically
+    """
+    global Total_Request_Count, Country_Usage_Stats
+    
+    # Get country info
+    geo_info = IP_Country_Cache.get(client_ip, {"country": "Unknown", "region": "Unknown", "city": "Unknown"})
+    country = geo_info["country"]
+    
+    # Update country stats
+    if country not in Country_Usage_Stats:
+        Country_Usage_Stats[country] = 0
+    Country_Usage_Stats[country] += 1
+    
+    # Increment total request counter
+    Total_Request_Count += 1
+    
+    # Print stats every N requests
+    if Total_Request_Count % PRINT_STATS_INTERVAL == 0:
+        print("\n" + "="*60)
+        print(f"📊 国家使用统计 (总请求数: {Total_Request_Count})")
+        print("="*60)
+        
+        # Sort by usage count (descending)
+        sorted_stats = sorted(Country_Usage_Stats.items(), key=lambda x: x[1], reverse=True)
+        
+        for country_name, count in sorted_stats:
+            percentage = (count / Total_Request_Count) * 100
+            print(f"  {country_name}: {count} 次 ({percentage:.1f}%)")
+        
+        print("="*60 + "\n")
+
 def record_generation_attempt(client_ip, phase):
     """
     Record generation attempt
@@ -203,6 +243,9 @@ def record_generation_attempt(client_ip, phase):
     # Increment total count
     increment_ip_generation_count(client_ip)
     
+    # Update country statistics
+    update_country_stats(client_ip)
+    
     # Record time window count
     if phase in ['rate_limit_1', 'rate_limit_2', 'rate_limit_3']:
         window_key = f"{client_ip}_{phase}"
@@ -290,8 +333,9 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
     # Get user current phase
     current_phase = get_ip_phase(client_ip)
     current_count = get_ip_generation_count(client_ip)
+    geo_info = IP_Country_Cache.get(client_ip, {"country": "Unknown", "region": "Unknown", "city": "Unknown"})
     
-    print(f"📊 User phase info - IP: {client_ip}, current phase: {current_phase}, generation count: {current_count}")
+    print(f"📊 User phase info - IP: {client_ip}, Location: {geo_info['country']}/{geo_info['region']}/{geo_info['city']}, Phase: {current_phase}, Count: {current_count}")
     
     # Check if user reached the like button tip threshold  
     show_like_tip = (current_count >= TIP_TRY_N)
@@ -639,8 +683,9 @@ def local_edit_interface(image_dict, prompt, reference_image, request: gr.Reques
     # Get user current phase
     current_phase = get_ip_phase(client_ip)
     current_count = get_ip_generation_count(client_ip)
+    geo_info = IP_Country_Cache.get(client_ip, {"country": "Unknown", "region": "Unknown", "city": "Unknown"})
     
-    print(f"📊 Local edit user phase info - IP: {client_ip}, current phase: {current_phase}, generation count: {current_count}")
+    print(f"📊 Local edit user phase info - IP: {client_ip}, Location: {geo_info['country']}/{geo_info['region']}/{geo_info['city']}, Phase: {current_phase}, Count: {current_count}")
     
     # Check if user reached the like button tip threshold  
     show_like_tip = (current_count >= TIP_TRY_N)