feat: Add support for the think flag at the ChatMode level.

Signed-off-by: Sun Yuhan <[email protected]>

Author: sunyuhan1998

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

@@ -462,7 +462,7 @@ else if (message instanceof ToolResponseMessage toolMessage) {
 			.stream(stream)
 			.messages(ollamaMessages)
 			.options(requestOptions)
-			.think(requestOptions.getThink());
+			.think(requestOptions.isThink());
 
 		if (requestOptions.getFormat() != null) {
 			requestBuilder.format(requestOptions.getFormat());

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

@@ -374,7 +374,7 @@ public static OllamaOptions fromOptions(OllamaOptions fromOptions) {
 				.format(fromOptions.getFormat())
 				.keepAlive(fromOptions.getKeepAlive())
 				.truncate(fromOptions.getTruncate())
-				.think(fromOptions.getThink())
+				.think(fromOptions.isThink())
 				.useNUMA(fromOptions.getUseNUMA())
 				.numCtx(fromOptions.getNumCtx())
 				.numBatch(fromOptions.getNumBatch())
@@ -714,7 +714,8 @@ public void setTruncate(Boolean truncate) {
 		this.truncate = truncate;
 	}
 
-	public Boolean getThink() {
+	@Override
+	public Boolean isThink() {
 		return this.think;
 	}
 

spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/ChatOptions.java

@@ -83,6 +83,15 @@ public interface ChatOptions extends ModelOptions {
 	@Nullable
 	Double getTopP();
 
+	/**
+	 * Returns the think flag to use for the chat.
+	 * @return the think flag to use for the chat
+	 */
+	@Nullable
+	default Boolean isThink() {
+		return false;
+	}
+
 	/**
 	 * Returns a copy of this {@link ChatOptions}.
 	 * @return a copy of this {@link ChatOptions}
@@ -158,6 +167,13 @@ interface Builder {
 		 */
 		Builder topP(Double topP);
 
+		/**
+		 * Builds with the think to use for the chat.
+		 * @param think Whether to enable thinking mode
+		 * @return the builder.
+		 */
+		Builder think(Boolean think);
+
 		/**
 		 * Build the {@link ChatOptions}.
 		 * @return the Chat options.

spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/DefaultChatOptions.java

@@ -41,6 +41,8 @@ public class DefaultChatOptions implements ChatOptions {
 
 	private Double topP;
 
+	private Boolean think;
+
 	@Override
 	public String getModel() {
 		return this.model;
@@ -113,6 +115,15 @@ public void setTopP(Double topP) {
 		this.topP = topP;
 	}
 
+	@Override
+	public Boolean isThink() {
+		return this.think;
+	}
+
+	public void setThink(Boolean think) {
+		this.think = think;
+	}
+
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T extends ChatOptions> T copy() {
@@ -125,6 +136,7 @@ public <T extends ChatOptions> T copy() {
 		copy.setTemperature(this.getTemperature());
 		copy.setTopK(this.getTopK());
 		copy.setTopP(this.getTopP());
+		copy.setThink(this.isThink());
 		return (T) copy;
 	}
 

spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/DefaultChatOptionsBuilder.java

@@ -73,6 +73,11 @@ public DefaultChatOptionsBuilder topP(Double topP) {
 		return this;
 	}
 
+	public DefaultChatOptionsBuilder think(Boolean think) {
+		this.options.setThink(think);
+		return this;
+	}
+
 	public ChatOptions build() {
 		return this.options.copy();
 	}

spring-ai-model/src/main/java/org/springframework/ai/model/tool/DefaultToolCallingChatOptions.java

@@ -70,6 +70,9 @@ public class DefaultToolCallingChatOptions implements ToolCallingChatOptions {
 	@Nullable
 	private Double topP;
 
+	@Nullable
+	private Boolean think;
+
 	@Override
 	public List<ToolCallback> getToolCallbacks() {
 		return List.copyOf(this.toolCallbacks);
@@ -198,6 +201,16 @@ public void setTopP(@Nullable Double topP) {
 		this.topP = topP;
 	}
 
+	@Override
+	@Nullable
+	public Boolean isThink() {
+		return this.think;
+	}
+
+	public void setThink(@Nullable Boolean think) {
+		this.think = think;
+	}
+
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T extends ChatOptions> T copy() {
@@ -325,6 +338,12 @@ public ToolCallingChatOptions.Builder topP(@Nullable Double topP) {
 			return this;
 		}
 
+		@Override
+		public ToolCallingChatOptions.Builder think(Boolean think) {
+			this.options.setThink(think);
+			return this;
+		}
+
 		@Override
 		public ToolCallingChatOptions build() {
 			return this.options;

spring-ai-model/src/main/java/org/springframework/ai/model/tool/ToolCallingChatOptions.java

@@ -219,6 +219,9 @@ interface Builder extends ChatOptions.Builder {
 		@Override
 		Builder topP(@Nullable Double topP);
 
+		@Override
+		Builder think(@Nullable Boolean think);
+
 		@Override
 		ToolCallingChatOptions build();
 

spring-ai-model/src/test/java/org/springframework/ai/chat/prompt/ChatOptionsBuilderTests.java

@@ -53,13 +53,15 @@ void shouldBuildWithAllOptions() {
 			.topP(1.0)
 			.topK(40)
 			.stopSequences(List.of("stop1", "stop2"))
+			.think(true)
 			.build();
 
 		assertThat(options.getModel()).isEqualTo("gpt-4");
 		assertThat(options.getMaxTokens()).isEqualTo(100);
 		assertThat(options.getTemperature()).isEqualTo(0.7);
 		assertThat(options.getTopP()).isEqualTo(1.0);
 		assertThat(options.getTopK()).isEqualTo(40);
+		assertThat(options.isThink()).isEqualTo(true);
 		assertThat(options.getStopSequences()).containsExactly("stop1", "stop2");
 	}
 
@@ -82,6 +84,7 @@ void shouldCopyOptions() {
 			.temperature(0.7)
 			.topP(1.0)
 			.topK(40)
+			.think(true)
 			.stopSequences(List.of("stop1", "stop2"))
 			.build();
 
@@ -107,6 +110,7 @@ void shouldUpcastToChatOptions() {
 			.temperature(0.7)
 			.topP(1.0)
 			.topK(40)
+			.think(true)
 			.stopSequences(List.of("stop1", "stop2"))
 			.toolNames(Set.of("function1", "function2"))
 			.toolCallbacks(List.of(callback))
@@ -121,6 +125,7 @@ void shouldUpcastToChatOptions() {
 		assertThat(chatOptions.getTemperature()).isEqualTo(0.7);
 		assertThat(chatOptions.getTopP()).isEqualTo(1.0);
 		assertThat(chatOptions.getTopK()).isEqualTo(40);
+		assertThat(chatOptions.isThink()).isEqualTo(true);
 		assertThat(chatOptions.getStopSequences()).containsExactly("stop1", "stop2");
 	}
 

spring-ai-model/src/test/java/org/springframework/ai/model/tool/DefaultToolCallingChatOptionsTests.java

@@ -188,6 +188,7 @@ void builderShouldCreateOptionsWithAllProperties() {
 			.stopSequences(List.of("stop"))
 			.topK(3)
 			.topP(0.9)
+			.think(true)
 			.build();
 
 		assertThat(options).satisfies(o -> {
@@ -203,6 +204,7 @@ void builderShouldCreateOptionsWithAllProperties() {
 			assertThat(o.getStopSequences()).containsExactly("stop");
 			assertThat(o.getTopK()).isEqualTo(3);
 			assertThat(o.getTopP()).isEqualTo(0.9);
+			assertThat(o.isThink()).isEqualTo(true);
 		});
 	}