From df92dff36a1927ce5f4b11db4095266eceb07c9a Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Fri, 19 Apr 2024 18:43:42 +0200 Subject: [PATCH] Fix OpenAI audio options merging order Resolves #601 --- .../org/springframework/ai/openai/OpenAiAudioSpeechClient.java | 2 +- .../ai/openai/OpenAiAudioTranscriptionClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioSpeechClient.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioSpeechClient.java index 864656875..fc4575440 100644 --- a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioSpeechClient.java +++ b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioSpeechClient.java @@ -133,7 +133,7 @@ public class OpenAiAudioSpeechClient implements SpeechClient, StreamingSpeechCli if (request.getOptions() != null) { if (request.getOptions() instanceof OpenAiAudioSpeechOptions runtimeOptions) { - options = this.merge(options, runtimeOptions); + options = this.merge(runtimeOptions, options); } else { throw new IllegalArgumentException("Prompt options are not of type SpeechOptions: " diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioTranscriptionClient.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioTranscriptionClient.java index b99c7cca6..e021571e0 100644 --- a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioTranscriptionClient.java +++ b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioTranscriptionClient.java @@ -178,7 +178,7 @@ public class OpenAiAudioTranscriptionClient if (request.getOptions() != null) { if (request.getOptions() instanceof OpenAiAudioTranscriptionOptions runtimeOptions) { - options = this.merge(options, runtimeOptions); + options = this.merge(runtimeOptions, options); } else { throw new IllegalArgumentException("Prompt options are not of type TranscriptionOptions: "