From 8510f00520aeb4b89c4c9bd2d0a31930ecc1c747 Mon Sep 17 00:00:00 2001 From: Ricken Bazolo Date: Thu, 21 Mar 2024 09:41:26 +0100 Subject: [PATCH] Fix OpenAiApi tool_choice value and refactor MistralAi class --- .../java/org/springframework/ai/mistralai/api/MistralAiApi.java | 2 +- ...ingHelper.java => MistralAiStreamFunctionCallingHelper.java} | 2 +- .../main/java/org/springframework/ai/openai/api/OpenAiApi.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/{MIstralAiStreamFunctionCallingHelper.java => MistralAiStreamFunctionCallingHelper.java} (99%) diff --git a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java index bdf6efea8..19ba2ac52 100644 --- a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java +++ b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java @@ -705,7 +705,7 @@ public class MistralAiApi { .toEntity(ChatCompletion.class); } - private MIstralAiStreamFunctionCallingHelper chunkMerger = new MIstralAiStreamFunctionCallingHelper(); + private MistralAiStreamFunctionCallingHelper chunkMerger = new MistralAiStreamFunctionCallingHelper(); /** * Creates a streaming chat response for the given chat conversation. diff --git a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MIstralAiStreamFunctionCallingHelper.java b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiStreamFunctionCallingHelper.java similarity index 99% rename from models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MIstralAiStreamFunctionCallingHelper.java rename to models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiStreamFunctionCallingHelper.java index 6165ce900..50cd22353 100644 --- a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MIstralAiStreamFunctionCallingHelper.java +++ b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiStreamFunctionCallingHelper.java @@ -37,7 +37,7 @@ import org.springframework.util.CollectionUtils; * @author Christian Tzolov * @since 0.8.1 */ -public class MIstralAiStreamFunctionCallingHelper { +public class MistralAiStreamFunctionCallingHelper { /** * Merge the previous and current ChatCompletionChunk into a single one. diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java index 2294ce5e5..0ad2bcf0f 100644 --- a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java +++ b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java @@ -380,7 +380,7 @@ public class OpenAiApi { /** * Model can pick between generating a message or calling a function. */ - public static final String AUTO = "none"; + public static final String AUTO = "auto"; /** * Model will not call a function and instead generates a message */