Merge remote-tracking branch 'origin/feat-support-ollama-thinking' into feat-support-ollama-thinking

# Conflicts:
#	models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApi.java
#	models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApiHelper.java
#	models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaModel.java
#	models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaOptions.java
#	models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaImage.java
#	models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/api/OllamaApiIT.java

Author: sunyuhan1998

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApi.java

@@ -66,6 +66,9 @@ public static Builder builder() {
 
 	private static final Log logger = LogFactory.getLog(OllamaApi.class);
 
+
+	private static final String DEFAULT_BASE_URL = "http://localhost:11434";
+
 	private final RestClient restClient;
 
 	private final WebClient webClient;
@@ -78,18 +81,22 @@ public static Builder builder() {
 	 * @param responseErrorHandler Response error handler.
 	 */
 	private OllamaApi(String baseUrl, RestClient.Builder restClientBuilder, WebClient.Builder webClientBuilder, ResponseErrorHandler responseErrorHandler) {
+
+
 		Consumer<HttpHeaders> defaultHeaders = headers -> {
 			headers.setContentType(MediaType.APPLICATION_JSON);
 			headers.setAccept(List.of(MediaType.APPLICATION_JSON));
 		};
 
+
 		this.restClient = restClientBuilder
 				.clone()
 				.baseUrl(baseUrl)
 				.defaultHeaders(defaultHeaders)
 				.defaultStatusHandler(responseErrorHandler)
 				.build();
 
+
 		this.webClient = webClientBuilder
 				.clone()
 				.baseUrl(baseUrl)
@@ -252,22 +259,19 @@ public Flux<ProgressResponse> pullModel(PullModelRequest pullModelRequest) {
 	 *
 	 * @param role The role of the message of type {@link Role}.
 	 * @param content The content of the message.
+	 * @param thinking The thinking of the model.
 	 * @param images The list of base64-encoded images to send with the message.
 	 * 				 Requires multimodal models such as llava or bakllava.
-	 * @param toolCalls The list of tools that the model wants to use.
-	 * @param toolName The name of the tool that was executed to inform the model of the result.
-	 * @param thinking The model's thinking process. Requires thinking models such as qwen3.
+	 * @param toolCalls The relevant tool call.
 	 */
 	@JsonInclude(Include.NON_NULL)
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	public record Message(
 			@JsonProperty("role") Role role,
 			@JsonProperty("content") String content,
+			@JsonProperty("thinking") String thinking,
 			@JsonProperty("images") List<String> images,
-			@JsonProperty("tool_calls") List<ToolCall> toolCalls,
-			@JsonProperty("tool_name") String toolName,
-			@JsonProperty("thinking") String thinking
-	) {
+			@JsonProperty("tool_calls") List<ToolCall> toolCalls) {
 
 		public static Builder builder(Role role) {
 			return new Builder(role);
@@ -316,29 +320,20 @@ public record ToolCall(
 		 *
 		 * @param name The name of the function.
 		 * @param arguments The arguments that the model expects you to pass to the function.
-		 * @param index The index of the function call in the list of tool calls.
 		 */
 		@JsonInclude(Include.NON_NULL)
 		public record ToolCallFunction(
 			@JsonProperty("name") String name,
-			@JsonProperty("arguments") Map<String, Object> arguments,
-			@JsonProperty("index") Integer index
-		) {
-
-			public ToolCallFunction(String name, Map<String, Object> arguments) {
-				this(name, arguments, null);
-			}
-
+			@JsonProperty("arguments") Map<String, Object> arguments) {
 		}
 
-		public static final class Builder {
+		public static class Builder {
 
 			private final Role role;
 			private String content;
+			private String thinking;
 			private List<String> images;
 			private List<ToolCall> toolCalls;
-			private String toolName;
-			private String thinking;
 
 			public Builder(Role role) {
 				this.role = role;
@@ -349,6 +344,11 @@ public Builder content(String content) {
 				return this;
 			}
 
+			public Builder thinking(String thinking) {
+				this.thinking = thinking;
+				return this;
+			}
+
 			public Builder images(List<String> images) {
 				this.images = images;
 				return this;
@@ -359,18 +359,8 @@ public Builder toolCalls(List<ToolCall> toolCalls) {
 				return this;
 			}
 
-			public Builder toolName(String toolName) {
-				this.toolName = toolName;
-				return this;
-			}
-
-			public Builder thinking(String thinking) {
-				this.thinking = thinking;
-				return this;
-			}
-
 			public Message build() {
-				return new Message(this.role, this.content, this.images, this.toolCalls, this.toolName, this.thinking);
+				return new Message(this.role, this.content, this.thinking, this.images, this.toolCalls);
 			}
 		}
 	}
@@ -385,8 +375,8 @@ public Message build() {
 	 * @param keepAlive Controls how long the model will stay loaded into memory following this request (default: 5m).
 	 * @param tools List of tools the model has access to.
 	 * @param options Model-specific options. For example, "temperature" can be set through this field, if the model supports it.
-	 * @param think Think controls whether thinking/reasoning models will think before responding.
-	 * You can use the {@link OllamaChatOptions} builder to create the options then {@link OllamaChatOptions#toMap()} to convert the options into a map.
+	 * @param think The model should think before responding, if the model supports it.
+	 * You can use the {@link OllamaOptions} builder to create the options then {@link OllamaOptions#toMap()} to convert the options into a map.
 	 *
 	 * @see <a href=
 	 * "https://github.com/ollama/ollama/blob/main/docs/api.md#generate-a-chat-completion">Chat
@@ -467,7 +457,7 @@ public Function(String description, String name, String jsonSchema) {
 			}
 		}
 
-		public static final class Builder {
+		public static class Builder {
 
 			private final String model;
 			private List<Message> messages = List.of();
@@ -515,21 +505,14 @@ public Builder options(Map<String, Object> options) {
 				return this;
 			}
 
-			public Builder think(Boolean think) {
-				this.think = think;
-				return this;
-			}
-
-			@Deprecated
 			public Builder options(OllamaOptions options) {
 				Objects.requireNonNull(options, "The options can not be null.");
 				this.options = OllamaOptions.filterNonSupportedFields(options.toMap());
 				return this;
 			}
 
-			public Builder options(OllamaChatOptions options) {
-				Objects.requireNonNull(options, "The options can not be null.");
-				this.options = OllamaChatOptions.filterNonSupportedFields(options.toMap());
+			public Builder think(Boolean think) {
+				this.think = think;
 				return this;
 			}
 
@@ -621,7 +604,7 @@ public Duration getEvalDuration() {
 	public record EmbeddingsRequest(
 			@JsonProperty("model") String model,
 			@JsonProperty("input") List<String> input,
-			@JsonProperty("keep_alive") String keepAlive,
+			@JsonProperty("keep_alive") Duration keepAlive,
 			@JsonProperty("options") Map<String, Object> options,
 			@JsonProperty("truncate") Boolean truncate) {
 
@@ -751,7 +734,7 @@ public record ProgressResponse(
 			@JsonProperty("completed") Long completed
 	) { }
 
-	public static final class Builder {
+	public static class Builder {
 
 		private String baseUrl = OllamaApiConstants.DEFAULT_BASE_URL;
 

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApiHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,14 +87,12 @@ private static OllamaApi.Message merge(OllamaApi.Message previous, OllamaApi.Mes
 		role = (role != null ? role : OllamaApi.Message.Role.ASSISTANT);
 		List<String> images = mergeImages(previous, current);
 		List<OllamaApi.Message.ToolCall> toolCalls = mergeToolCall(previous, current);
-		String toolName = mergeToolName(previous, current);
 
 		return OllamaApi.Message.builder(role)
 			.content(content)
 			.thinking(thinking)
 			.images(images)
 			.toolCalls(toolCalls)
-			.toolName(toolName)
 			.build();
 	}
 
@@ -143,37 +141,26 @@ private static String mergeContent(OllamaApi.Message previous, OllamaApi.Message
 		return previous.content() + current.content();
 	}
 
-	private static List<OllamaApi.Message.ToolCall> mergeToolCall(OllamaApi.Message previous,
-			OllamaApi.Message current) {
-		if (previous == null) {
-			return (current != null ? current.toolCalls() : null);
-		}
-		if (current == null) {
-			return previous.toolCalls();
-		}
-		return merge(previous.toolCalls(), current.toolCalls());
-	}
-
 	private static String mergeThinking(OllamaApi.Message previous, OllamaApi.Message current) {
 		if (previous == null || previous.thinking() == null) {
 			return (current != null ? current.thinking() : null);
 		}
 		if (current == null || current.thinking() == null) {
-			return (previous.thinking());
+			return (previous != null ? previous.thinking() : null);
 		}
 
 		return previous.thinking() + current.thinking();
 	}
 
-	private static String mergeToolName(OllamaApi.Message previous, OllamaApi.Message current) {
-		if (previous == null || previous.toolName() == null) {
-			return (current != null ? current.toolName() : null);
+	private static List<OllamaApi.Message.ToolCall> mergeToolCall(OllamaApi.Message previous,
+			OllamaApi.Message current) {
+		if (previous == null) {
+			return (current != null ? current.toolCalls() : null);
 		}
-		if (current == null || current.toolName() == null) {
-			return (previous.toolName());
+		if (current == null) {
+			return previous.toolCalls();
 		}
-
-		return previous.toolName() + current.toolName();
+		return merge(previous.toolCalls(), current.toolCalls());
 	}
 
 	private static List<String> mergeImages(OllamaApi.Message previous, OllamaApi.Message current) {

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaModel.java

@@ -28,30 +28,15 @@
  */
 public enum OllamaModel implements ChatModelDescription {
 
-	QWEN_2_5_3B("qwen2.5:3b"),
-
 	/**
 	 * Qwen 2.5
 	 */
 	QWEN_2_5_7B("qwen2.5"),
 
 	/**
-	 * Flagship vision-language model of Qwen and also a significant leap from the
-	 * previous Qwen2-VL.
+	 * Qwen3
 	 */
-	QWEN2_5_VL("qwen2.5vl"),
-
-	/**
-	 * Qwen3 is the latest generation of large language models in Qwen series, offering a
-	 * comprehensive suite of dense and mixture-of-experts (MoE) models.
-	 * Qwen3 1.7b
-	 */
-	QWEN3_7B("qwen3:7b"),
-
-	/**
-	 * Qwen3 4B
-	 */
-	QWEN3_4B("qwen3:4b"),
+	QWEN_3_8B("qwen3"),
 
 	/**
 	 * Qwen3 1.7b
@@ -170,11 +155,6 @@ public enum OllamaModel implements ChatModelDescription {
 	 */
 	GEMMA("gemma"),
 
-	/**
-	 * The current, most capable model that runs on a single GPU.
-	 */
-	GEMMA3("gemma3"),
-
 	/**
 	 * Uncensored Llama 2 model
 	 */