allow multiple ordered customizers (like the RestClientCustomizer)

Author: Manuel Andreo Garcia

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

@@ -74,7 +74,7 @@ public OpenAIClientBuilderCustomizer openAIClientBuilderCustomizer() {
 	@Bean
 	@ConditionalOnMissingBean // ({ OpenAIClient.class, TokenCredential.class })
 	public OpenAIClientBuilder openAIClientBuilder(AzureOpenAiConnectionProperties connectionProperties,
-			OpenAIClientBuilderCustomizer customizer) {
+			ObjectProvider<OpenAIClientBuilderCustomizer> customizers) {
 
 		if (StringUtils.hasText(connectionProperties.getApiKey())) {
 
@@ -89,7 +89,7 @@ public OpenAIClientBuilder openAIClientBuilder(AzureOpenAiConnectionProperties c
 			OpenAIClientBuilder clientBuilder = new OpenAIClientBuilder().endpoint(connectionProperties.getEndpoint())
 				.credential(new AzureKeyCredential(connectionProperties.getApiKey()))
 				.clientOptions(clientOptions);
-			customizer.customize(clientBuilder);
+			applyOpenAIClientBuilderCustomizers(clientBuilder, customizers);
 			return clientBuilder;
 		}
 
@@ -99,7 +99,7 @@ public OpenAIClientBuilder openAIClientBuilder(AzureOpenAiConnectionProperties c
 			OpenAIClientBuilder clientBuilder = new OpenAIClientBuilder().endpoint("https://api.openai.com/v1")
 				.credential(new KeyCredential(connectionProperties.getOpenAiApiKey()))
 				.clientOptions(new ClientOptions().setApplicationId(APPLICATION_ID));
-			customizer.customize(clientBuilder);
+			applyOpenAIClientBuilderCustomizers(clientBuilder, customizers);
 			return clientBuilder;
 		}
 
@@ -110,15 +110,15 @@ public OpenAIClientBuilder openAIClientBuilder(AzureOpenAiConnectionProperties c
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(TokenCredential.class)
 	public OpenAIClientBuilder openAIClientWithTokenCredential(AzureOpenAiConnectionProperties connectionProperties,
-			TokenCredential tokenCredential, OpenAIClientBuilderCustomizer customizer) {
+			TokenCredential tokenCredential, ObjectProvider<OpenAIClientBuilderCustomizer> customizers) {
 
 		Assert.notNull(tokenCredential, "TokenCredential must not be null");
 		Assert.hasText(connectionProperties.getEndpoint(), "Endpoint must not be empty");
 
 		OpenAIClientBuilder clientBuilder = new OpenAIClientBuilder().endpoint(connectionProperties.getEndpoint())
 			.credential(tokenCredential)
 			.clientOptions(new ClientOptions().setApplicationId(APPLICATION_ID));
-		customizer.customize(clientBuilder);
+		applyOpenAIClientBuilderCustomizers(clientBuilder, customizers);
 		return clientBuilder;
 	}
 
@@ -184,4 +184,9 @@ public AzureOpenAiAudioTranscriptionModel azureOpenAiAudioTranscriptionModel(Ope
 		return new AzureOpenAiAudioTranscriptionModel(openAIClient.buildClient(), audioProperties.getOptions());
 	}
 
+	private void applyOpenAIClientBuilderCustomizers(OpenAIClientBuilder clientBuilder,
+			ObjectProvider<OpenAIClientBuilderCustomizer> customizers) {
+		customizers.orderedStream().forEach(customizer -> customizer.customize(clientBuilder));
+	}
+
 }

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/azure/AzureOpenAiAutoConfigurationIT.java

@@ -232,13 +232,17 @@ void audioTranscriptionActivation() {
 
 	@Test
 	void openAIClientBuilderCustomizer() {
-		AtomicBoolean customized = new AtomicBoolean(false);
+		AtomicBoolean firstCustomizationApplied = new AtomicBoolean(false);
+		AtomicBoolean secondCustomizationApplied = new AtomicBoolean(false);
 		this.contextRunner
-			.withBean(OpenAIClientBuilderCustomizer.class,
-					(OpenAIClientBuilderCustomizer) clientBuilder -> customized.set(true))
+			.withBean("first", OpenAIClientBuilderCustomizer.class,
+					() -> clientBuilder -> firstCustomizationApplied.set(true))
+			.withBean("second", OpenAIClientBuilderCustomizer.class,
+					() -> clientBuilder -> secondCustomizationApplied.set(true))
 			.run(context -> {
 				context.getBean(OpenAIClientBuilder.class);
-				assertThat(customized.get()).isEqualTo(true);
+				assertThat(firstCustomizationApplied.get()).isTrue();
+				assertThat(secondCustomizationApplied.get()).isTrue();
 			});
 	}