Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Azure option merging bug

Browse Source
This commit is contained in:
Christian Tzolov
2024-02-22 18:33:12 +01:00
parent d8fc01f27a
commit 272ed099ed
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatClient.java
View File

@@ -279,7 +279,7 @@ public class AzureOpenAiChatClient implements ChatClient, StreamingChatClient {
}
ChatCompletionsOptions mergedAzureOptions = new ChatCompletionsOptions(azureOptions.getMessages());
mergedAzureOptions.setStream(azureOptions.isStream());
mergedAzureOptions = merge(azureOptions, mergedAzureOptions);
if (springAiOptions.getMaxTokens() != null) {
mergedAzureOptions.setMaxTokens(springAiOptions.getMaxTokens());
@@ -324,4 +324,47 @@ public class AzureOpenAiChatClient implements ChatClient, StreamingChatClient {
return mergedAzureOptions;
}
private ChatCompletionsOptions merge(ChatCompletionsOptions fromOptions, ChatCompletionsOptions toOptions) {
if (fromOptions == null) {
return toOptions;
}
ChatCompletionsOptions mergedOptions = new ChatCompletionsOptions(toOptions.getMessages());
mergedOptions.setStream(toOptions.isStream());
if (fromOptions.getMaxTokens() != null) {
mergedOptions.setMaxTokens(fromOptions.getMaxTokens());
}
if (fromOptions.getLogitBias() != null) {
mergedOptions.setLogitBias(fromOptions.getLogitBias());
}
if (fromOptions.getStop() != null) {
mergedOptions.setStop(fromOptions.getStop());
}
if (fromOptions.getTemperature() != null) {
mergedOptions.setTemperature(fromOptions.getTemperature());
}
if (fromOptions.getTopP() != null) {
mergedOptions.setTopP(fromOptions.getTopP());
}
if (fromOptions.getFrequencyPenalty() != null) {
mergedOptions.setFrequencyPenalty(fromOptions.getFrequencyPenalty());
}
if (fromOptions.getPresencePenalty() != null) {
mergedOptions.setPresencePenalty(fromOptions.getPresencePenalty());
}
if (fromOptions.getN() != null) {
mergedOptions.setN(fromOptions.getN());
}
if (fromOptions.getUser() != null) {
mergedOptions.setUser(fromOptions.getUser());
}
if (fromOptions.getModel() != null) {
mergedOptions.setModel(fromOptions.getModel());
}
return mergedOptions;
}
}