Fix ollama embedding options merging bug

tzolov · tzolov · commit 4c4e234279d7 · 2024-02-03T15:34:41.000+01:00
diff --git a/models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaEmbeddingClient.java b/models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaEmbeddingClient.java
@@ -122,9 +122,11 @@ OllamaApi.EmbeddingRequest ollamaEmbeddingRequest(String inputContent, Embedding
 			if (options instanceof OllamaOptions ollamaOptions) {
 				runtimeOptions = ollamaOptions;
 			}
-			// currently EmbeddingOptions does not have any portable options to be
-			// merged.
-			runtimeOptions = null;
+			else {
+				// currently EmbeddingOptions does not have any portable options to be
+				// merged.
+				runtimeOptions = null;
+			}
 		}
 
 		OllamaOptions mergedOptions = ModelOptionsUtils.merge(runtimeOptions, this.defaultOptions, OllamaOptions.class);

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,11 @@ OllamaApi.EmbeddingRequest ollamaEmbeddingRequest(String inputContent, Embedding`
`122`	`122`	`if (options instanceof OllamaOptions ollamaOptions) {`
`123`	`123`	`runtimeOptions = ollamaOptions;`
`124`	`124`	`}`
`125`		`- // currently EmbeddingOptions does not have any portable options to be`
`126`		`- // merged.`
`127`		`- runtimeOptions = null;`
	`125`	`+ else {`
	`126`	`+ // currently EmbeddingOptions does not have any portable options to be`
	`127`	`+ // merged.`
	`128`	`+ runtimeOptions = null;`
	`129`	`+ }`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`OllamaOptions mergedOptions = ModelOptionsUtils.merge(runtimeOptions, this.defaultOptions, OllamaOptions.class);`