Add support for OpenAI Java SDK (official Java library from OpenAI)

.gitignore

@@ -3,6 +3,7 @@ target
 .classpath
 .project
 .settings
+.env
 bin
 build.log
 integration-repo
@@ -55,4 +56,3 @@ tmp
 
 
 plans
-

auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/tool/FunctionCallWithFunctionBeanIT.java

@@ -118,7 +118,7 @@ public Function<Request, Response> weatherFunction() {
 		@Bean
 		public Function<MockWeatherService.Request, MockWeatherService.Response> weatherFunction3() {
 			MockWeatherService weatherService = new MockWeatherService();
-			return (weatherService::apply);
+			return weatherService::apply;
 		}
 
 	}

auto-configurations/models/spring-ai-autoconfigure-model-openai-sdk/pom.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.ai</groupId>
+		<artifactId>spring-ai-parent</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+	</parent>
+	<artifactId>spring-ai-autoconfigure-model-openai-sdk</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring AI OpenAI SDK Auto Configuration</name>
+	<description>Spring AI OpenAI SDK Auto Configuration</description>
+	<url>https://github.com/spring-projects/spring-ai</url>
+
+	<scm>
+		<url>https://github.com/spring-projects/spring-ai</url>
+		<connection>git://github.com/spring-projects/spring-ai.git</connection>
+		<developerConnection>git@github.com:spring-projects/spring-ai.git</developerConnection>
+	</scm>
+
+
+	<dependencies>
+
+		<!-- Spring AI dependencies -->
+
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-openai-sdk</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
+		<!-- Spring AI auto configurations -->
+
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-autoconfigure-model-tool</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-autoconfigure-model-chat-observation</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-autoconfigure-model-embedding-observation</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-autoconfigure-model-image-observation</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
+		<!-- Boot dependencies -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- Non Spring Boot dependencies -->
+
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-reflect</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- Test dependencies -->
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-test</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-autoconfigure-model-chat-client</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+</project>

auto-configurations/models/spring-ai-autoconfigure-model-openai-sdk/src/main/java/org/springframework/ai/model/openaisdk/autoconfigure/OpenAiSdkAutoConfigurationUtil.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.model.openaisdk.autoconfigure;
+
+import org.springframework.ai.openaisdk.AbstractOpenAiSdkOptions;
+import org.springframework.util.StringUtils;
+
+public final class OpenAiSdkAutoConfigurationUtil {
+
+	private OpenAiSdkAutoConfigurationUtil() {
+		// Avoids instantiation
+	}
+
+	public static ResolvedConnectionProperties resolveConnectionProperties(AbstractOpenAiSdkOptions commonProperties,
+			AbstractOpenAiSdkOptions modelProperties) {
+
+		var resolved = new ResolvedConnectionProperties();
+
+		resolved.setBaseUrl(StringUtils.hasText(modelProperties.getBaseUrl()) ? modelProperties.getBaseUrl()
+				: commonProperties.getBaseUrl());
+
+		resolved.setApiKey(StringUtils.hasText(modelProperties.getApiKey()) ? modelProperties.getApiKey()
+				: commonProperties.getApiKey());
+
+		String organizationId = StringUtils.hasText(modelProperties.getOrganizationId())
+				? modelProperties.getOrganizationId() : commonProperties.getOrganizationId();
+		resolved.setOrganizationId(organizationId);
+
+		resolved.setCredential(modelProperties.getCredential() != null ? modelProperties.getCredential()
+				: commonProperties.getCredential());
+
+		resolved.setTimeout(
+				modelProperties.getTimeout() != null ? modelProperties.getTimeout() : commonProperties.getTimeout());
+
+		resolved.setModel(StringUtils.hasText(modelProperties.getModel()) ? modelProperties.getModel()
+				: commonProperties.getModel());
+
+		resolved.setMicrosoftDeploymentName(StringUtils.hasText(modelProperties.getMicrosoftDeploymentName())
+				? modelProperties.getMicrosoftDeploymentName() : commonProperties.getMicrosoftDeploymentName());
+
+		resolved.setMicrosoftFoundryServiceVersion(modelProperties.getMicrosoftFoundryServiceVersion() != null
+				? modelProperties.getMicrosoftFoundryServiceVersion()
+				: commonProperties.getMicrosoftFoundryServiceVersion());
+
+		// For boolean properties, use modelProperties value, defaulting to
+		// commonProperties if needed
+		resolved.setMicrosoftFoundry(modelProperties.isMicrosoftFoundry() || commonProperties.isMicrosoftFoundry());
+
+		resolved.setGitHubModels(modelProperties.isGitHubModels() || commonProperties.isGitHubModels());
+
+		resolved.setMaxRetries(modelProperties.getMaxRetries() != null ? modelProperties.getMaxRetries()
+				: commonProperties.getMaxRetries());
+
+		resolved
+			.setProxy(modelProperties.getProxy() != null ? modelProperties.getProxy() : commonProperties.getProxy());
+
+		resolved.setCustomHeaders(modelProperties.getCustomHeaders() != null ? modelProperties.getCustomHeaders()
+				: commonProperties.getCustomHeaders());
+
+		return resolved;
+	}
+
+	public static class ResolvedConnectionProperties extends AbstractOpenAiSdkOptions {
+
+	}
+
+}

