Improve the OpenAi Audio code structure

 - Move the OpenAiAudioTranscriptionClient and OpenAiAudioTranscriptionOptions under the org.springframework.ai.openai package.
 - Rename the AudioTranscriptionRequest into AudioTranscriptionPrompt.
 - Minor imports cleaning.

Author: tzolov

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/audio/transcription/OpenAiAudioTranscriptionClient.java renamed to models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioTranscriptionClient.java

@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package org.springframework.ai.openai.audio.transcription;
+package org.springframework.ai.openai;
 
 import java.time.Duration;
 
@@ -26,6 +26,9 @@
 import org.springframework.ai.openai.api.OpenAiAudioApi;
 import org.springframework.ai.openai.api.OpenAiAudioApi.StructuredResponse;
 import org.springframework.ai.openai.api.common.OpenAiApiException;
+import org.springframework.ai.openai.audio.transcription.AudioTranscription;
+import org.springframework.ai.openai.audio.transcription.AudioTranscriptionPrompt;
+import org.springframework.ai.openai.audio.transcription.AudioTranscriptionResponse;
 import org.springframework.ai.openai.metadata.audio.OpenAiAudioTranscriptionResponseMetadata;
 import org.springframework.ai.openai.metadata.support.OpenAiResponseHeaderExtractor;
 import org.springframework.core.io.Resource;
@@ -42,7 +45,7 @@
  * @since 0.8.1
  */
 public class OpenAiAudioTranscriptionClient
