diff --git a/agent/app/service/ai/vllm_upgrade.go b/agent/app/service/ai/vllm_upgrade.go index 95f66c37d..6f0e10fd6 100644 --- a/agent/app/service/ai/vllm_upgrade.go +++ b/agent/app/service/ai/vllm_upgrade.go @@ -75,7 +75,9 @@ func isVllmUpgradeCandidate(currentVersion, targetVersion, currentImage string) if !isVllmUpgradeVersionAllowed(currentVersion, targetVersion, currentImage) { return false } - if common.CompareVersion(trimVllmVersionFamily(targetVersion), trimVllmVersionFamily(currentVersion)) { + currentNumber, _, _ := strings.Cut(trimVllmVersionFamily(currentVersion), "-") + targetNumber, _, _ := strings.Cut(trimVllmVersionFamily(targetVersion), "-") + if common.CompareVersion(targetNumber, currentNumber) { return true } return !hasVllmVersionFamilyPrefix(currentVersion) && diff --git a/agent/app/service/vllm_upgrade.go b/agent/app/service/vllm_upgrade.go index 7a37e9495..d36cbab3a 100644 --- a/agent/app/service/vllm_upgrade.go +++ b/agent/app/service/vllm_upgrade.go @@ -93,7 +93,9 @@ func isVllmUpgradeCandidate(currentVersion, targetVersion, currentImage string) if !isVllmUpgradeVersionAllowed(currentVersion, targetVersion, currentImage) { return false } - if common.CompareVersion(trimVllmVersionFamily(targetVersion), trimVllmVersionFamily(currentVersion)) { + currentNumber, _, _ := strings.Cut(trimVllmVersionFamily(currentVersion), "-") + targetNumber, _, _ := strings.Cut(trimVllmVersionFamily(targetVersion), "-") + if common.CompareVersion(targetNumber, currentNumber) { return true } return !hasVllmVersionFamilyPrefix(currentVersion) && diff --git a/agent/utils/ai_tools/vllm/version.go b/agent/utils/ai_tools/vllm/version.go index 44a1906ca..c012383f8 100644 --- a/agent/utils/ai_tools/vllm/version.go +++ b/agent/utils/ai_tools/vllm/version.go @@ -32,11 +32,6 @@ func GB10NodeCount(version string) int { return 0 } -func IsGB10TileLangVersion(version string) bool { - tag := strings.TrimPrefix(strings.ToLower(strings.TrimSpace(version)), gb10VersionPrefix) - return strings.TrimPrefix(tag, "v") == "2026.11.15-optimized-for-4-gb10-ds-v4.1-flash" -} - func ResolveImage(image, imageType, tag string) string { image = strings.TrimSpace(image) tag = strings.TrimSpace(tag) @@ -58,13 +53,8 @@ func ResolveImage(image, imageType, tag string) string { switch suffix { case "optimized-for-ds-v4-flash": defaultImage = "1panel/vllm-gb10-dual-node:" + strings.TrimPrefix(tag, "v") - case "optimized-for-2-gb10-ds-v4-flash": + case "optimized-for-2-gb10-ds-v4-flash", "optimized-for-4-gb10-ds-v4.1-flash": defaultImage = "1panel/vllm:" + strings.TrimPrefix(tag, "v") - case "optimized-for-4-gb10-ds-v4.1-flash": - defaultImage = "eugr/spark-vllm-b12x:latest" - if IsGB10TileLangVersion(tag) { - defaultImage = "spark-ds41f:1107" - } case "optimized-for-ds-v4.1-flash": defaultImage = "1panel/vllm:" + tag }