auto-configurations/models/spring-ai-autoconfigure-model-openai-sdk/src/main/java/org/springframework/ai/model/openaisdk/autoconfigure/OpenAiSdkChatAutoConfiguration.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.model.openaisdk.autoconfigure;
+
+import com.openai.client.OpenAIClient;
+import com.openai.client.OpenAIClientAsync;
+import io.micrometer.observation.ObservationRegistry;
+
+import org.springframework.ai.chat.observation.ChatModelObservationConvention;
+import org.springframework.ai.model.SpringAIModelProperties;
+import org.springframework.ai.model.SpringAIModels;
+import org.springframework.ai.model.tool.DefaultToolExecutionEligibilityPredicate;
+import org.springframework.ai.model.tool.ToolCallingManager;
+import org.springframework.ai.model.tool.ToolExecutionEligibilityPredicate;
+import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
+import org.springframework.ai.openaisdk.AbstractOpenAiSdkOptions;
+import org.springframework.ai.openaisdk.OpenAiSdkChatModel;
+import org.springframework.ai.openaisdk.setup.OpenAiSdkSetup;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Chat {@link AutoConfiguration Auto-configuration} for OpenAI SDK.
+ *
+ * @author Christian Tzolov
+ */
+@AutoConfiguration(after = { ToolCallingAutoConfiguration.class })
+@EnableConfigurationProperties({ OpenAiSdkConnectionProperties.class, OpenAiSdkChatProperties.class })
+@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.OPENAI_SDK,
+		matchIfMissing = true)
+public class OpenAiSdkChatAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public OpenAiSdkChatModel openAiChatModel(OpenAiSdkConnectionProperties commonProperties,
+			OpenAiSdkChatProperties chatProperties, ToolCallingManager toolCallingManager,
+			ObjectProvider<ObservationRegistry> observationRegistry,
+			ObjectProvider<ChatModelObservationConvention> observationConvention,
+			ObjectProvider<ToolExecutionEligibilityPredicate> openAiToolExecutionEligibilityPredicate) {
+
+		OpenAiSdkAutoConfigurationUtil.ResolvedConnectionProperties resolvedConnectionProperties = OpenAiSdkAutoConfigurationUtil
+			.resolveConnectionProperties(commonProperties, chatProperties);
+
+		OpenAIClient openAIClient = this.openAiClient(resolvedConnectionProperties);
+
+		OpenAIClientAsync openAIClientAsync = this.openAiClientAsync(resolvedConnectionProperties);
+
+		var chatModel = new OpenAiSdkChatModel(openAIClient, openAIClientAsync, chatProperties.getOptions(),
+				toolCallingManager, observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP),
+				openAiToolExecutionEligibilityPredicate.getIfUnique(DefaultToolExecutionEligibilityPredicate::new));
+
+		observationConvention.ifAvailable(chatModel::setObservationConvention);
+
+		return chatModel;
+	}
+
+	private OpenAIClient openAiClient(AbstractOpenAiSdkOptions resolved) {
+
+		return OpenAiSdkSetup.setupSyncClient(resolved.getBaseUrl(), resolved.getApiKey(), resolved.getCredential(),
+				resolved.getMicrosoftDeploymentName(), resolved.getMicrosoftFoundryServiceVersion(),
+				resolved.getOrganizationId(), resolved.isMicrosoftFoundry(), resolved.isGitHubModels(),
+				resolved.getModel(), resolved.getTimeout(), resolved.getMaxRetries(), resolved.getProxy(),
+				resolved.getCustomHeaders());
+	}
+
+	private OpenAIClientAsync openAiClientAsync(AbstractOpenAiSdkOptions resolved) {
+
+		return OpenAiSdkSetup.setupAsyncClient(resolved.getBaseUrl(), resolved.getApiKey(), resolved.getCredential(),
+				resolved.getMicrosoftDeploymentName(), resolved.getMicrosoftFoundryServiceVersion(),
+				resolved.getOrganizationId(), resolved.isMicrosoftFoundry(), resolved.isGitHubModels(),
+				resolved.getModel(), resolved.getTimeout(), resolved.getMaxRetries(), resolved.getProxy(),
+				resolved.getCustomHeaders());
+	}
+
+}

auto-configurations/models/spring-ai-autoconfigure-model-openai-sdk/src/main/java/org/springframework/ai/model/openaisdk/autoconfigure/OpenAiSdkChatProperties.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.model.openaisdk.autoconfigure;
+
+import org.springframework.ai.openaisdk.AbstractOpenAiSdkOptions;
+import org.springframework.ai.openaisdk.OpenAiSdkChatOptions;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+
+/**
+ * OpenAI SDK Chat autoconfiguration properties.
+ *
+ * @author Christian Tzolov
+ */
+@ConfigurationProperties(OpenAiSdkChatProperties.CONFIG_PREFIX)
+public class OpenAiSdkChatProperties extends AbstractOpenAiSdkOptions {
+
+	public static final String CONFIG_PREFIX = "spring.ai.openai-sdk.chat";
+
+	public static final String DEFAULT_CHAT_MODEL = OpenAiSdkChatOptions.DEFAULT_CHAT_MODEL;
+
+	private static final Double DEFAULT_TEMPERATURE = 1.0;
+
+	@NestedConfigurationProperty
+	private final OpenAiSdkChatOptions options = OpenAiSdkChatOptions.builder()
+		.model(DEFAULT_CHAT_MODEL)
+		.temperature(DEFAULT_TEMPERATURE)
+		.build();
+
+	public OpenAiSdkChatOptions getOptions() {
+		return this.options;
+	}
+
+}

auto-configurations/models/spring-ai-autoconfigure-model-openai-sdk/src/main/java/org/springframework/ai/model/openaisdk/autoconfigure/OpenAiSdkConnectionProperties.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.model.openaisdk.autoconfigure;
+
+import org.springframework.ai.openaisdk.AbstractOpenAiSdkOptions;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(OpenAiSdkConnectionProperties.CONFIG_PREFIX)
+public class OpenAiSdkConnectionProperties extends AbstractOpenAiSdkOptions {
+
+	public static final String CONFIG_PREFIX = "spring.ai.openai-sdk";
+
+}