-		implements ModelClient<AudioTranscriptionRequest, AudioTranscriptionResponse> {
+		implements ModelClient<AudioTranscriptionPrompt, AudioTranscriptionResponse> {
 
 	private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -73,12 +76,12 @@ public OpenAiAudioTranscriptionClient(OpenAiAudioApi audioApi, OpenAiAudioTransc
 	}
 
 	public String call(Resource audioResource) {
-		AudioTranscriptionRequest transcriptionRequest = new AudioTranscriptionRequest(audioResource);
+		AudioTranscriptionPrompt transcriptionRequest = new AudioTranscriptionPrompt(audioResource);
 		return call(transcriptionRequest).getResult().getOutput();
 	}
 
 	@Override
-	public AudioTranscriptionResponse call(AudioTranscriptionRequest request) {
+	public AudioTranscriptionResponse call(AudioTranscriptionPrompt request) {
 
 		return this.retryTemplate.execute(ctx -> {
 
@@ -130,7 +133,7 @@ public AudioTranscriptionResponse call(AudioTranscriptionRequest request) {
 		});
 	}
 
-	OpenAiAudioApi.TranscriptionRequest createRequestBody(AudioTranscriptionRequest request) {
+	OpenAiAudioApi.TranscriptionRequest createRequestBody(AudioTranscriptionPrompt request) {
 
 		OpenAiAudioTranscriptionOptions options = this.defaultOptions;
 

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/audio/transcription/OpenAiAudioTranscriptionOptions.java renamed to models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioTranscriptionOptions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.openai.audio.transcription;
+package org.springframework.ai.openai;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/audio/transcription/AudioTranscriptionRequest.java renamed to models/spring-ai-openai/src/main/java/org/springframework/ai/openai/audio/transcription/AudioTranscriptionPrompt.java

@@ -24,17 +24,17 @@
  * @author Michael Lavelle
  * @since 0.8.1
  */
-public class AudioTranscriptionRequest implements ModelRequest<Resource> {
+public class AudioTranscriptionPrompt implements ModelRequest<Resource> {
 
 	private Resource audioResource;
 
 	private ModelOptions modelOptions;
 
-	public AudioTranscriptionRequest(Resource audioResource) {
+	public AudioTranscriptionPrompt(Resource audioResource) {
 		this.audioResource = audioResource;
 	}
 
-	public AudioTranscriptionRequest(Resource audioResource, ModelOptions modelOptions) {
+	public AudioTranscriptionPrompt(Resource audioResource, ModelOptions modelOptions) {
 		this.audioResource = audioResource;
 		this.modelOptions = modelOptions;
 	}

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/metadata/audio/OpenAiAudioTranscriptionResponseMetadata.java

@@ -27,7 +27,7 @@
 /**
  * Audio transcription metadata implementation for {@literal OpenAI}.
  *
- * @author MichaelLavelle
+ * @author Michael Lavelle
  * @since 0.8.1
  * @see RateLimit
  */

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/OpenAiTestConfiguration.java

@@ -4,7 +4,6 @@
 import org.springframework.ai.openai.api.OpenAiApi;
 import org.springframework.ai.openai.api.OpenAiAudioApi;
 import org.springframework.ai.openai.api.OpenAiImageApi;
-import org.springframework.ai.openai.audio.transcription.OpenAiAudioTranscriptionClient;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.util.StringUtils;

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/transcription/OpenAiTranscriptionClientIT.java

@@ -3,11 +3,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
+import org.springframework.ai.openai.OpenAiAudioTranscriptionOptions;
 import org.springframework.ai.openai.OpenAiTestConfiguration;
 import org.springframework.ai.openai.api.OpenAiAudioApi;
 import org.springframework.ai.openai.api.OpenAiAudioApi.TranscriptResponseFormat;
-import org.springframework.ai.openai.audio.transcription.AudioTranscriptionRequest;
-import org.springframework.ai.openai.audio.transcription.AudioTranscriptionResponse;
 import org.springframework.ai.openai.testutils.AbstractIT;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -28,7 +27,7 @@ void transcriptionTest() {
 			.withResponseFormat(TranscriptResponseFormat.TEXT)
 			.withTemperature(0f)
 			.build();
-		AudioTranscriptionRequest transcriptionRequest = new AudioTranscriptionRequest(audioFile, transcriptionOptions);
+		AudioTranscriptionPrompt transcriptionRequest = new AudioTranscriptionPrompt(audioFile, transcriptionOptions);
 		AudioTranscriptionResponse response = openAiTranscriptionClient.call(transcriptionRequest);
 		assertThat(response.getResults()).hasSize(1);
 		assertThat(response.getResults().get(0).getOutput().toLowerCase().contains("fellow")).isTrue();
@@ -44,7 +43,7 @@ void transcriptionTestWithOptions() {
 			.withTemperature(0f)
 			.withResponseFormat(responseFormat)
 			.build();
-		AudioTranscriptionRequest transcriptionRequest = new AudioTranscriptionRequest(audioFile, transcriptionOptions);
+		AudioTranscriptionPrompt transcriptionRequest = new AudioTranscriptionPrompt(audioFile, transcriptionOptions);
 		AudioTranscriptionResponse response = openAiTranscriptionClient.call(transcriptionRequest);
 		assertThat(response.getResults()).hasSize(1);
 		assertThat(response.getResults().get(0).getOutput().toLowerCase().contains("fellow")).isTrue();

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/transcription/OpenAiTranscriptionClientWithTranscriptionResponseMetadataTests.java

@@ -22,9 +22,8 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ai.chat.metadata.RateLimit;
+import org.springframework.ai.openai.OpenAiAudioTranscriptionClient;
 import org.springframework.ai.openai.api.OpenAiAudioApi;
-import org.springframework.ai.openai.audio.transcription.AudioTranscriptionRequest;
-import org.springframework.ai.openai.audio.transcription.AudioTranscriptionResponse;
 import org.springframework.ai.openai.metadata.audio.OpenAiAudioTranscriptionMetadata;
 import org.springframework.ai.openai.metadata.audio.OpenAiAudioTranscriptionResponseMetadata;
 import org.springframework.ai.openai.metadata.support.OpenAiApiResponseHeaders;
@@ -72,7 +71,7 @@ void aiResponseContainsAiMetadata() {
 
 		Resource audioFile = new ClassPathResource("speech/jfk.flac");
 
-		AudioTranscriptionRequest transcriptionRequest = new AudioTranscriptionRequest(audioFile);
+		AudioTranscriptionPrompt transcriptionRequest = new AudioTranscriptionPrompt(audioFile);
 
 		AudioTranscriptionResponse response = this.openAiTranscriptionClient.call(transcriptionRequest);
 

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/transcription/TranscriptionClientTests.java

@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import org.springframework.ai.openai.OpenAiAudioTranscriptionClient;
 import org.springframework.core.io.Resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -64,19 +65,19 @@ void transcrbeRequestReturnsResponseCorrectly() {
 
 		doAnswer(invocationOnMock -> {
 
-			AudioTranscriptionRequest transcriptionRequest = invocationOnMock.getArgument(0);
+			AudioTranscriptionPrompt transcriptionRequest = invocationOnMock.getArgument(0);
 
 			assertThat(transcriptionRequest).isNotNull();
 			assertThat(transcriptionRequest.getInstructions()).isEqualTo(mockAudioFile);
 
 			return response;
 
-		}).when(mockClient).call(any(AudioTranscriptionRequest.class));
+		}).when(mockClient).call(any(AudioTranscriptionPrompt.class));
 
 		assertThat(mockClient.call(mockAudioFile)).isEqualTo(mockTranscription);
 
 		verify(mockClient, times(1)).call(eq(mockAudioFile));
-		verify(mockClient, times(1)).call(isA(AudioTranscriptionRequest.class));
+		verify(mockClient, times(1)).call(isA(AudioTranscriptionPrompt.class));
 		verify(response, times(1)).getResult();
 		verify(transcript, times(1)).getOutput();
 		verifyNoMoreInteractions(mockClient, transcript, response);

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/testutils/AbstractIT.java

@@ -14,7 +14,7 @@
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.image.ImageClient;
-import org.springframework.ai.openai.audio.transcription.OpenAiAudioTranscriptionClient;
+import org.springframework.ai.openai.OpenAiAudioTranscriptionClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAudioTranscriptionProperties.java

@@ -16,8 +16,8 @@
 
 package org.springframework.ai.autoconfigure.openai;
 
+import org.springframework.ai.openai.OpenAiAudioTranscriptionOptions;
 import org.springframework.ai.openai.api.OpenAiAudioApi;
-import org.springframework.ai.openai.audio.transcription.OpenAiAudioTranscriptionOptions;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java

@@ -21,13 +21,13 @@
 import org.springframework.ai.embedding.EmbeddingClient;
 import org.springframework.ai.model.function.FunctionCallback;
 import org.springframework.ai.model.function.FunctionCallbackContext;
+import org.springframework.ai.openai.OpenAiAudioTranscriptionClient;
 import org.springframework.ai.openai.OpenAiChatClient;
 import org.springframework.ai.openai.OpenAiEmbeddingClient;
 import org.springframework.ai.openai.OpenAiImageClient;
 import org.springframework.ai.openai.api.OpenAiApi;
 import org.springframework.ai.openai.api.OpenAiAudioApi;
 import org.springframework.ai.openai.api.OpenAiImageApi;
-import org.springframework.ai.openai.audio.transcription.OpenAiAudioTranscriptionClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfigurationIT.java

@@ -28,13 +28,13 @@
 import org.springframework.ai.image.ImagePrompt;
 import org.springframework.ai.image.ImageResponse;
 import org.springframework.ai.openai.OpenAiImageClient;
-import org.springframework.ai.openai.audio.transcription.OpenAiAudioTranscriptionClient;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import reactor.core.publisher.Flux;
 
 import org.springframework.ai.chat.ChatResponse;
 import org.springframework.ai.embedding.EmbeddingResponse;
+import org.springframework.ai.openai.OpenAiAudioTranscriptionClient;
 import org.springframework.ai.openai.OpenAiChatClient;
 import org.springframework.ai.openai.OpenAiEmbeddingClient;
 import org.springframework.boot.autoconfigure.AutoConfigurations;