fix: stealth

benchmark.py

@@ -1,4 +1,4 @@
-# benchmark.py (Final Version)
+# benchmark.py (Final Corrected Logic)
 
 import os
 import json
@@ -18,6 +18,7 @@ class MapGuesserBenchmark:
         self.golden_labels = self.load_golden_labels()
         print(f"📊 Loaded {len(self.golden_labels)} golden label samples")
 
+    # ... load_golden_labels, get_model_class, calculate_distance 函数保持不变 ...
     def load_golden_labels(self) -> List[Dict]:
         try:
             with open(DATA_PATHS["golden_labels"], "r") as f:
@@ -47,29 +48,27 @@ class MapGuesserBenchmark:
     def calculate_distance(
         self, true_coords: Dict, predicted_coords: Optional[Tuple[float, float]]
     ) -> Optional[float]:
-        """Calculates distance between true (lat,lon) and predicted (lat,lon)."""
         if not predicted_coords:
             return None
         try:
             true_lat, true_lng = true_coords["lat"], true_coords["lng"]
             pred_lat, pred_lng = predicted_coords
-
             R = 6371
             lat1, lon1, lat2, lon2 = map(
                 math.radians, [true_lat, true_lng, pred_lat, pred_lng]
             )
-            dlat = lat2 - lat1
-            dlon = lon2 - lon1
             a = (
-                math.sin(dlat / 2) ** 2
-                + math.cos(lat1) * math.cos(lat2) * math.sin(dlon / 2) ** 2
+                math.sin((lat2 - lat1) / 2) ** 2
+                + math.cos(lat1)
+                * math.cos(lat2)
+                * math.sin((dlon := lon2 - lon1) / 2) ** 2
             )
             c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
             return R * c
-        except (TypeError, KeyError, IndexError) as e:
-            print(f"Error in distance calculation: {e}")
+        except Exception:
             return None
 
+    # **run_benchmark 保持不变，它只负责管理循环和浏览器生命周期**
     def run_benchmark(
         self,
         models: Optional[List[str]] = None,
@@ -114,7 +113,6 @@ class MapGuesserBenchmark:
                             print(f"   {status} (Distance: {dist_str})")
 
                         except KeyboardInterrupt:
-                            print("\n⏹️  Benchmark inner loop interrupted.")
                             raise
                         except Exception as e:
                             print(f"   ❌ Test failed with unhandled exception: {e}")
@@ -128,16 +126,20 @@ class MapGuesserBenchmark:
                             )
 
             except KeyboardInterrupt:
-                print("\n⏹️  Benchmark outer loop interrupted.")
+                print("\n⏹️  Benchmark outer loop interrupted by user.")
                 break
 
         self.save_results(all_results)
         return self.generate_summary(all_results)
 
+    # **修改**: run_single_test_with_bot 的内部逻辑顺序
     def run_single_test_with_bot(self, bot: GeoBot, location_data: Dict) -> Dict:
+        """Runs a test using an existing GeoBot instance with the correct logic order."""
         start_time = time.time()
 
         assert bot.controller is not None
+
+        # 步骤 1: 加载新地点 (这会刷新页面)
         if not bot.controller.load_location_from_data(location_data):
             return {
                 "success": False,
@@ -146,6 +148,10 @@ class MapGuesserBenchmark:
                 "sample_id": location_data["id"],
             }
 
+        # 步骤 2: **关键修复**: 在新页面加载完成后，重新设置干净的“隐身”环境
+        bot.controller.setup_clean_environment()
+
+        # 步骤 3: 现在，对这个干净的页面进行截图
         screenshot = bot.take_screenshot()
         if not screenshot:
             return {
@@ -155,7 +161,9 @@ class MapGuesserBenchmark:
                 "sample_id": location_data["id"],
             }
 
+        # 步骤 4: AI 分析
         predicted_lat_lon = bot.analyze_image(screenshot)
+
         inference_time = time.time() - start_time
 
         true_coords = location_data["coordinates"]
@@ -173,6 +181,7 @@ class MapGuesserBenchmark:
             "success": is_success,
         }
 
+    # ... save_results 和 generate_summary 函数保持不变 ...
     def save_results(self, results: List[Dict]):
         if not results:
             return
@@ -199,7 +208,6 @@ class MapGuesserBenchmark:
             if model not in by_model:
                 by_model[model] = []
             by_model[model].append(r)
-
         for model, model_results in by_model.items():
             successful_runs = [r for r in model_results if r.get("success")]
             distances = [
@@ -207,10 +215,8 @@ class MapGuesserBenchmark:
                 for r in model_results
                 if r.get("distance_km") is not None
             ]
-
             if not model_results:
                 continue
-
             summary[model] = {
                 "success_rate": len(successful_runs) / len(model_results)
                 if model_results

mapcrunch_controller.py

@@ -53,23 +53,27 @@ class MapCrunchController:
         """
         Forcefully enables stealth mode and hides UI elements for a clean benchmark environment.
         """
+
+    def setup_clean_environment(self):
+        """
+        Forcefully enables FULL stealth mode by directly calling the site's own
+        JavaScript functions, ensuring a clean benchmark environment.
+        """
         try:
-            # 1. 强制开启 Stealth 模式
-            # 这一步确保地址信息被网站自身的逻辑隐藏
-            stealth_checkbox = self.wait.until(
-                EC.presence_of_element_located(
-                    (By.CSS_SELECTOR, SELECTORS["stealth_checkbox"])
-                )
+            assert self.driver is not None
+
+            # 1. 直接调用网站自己的 hideLoc() 函数，这是最核心和最可靠的方法
+            # 它会隐藏地址栏和图像内的街道标签
+            self.driver.execute_script(
+                "if(typeof hideLoc === 'function') { hideLoc(); }"
+            )
+            print(
+                "✅ Stealth mode (in-image labels hidden) forced via JS function call."
             )
-            if not stealth_checkbox.is_selected():
-                # 使用JS点击更可靠，可以避免元素被遮挡的问题
-                self.driver.execute_script("arguments[0].click();", stealth_checkbox)
-                print("✅ Stealth mode programmatically enabled for benchmark.")
 
-            # 2. 用 JS 隐藏其他视觉干扰元素
-            # 这一步确保截图区域干净
+            # 2. 额外隐藏其他我们不想要的UI元素，确保截图绝对干净
             self.driver.execute_script("""
-                const elementsToHide = ['#menu', '#info-box', '#social', '#bottom-box', '#topbar'];
+                const elementsToHide = ['#menu', '#social', '#bottom-box', '#topbar'];
                 elementsToHide.forEach(sel => {
                     const el = document.querySelector(sel);
                     if (el) el.style.display = 'none';
@@ -77,7 +81,7 @@ class MapCrunchController:
                 const panoBox = document.querySelector('#pano-box');
                 if (panoBox) panoBox.style.height = '100vh';
             """)
-            print("✅ Clean UI configured for benchmark.")
+            print("✅ UI elements hidden for clean screenshot.")
 
         except Exception as e:
             print(f"⚠️ Warning: Could not fully configure clean environment: {e}")