Normalize Ollama model names in auto-pull feature

In order to support edge cases due to different naming formats, this PR introduced an explicit normalization logic to ensure the correct matching when checking for the availability of a certain model.

Signed-off-by: Thomas Vitale <[email protected]>

Author: ThomasVitale

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/management/OllamaModelManager.java

@@ -21,6 +21,7 @@
 import org.springframework.ai.ollama.api.OllamaApi.DeleteModelRequest;
 import org.springframework.ai.ollama.api.OllamaApi.ListModelResponse;
 import org.springframework.ai.ollama.api.OllamaApi.PullModelRequest;
+import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import reactor.util.retry.Retry;
 
@@ -55,14 +56,30 @@ public OllamaModelManager(OllamaApi ollamaApi, ModelManagementOptions options) {
 	}
 
 	public boolean isModelAvailable(String modelName) {
+		Assert.hasText(modelName, "modelName must not be empty");
 		ListModelResponse listModelResponse = ollamaApi.listModels();
 		if (!CollectionUtils.isEmpty(listModelResponse.models())) {
-			// Not an equality check to support the implicit ":latest" tag.
-			return listModelResponse.models().stream().anyMatch(m -> m.name().contains(modelName));
+			var normalizedModel = normalizeModelName(modelName);
+			return listModelResponse.models().stream().anyMatch(m -> m.name().equals(normalizedModel));
 		}
 		return false;
 	}
 
+	/**
+	 * If the name starts with "hf.co" or "huggingface.co", leave it as is. If the name
+	 * follows the format "<string>:<string>", leave it as is. If the name follows the
+	 * format "<string>" and doesn't include any ":" sign, then add ":latest" as a suffix.
+	 */
+	private String normalizeModelName(String modelName) {
+		if (modelName.startsWith("hf.co") || modelName.startsWith("huggingface.co")) {
+			return modelName;
+		}
+		if (modelName.contains(":")) {
+			return modelName;
+		}
+		return modelName + ":latest";
+	}
+
 	public void deleteModel(String modelName) {
 		logger.info("Start deletion of model: {}", modelName);
 		if (!isModelAvailable(modelName)) {

models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/management/OllamaModelManagerIT.java

@@ -64,20 +64,24 @@ public void whenModelNotAvailableReturnFalse() {
 
 	@Test
 	public void pullAndDeleteModel() {
-		var model = "all-minilm";
+		var model = "all-minilm:33m";
 		modelManager.pullModel(model, PullModelStrategy.WHEN_MISSING);
 		var isModelAvailable = modelManager.isModelAvailable(model);
 		assertThat(isModelAvailable).isTrue();
 
+		model = "all-minilm";
 		modelManager.deleteModel(model);
 		isModelAvailable = modelManager.isModelAvailable(model);
 		assertThat(isModelAvailable).isFalse();
 
-		model = "all-minilm:latest";
 		modelManager.pullModel(model, PullModelStrategy.WHEN_MISSING);
 		isModelAvailable = modelManager.isModelAvailable(model);
 		assertThat(isModelAvailable).isTrue();
 
+		model = "all-minilm:latest";
+		isModelAvailable = modelManager.isModelAvailable(model);
+		assertThat(isModelAvailable).isTrue();
+
 		modelManager.deleteModel(model);
 		isModelAvailable = modelManager.isModelAvailable(model);
 		assertThat(isModelAvailable).isFalse();