Skip to content

Commit 3812d2e

Browse files
ilayaperumalgsobychacko
authored andcommitted
Remove explicit ChatOptions for the models using FunctionCallingOptions
- Since FunctionCallingOptions already extends ChatOptions, removing explicit usage of ChatOptions in the Model Options classes
1 parent 0eacc91 commit 3812d2e

File tree

9 files changed

+9
-17
lines changed

9 files changed

+9
-17
lines changed

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
import org.springframework.ai.anthropic.api.AnthropicApi;
3131
import org.springframework.ai.anthropic.api.AnthropicApi.ChatCompletionRequest;
32-
import org.springframework.ai.chat.prompt.ChatOptions;
3332
import org.springframework.ai.model.function.FunctionCallback;
3433
import org.springframework.ai.model.function.FunctionCallingOptions;
3534
import org.springframework.util.Assert;
@@ -42,7 +41,7 @@
4241
* @since 1.0.0
4342
*/
4443
@JsonInclude(Include.NON_NULL)
45-
public class AnthropicChatOptions implements ChatOptions, FunctionCallingOptions {
44+
public class AnthropicChatOptions implements FunctionCallingOptions {
4645

4746
// @formatter:off
4847
private @JsonProperty("model") String model;

models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2929
import com.fasterxml.jackson.annotation.JsonProperty;
3030

31-
import org.springframework.ai.chat.prompt.ChatOptions;
3231
import org.springframework.ai.model.function.FunctionCallback;
3332
import org.springframework.ai.model.function.FunctionCallingOptions;
3433
import org.springframework.util.Assert;
@@ -43,7 +42,7 @@
4342
* @author Soby Chacko
4443
*/
4544
@JsonInclude(Include.NON_NULL)
46-
public class AzureOpenAiChatOptions implements FunctionCallingOptions, ChatOptions {
45+
public class AzureOpenAiChatOptions implements FunctionCallingOptions {
4746

4847
/**
4948
* The maximum number of tokens to generate.

models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* @since 1.0.0 M1
4646
*/
4747
@JsonInclude(Include.NON_NULL)
48-
public class MiniMaxChatOptions implements FunctionCallingOptions, ChatOptions {
48+
public class MiniMaxChatOptions implements FunctionCallingOptions {
4949

5050
// @formatter:off
5151
/**

models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.fasterxml.jackson.annotation.JsonInclude;
2828
import com.fasterxml.jackson.annotation.JsonProperty;
2929

30-
import org.springframework.ai.chat.prompt.ChatOptions;
3130
import org.springframework.ai.mistralai.api.MistralAiApi;
3231
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionRequest.ResponseFormat;
3332
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionRequest.ToolChoice;
@@ -45,7 +44,7 @@
4544
* @since 0.8.1
4645
*/
4746
@JsonInclude(JsonInclude.Include.NON_NULL)
48-
public class MistralAiChatOptions implements FunctionCallingOptions, ChatOptions {
47+
public class MistralAiChatOptions implements FunctionCallingOptions {
4948

5049
/**
5150
* ID of the model to use

models/spring-ai-moonshot/src/main/java/org/springframework/ai/moonshot/MoonshotChatOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.fasterxml.jackson.annotation.JsonInclude;
2727
import com.fasterxml.jackson.annotation.JsonProperty;
2828

29-
import org.springframework.ai.chat.prompt.ChatOptions;
3029
import org.springframework.ai.model.function.FunctionCallback;
3130
import org.springframework.ai.model.function.FunctionCallingOptions;
3231
import org.springframework.ai.moonshot.api.MoonshotApi;
@@ -39,7 +38,7 @@
3938
* @author Thomas Vitale
4039
*/
4140
@JsonInclude(JsonInclude.Include.NON_NULL)
42-
public class MoonshotChatOptions implements FunctionCallingOptions, ChatOptions {
41+
public class MoonshotChatOptions implements FunctionCallingOptions {
4342

4443
/**
4544
* ID of the model to use

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.fasterxml.jackson.annotation.JsonInclude.Include;
3030
import com.fasterxml.jackson.annotation.JsonProperty;
3131

32-
import org.springframework.ai.chat.prompt.ChatOptions;
3332
import org.springframework.ai.embedding.EmbeddingOptions;
3433
import org.springframework.ai.model.ModelOptionsUtils;
3534
import org.springframework.ai.model.function.FunctionCallback;
@@ -48,7 +47,7 @@
4847
* @see <a href="https://github.com/ollama/ollama/blob/main/api/types.go">Ollama Types</a>
4948
*/
5049
@JsonInclude(Include.NON_NULL)
51-
public class OllamaOptions implements FunctionCallingOptions, ChatOptions, EmbeddingOptions {
50+
public class OllamaOptions implements FunctionCallingOptions, EmbeddingOptions {
5251

5352
private static final List<String> NON_SUPPORTED_FIELDS = List.of("model", "format", "keep_alive", "truncate");
5453

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.fasterxml.jackson.annotation.JsonInclude.Include;
3030
import com.fasterxml.jackson.annotation.JsonProperty;
3131

32-
import org.springframework.ai.chat.prompt.ChatOptions;
3332
import org.springframework.ai.model.ModelOptionsUtils;
3433
import org.springframework.ai.model.function.FunctionCallback;
3534
import org.springframework.ai.model.function.FunctionCallingOptions;
@@ -48,7 +47,7 @@
4847
* @since 0.8.0
4948
*/
5049
@JsonInclude(Include.NON_NULL)
51-
public class OpenAiChatOptions implements FunctionCallingOptions, ChatOptions {
50+
public class OpenAiChatOptions implements FunctionCallingOptions {
5251

5352
// @formatter:off
5453
/**

models/spring-ai-vertex-ai-gemini/src/main/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2929
import com.fasterxml.jackson.annotation.JsonProperty;
3030

31-
import org.springframework.ai.chat.prompt.ChatOptions;
3231
import org.springframework.ai.model.function.FunctionCallback;
3332
import org.springframework.ai.model.function.FunctionCallingOptions;
3433
import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel.ChatModel;
@@ -43,7 +42,7 @@
4342
* @since 1.0.0
4443
*/
4544
@JsonInclude(Include.NON_NULL)
46-
public class VertexAiGeminiChatOptions implements FunctionCallingOptions, ChatOptions {
45+
public class VertexAiGeminiChatOptions implements FunctionCallingOptions {
4746

4847
// https://cloud.google.com/vertex-ai/docs/reference/rest/v1/GenerationConfig
4948

models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2828
import com.fasterxml.jackson.annotation.JsonProperty;
2929

30-
import org.springframework.ai.chat.prompt.ChatOptions;
3130
import org.springframework.ai.model.function.FunctionCallback;
3231
import org.springframework.ai.model.function.FunctionCallingOptions;
3332
import org.springframework.ai.zhipuai.api.ZhiPuAiApi;
@@ -41,7 +40,7 @@
4140
* @since 1.0.0 M1
4241
*/
4342
@JsonInclude(Include.NON_NULL)
44-
public class ZhiPuAiChatOptions implements FunctionCallingOptions, ChatOptions {
43+
public class ZhiPuAiChatOptions implements FunctionCallingOptions {
4544

4645
// @formatter:off
4746
/**

0 commit comments

Comments
 (0)