normalize validator worker path comparisons

Author: zouyonghe

scripts/validate_plugins/run.py

@@ -282,6 +282,11 @@ def build_worker_sys_path(*, astrbot_root: Path, astrbot_path: Path) -> list[str
     return [str(astrbot_root.resolve()), str(astrbot_path.resolve())]
 
 
+def normalize_path_for_comparison(path: str | os.PathLike[str]) -> str:
+    path_str = os.fspath(path)
+    return os.path.normcase(os.path.realpath(os.path.abspath(os.path.expanduser(path_str))))
+
+
 def configure_worker_install_target(*, temp_root: Path) -> Path:
     """Configure process-global install/import state for a validator worker.
 
@@ -292,16 +297,19 @@ def configure_worker_install_target(*, temp_root: Path) -> Path:
     site_packages = (temp_root / "site-packages").resolve()
     site_packages.mkdir(parents=True, exist_ok=True)
     site_packages_str = str(site_packages)
+    site_packages_key = normalize_path_for_comparison(site_packages_str)
 
     os.environ["PIP_TARGET"] = site_packages_str
     existing_pythonpath = [
         entry
         for entry in os.environ.get("PYTHONPATH", "").split(os.pathsep)
-        if entry and entry != site_packages_str
+        if entry and normalize_path_for_comparison(entry) != site_packages_key
     ]
     os.environ["PYTHONPATH"] = os.pathsep.join([site_packages_str, *existing_pythonpath])
 
-    sys.path[:] = [entry for entry in sys.path if entry != site_packages_str]
+    sys.path[:] = [
+        entry for entry in sys.path if normalize_path_for_comparison(entry) != site_packages_key
+    ]
     sys.path.insert(0, site_packages_str)
     return site_packages
 

tests/test_validate_plugins.py

@@ -781,26 +781,34 @@ def test_configure_worker_install_target_deduplicates_process_paths(self):
         with tempfile.TemporaryDirectory() as tmp_dir:
             temp_root = Path(tmp_dir)
             site_packages = (temp_root / "site-packages").resolve()
+            site_packages_alias = os.path.join(str(site_packages.parent), ".", site_packages.name)
             extra_path = (temp_root / "extra-path").resolve()
             extra_path.mkdir()
             observed = {}
 
-            sys.path[:0] = [str(site_packages), str(site_packages)]
+            sys.path[:0] = [str(site_packages), site_packages_alias]
             with mock.patch.dict(
                 os.environ,
-                {"PYTHONPATH": os.pathsep.join([str(site_packages), str(extra_path)])},
+                {"PYTHONPATH": os.pathsep.join([site_packages_alias, str(extra_path)])},
                 clear=True,
             ):
                 module.configure_worker_install_target(temp_root=temp_root)
                 module.configure_worker_install_target(temp_root=temp_root)
 
                 observed["pip_target"] = os.environ["PIP_TARGET"]
                 observed["pythonpath_entries"] = os.environ["PYTHONPATH"].split(os.pathsep)
-                observed["sys_path_count"] = sys.path.count(str(site_packages))
+                observed["resolved_pythonpath_count"] = sum(
+                    1
+                    for entry in observed["pythonpath_entries"]
+                    if Path(entry).resolve() == site_packages
+                )
+                observed["resolved_sys_path_count"] = sum(
+                    1 for entry in sys.path if Path(entry).resolve() == site_packages
+                )
 
             self.assertEqual(observed["pip_target"], str(site_packages))
-            self.assertEqual(observed["pythonpath_entries"].count(str(site_packages)), 1)
-            self.assertEqual(observed["sys_path_count"], 1)
+            self.assertEqual(observed["resolved_pythonpath_count"], 1)
+            self.assertEqual(observed["resolved_sys_path_count"], 1)
             self.assertIn(str(extra_path), observed["pythonpath_entries"])
 
         sys.path[:] = original_sys_path