stripDefaultsFromModelName fixed to account for default registries

So we strip defaults fully.

Signed-off-by: Eric Curtin <[email protected]>

Author: ericcurtin

cmd/cli/commands/utils.go

@@ -87,24 +87,46 @@ func asPrinter(cmd *cobra.Command) standalone.StatusPrinter {
 	return &commandPrinter{cmd: cmd}
 }
 
-// stripDefaultsFromModelName removes the default "ai/" prefix and ":latest" tag for display.
+// stripDefaultsFromModelName removes the default "ai/" prefix, default registry, and ":latest" tag for display.
 // Examples:
 //   - "ai/gemma3:latest" -> "gemma3"
 //   - "ai/gemma3:v1" -> "ai/gemma3:v1"
 //   - "myorg/gemma3:latest" -> "myorg/gemma3"
 //   - "gemma3:latest" -> "gemma3"
+//   - "index.docker.io/ai/gemma3:latest" -> "gemma3"
+//   - "docker.io/ai/gemma3:latest" -> "gemma3"
+//   - "docker.io/myorg/gemma3:latest" -> "myorg/gemma3"
 //   - "hf.co/bartowski/model:latest" -> "hf.co/bartowski/model"
 func stripDefaultsFromModelName(model string) string {
-	// Check if model has ai/ prefix without tag (implicitly :latest) - strip just ai/
+	// First, let's handle the default registry prefixes
+	defaultRegistries := []string{"index.docker.io/", "docker.io/"}
+	for _, reg := range defaultRegistries {
+		if strings.HasPrefix(model, reg) {
+			// Remove the registry prefix
+			model = strings.TrimPrefix(model, reg)
+			break
+		}
+	}
+
+	// If model has default org prefix (without tag, or with :latest tag), strip the org
+	// but preserve other tags
 	if strings.HasPrefix(model, defaultOrg+"/") {
-		model = strings.TrimPrefix(model, defaultOrg+"/")
+		rest := strings.TrimPrefix(model, defaultOrg+"/")
+		// Check if the remaining part has :latest tag
+		if strings.HasSuffix(rest, ":"+defaultTag) {
+			// Strip the :latest tag to get just the name
+			nameWithoutTag := strings.TrimSuffix(rest, ":"+defaultTag)
+			return nameWithoutTag
+		}
+		// If it doesn't have latest tag, keep the rest intact
+		return rest
 	}
 
-	// Check if model has :latest but no slash (no org specified) - strip :latest
+	// For models without the default org but with :latest tag, just strip the tag (keep the org part)
 	if strings.HasSuffix(model, ":"+defaultTag) {
 		model = strings.TrimSuffix(model, ":"+defaultTag)
 	}
 
-	// For other cases (ai/ with custom tag, custom org with :latest, etc.), keep as-is
+	// For other cases (custom org with :latest, etc.), return as is
 	return model
 }

cmd/cli/commands/utils_test.go

@@ -137,6 +137,31 @@ func TestStripDefaultsFromModelName(t *testing.T) {
 			input:    "",
 			expected: "",
 		},
+		{
+			name:     "docker.io registry with ai prefix and latest tag",
+			input:    "docker.io/ai/gemma3:latest",
+			expected: "gemma3",
+		},
+		{
+			name:     "index.docker.io registry with ai prefix and latest tag",
+			input:    "index.docker.io/ai/gemma3:latest",
+			expected: "gemma3",
+		},
+		{
+			name:     "docker.io registry with ai prefix and custom tag",
+			input:    "docker.io/ai/gemma3:v1",
+			expected: "gemma3:v1",
+		},
+		{
+			name:     "docker.io registry with custom org and latest tag",
+			input:    "docker.io/myorg/gemma3:latest",
+			expected: "myorg/gemma3",
+		},
+		{
+			name:     "index.docker.io registry with custom org and latest tag",
+			input:    "index.docker.io/myorg/gemma3:latest",
+			expected: "myorg/gemma3",
+		},
 	}
 
 	for _, tt := range tests {