fix(plugin): filter declared uv dependency exclusions (#6437)

This commit is contained in:
InfinityPacer
2026-08-24 20:06:57 +08:00
committed by GitHub
parent 7d3b5e129e
commit 34f59bc9f4
5 changed files with 128 additions and 13 deletions
+36 -6
View File
@@ -24,8 +24,9 @@ import aioshutil
import httpx2
from anyio import Path as AsyncPath
from packaging.markers import default_environment
from packaging.requirements import Requirement
from packaging.requirements import InvalidRequirement, Requirement
from packaging.specifiers import SpecifierSet, InvalidSpecifier
from packaging.utils import canonicalize_name
from packaging.version import Version, InvalidVersion
from importlib.metadata import distributions
from requests import Response
@@ -34,6 +35,7 @@ from app.runtime.cache import cached, is_fresh
from app.runtime.dependencies import (
iter_runtime_profile_requirement_strings,
iter_runtime_requirement_strings,
runtime_excluded_dependency_pairs,
)
from app.runtime.settings import RuntimeSettingsCompat
from app.adapters.system.package import (
@@ -1733,15 +1735,36 @@ class PluginHelper(metaclass=WeakSingleton):
@staticmethod
def __runtime_health_error_lines(check_name: str, message: str) -> set[str]:
"""提取稳定诊断项,忽略执行器附加的命令摘要"""
"""提取未被项目依赖策略排除的稳定诊断项。"""
lines = {line.strip() for line in message.splitlines() if line.strip()}
if check_name != "uv check":
return lines
package_errors = set(re.findall(
r"The package `[^`]+` requires `[^`]+`, but [^\r\n;]+",
matches = list(re.finditer(
r"The package `(?P<package>[^`]+)` requires `(?P<requirement>[^`]+)`, "
r"but [^\r\n;]+",
message,
))
return package_errors or lines
if not matches:
return lines
excluded_pairs = runtime_excluded_dependency_pairs(
Path(settings.ROOT_PATH) / "pyproject.toml"
)
package_errors = set()
for match in matches:
try:
dependency_name = Requirement(match.group("requirement")).name
except InvalidRequirement:
package_errors.add(match.group(0))
continue
pair = (
canonicalize_name(match.group("package")),
canonicalize_name(dependency_name),
)
if pair not in excluded_pairs:
package_errors.add(match.group(0))
return package_errors
@staticmethod
def __runtime_health_regression_message(
@@ -1755,7 +1778,14 @@ class PluginHelper(metaclass=WeakSingleton):
for check_name, (success, message) in current_health.items():
baseline_success, baseline_message = baseline_health.get(check_name, (True, ""))
if baseline_success and not success:
regressions.append(f"{check_name}失败:{message}")
current_lines = PluginHelper.__runtime_health_error_lines(
check_name,
message,
)
if current_lines:
regressions.append(
f"{check_name}失败:{' | '.join(sorted(current_lines))}"
)
elif not baseline_success and not success:
baseline_lines = PluginHelper.__runtime_health_error_lines(
check_name,
+31
View File
@@ -6,6 +6,9 @@ import tomllib
from collections.abc import Iterable
from pathlib import Path
from packaging.requirements import InvalidRequirement, Requirement
from packaging.utils import canonicalize_name
from app.foundation.environment import is_free_threaded_runtime
@@ -52,5 +55,33 @@ def iter_runtime_profile_requirement_strings(project_file: Path) -> Iterable[str
yield requirement
def runtime_excluded_dependency_pairs(project_file: Path) -> set[tuple[str, str]]:
"""返回项目明确排除的“依赖包 -> 传递依赖”规范化名称对。"""
with project_file.open("rb") as file:
document = tomllib.load(file)
exclusions = (
((document.get("tool") or {}).get("uv") or {}).get("exclude-dependencies")
or ()
)
pairs: set[tuple[str, str]] = set()
for exclusion in exclusions:
if not isinstance(exclusion, dict):
continue
package = exclusion.get("package") or {}
package_name = package.get("name") if isinstance(package, dict) else None
if not isinstance(package_name, str) or not package_name.strip():
continue
for dependency in exclusion.get("dependencies") or ():
if not isinstance(dependency, str):
continue
try:
dependency_name = Requirement(dependency).name
except InvalidRequirement:
continue
pairs.add((canonicalize_name(package_name), canonicalize_name(dependency_name)))
return pairs
if __name__ == "__main__":
print(runtime_dependency_group())