Fix virtualenv package overrides for system markers

Author: LauraGPT

xinference/core/tests/test_utils.py

@@ -16,6 +16,7 @@
     build_replica_model_uid,
     build_subpool_envs_for_virtual_env,
     iter_replica_model_uid,
+    merge_virtual_env_packages,
     parse_replica_model_uid,
 )
 from ..virtual_env_manager import (
@@ -85,6 +86,25 @@ def test_get_xllamacpp_cuda_index_url():
     assert get_xllamacpp_cuda_index_url("unknown") is None
 
 
+def test_merge_virtual_env_packages_user_package_overrides_system_marker():
+    base_packages = [
+        "funasr==1.2.7",
+        "#system_torch#",
+        "#system_torchaudio#",
+        "#system_numpy#",
+    ]
+    extra_packages = ["torchaudio==2.13.0", "numpy==2.1.0"]
+
+    merged = merge_virtual_env_packages(base_packages, extra_packages)
+
+    assert merged == [
+        "funasr==1.2.7",
+        "#system_torch#",
+        "torchaudio==2.13.0",
+        "numpy==2.1.0",
+    ]
+
+
 def _run_prepare_virtual_env(
     cuda_version, inherited_index_url, skip_installed=True, cuda_available=True
 ):

xinference/core/tests/test_worker.py

@@ -243,7 +243,6 @@ def test_merge_virtual_env_packages_override_and_append():
     assert merged == [
         "transformers==5.0.0.dev0",  # user-specified overrides default
         "accelerate>=0.34.2",
-        "#system_numpy#",
         "numpy==2.1.0",
     ]
 

xinference/core/utils.py

@@ -261,8 +261,9 @@ def merge_virtual_env_packages(
     """
 
     def get_key(package: str) -> str:
+        if package.startswith("#system_") and package.endswith("#"):
+            return package[len("#system_") : -1].lower()
         if package.startswith("#"):
-            # special placeholders like #system_torch#
             return package
         try:
             return Requirement(package).name.lower()