MS Entra authentication

document-readers/tika-reader/pom.xml

@@ -41,6 +41,12 @@
 			<groupId>org.apache.tika</groupId>
 			<artifactId>tika-parsers-standard-package</artifactId>
 			<version>${tika.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 

spring-ai-spring-boot-autoconfigure/pom.xml

@@ -223,6 +223,14 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>com.azure.spring</groupId>
+			<artifactId>spring-cloud-azure-starter-active-directory</artifactId>
+			<version>5.8.0</version>
+		</dependency>
+
+		<!-- test dependencies -->
+
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-mongodb-atlas-store</artifactId>

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

@@ -5,7 +5,7 @@
  * 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
+ *      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,
@@ -22,6 +22,12 @@
 import com.azure.core.credential.AzureKeyCredential;
 import com.azure.core.util.ClientOptions;
 
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.http.policy.HttpLogOptions;
+import com.azure.core.management.AzureEnvironment;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.identity.ClientSecretCredentialBuilder;
 import org.springframework.ai.azure.openai.AzureOpenAiChatClient;
 import org.springframework.ai.azure.openai.AzureOpenAiEmbeddingClient;
 import org.springframework.ai.model.function.FunctionCallback;
@@ -46,13 +52,50 @@ public class AzureOpenAiAutoConfiguration {
 	@ConditionalOnMissingBean
 	public OpenAIClient openAIClient(AzureOpenAiConnectionProperties connectionProperties) {
 
-		Assert.hasText(connectionProperties.getApiKey(), "API key must not be empty");
-		Assert.hasText(connectionProperties.getEndpoint(), "Endpoint must not be empty");
+		HttpLogOptions options = new HttpLogOptions();
+		if (connectionProperties.getEnableLog()) {
+			HttpLogDetailLevel level = HttpLogDetailLevel.BODY_AND_HEADERS;
+			options.setLogLevel(level);
+			options.setPrettyPrintBody(true);
+		}
+
+		/*
+		 * https://learn.microsoft.com/en-us/azure/databricks/dev-tools/service-prin-aad-
+		 * token
+		 */
+		if ("entra".equals(connectionProperties.getAuthType())) {
+			Assert.hasText(connectionProperties.getEndpoint(), "Endpoint must not be empty");
+			Assert.hasText(connectionProperties.getClientId(), "Client ID must not be empty");
+			Assert.hasText(connectionProperties.getClientSecret(), "Client Secret must not be empty");
+			Assert.hasText(connectionProperties.getTenantId(), "Tenant ID must not be empty");
+
+			AzureProfile azureProfile = new AzureProfile(AzureEnvironment.AZURE);
+
+			TokenCredential tokenCredential = new ClientSecretCredentialBuilder()
+				.clientId(connectionProperties.getClientId())
+				.clientSecret(connectionProperties.getClientSecret())
+				.tenantId(connectionProperties.getTenantId())
+				.authorityHost(azureProfile.getEnvironment().getActiveDirectoryEndpoint())
+				.build();
 
-		return new OpenAIClientBuilder().endpoint(connectionProperties.getEndpoint())
-			.credential(new AzureKeyCredential(connectionProperties.getApiKey()))
-			.clientOptions(new ClientOptions().setApplicationId("spring-ai"))
-			.buildClient();
+			return new OpenAIClientBuilder().httpLogOptions(options)
+				.endpoint(connectionProperties.getEndpoint())
+				.credential(tokenCredential)
+				.clientOptions(new ClientOptions().setApplicationId("spring-ai"))
+				.buildClient();
+		}
+		else {
+			Assert.hasText(connectionProperties.getApiKey(), "API key must not be empty");
+			Assert.hasText(connectionProperties.getEndpoint(), "Endpoint must not be empty");
+
+			AzureKeyCredential keyCredential = new AzureKeyCredential(connectionProperties.getApiKey());
+
+			return new OpenAIClientBuilder().httpLogOptions(options)
+				.endpoint(connectionProperties.getEndpoint())
+				.credential(keyCredential)
+				.clientOptions(new ClientOptions().setApplicationId("spring-ai"))
+				.buildClient();
+		}
 	}
 
 	@Bean

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

@@ -34,6 +34,44 @@ public class AzureOpenAiConnectionProperties {
 	 */
 	private String endpoint;
 
+	/**
+	 * Azure OpenAI API authType. From the Azure AI OpenAI `Keys and Endpoint` section
+	 * under `Resource Management`.
+	 */
+	private String authType;
+
+	/**
+	 * Azure OpenAI API clientId. From the Azure AI OpenAI `Keys and Endpoint` section
+	 * under `Resource Management`.
+	 */
+	private String clientId;
+
+	/**
+	 * Azure OpenAI API clientSecret. From the Azure AI OpenAI `Keys and Endpoint` section
+	 * under `Resource Management`.
+	 */
+	private String clientSecret;
+
+	/**
+	 * Azure OpenAI API tenantId. From the Azure AI OpenAI `Keys and Endpoint` section
+	 * under `Resource Management`.
+	 */
+	private String tenantId;
+
+	/**
+	 * Azure OpenAI API enableLog. From the Azure AI OpenAI `Keys and Endpoint` section
+	 * under `Resource Management`.
+	 */
+	private Boolean enableLog;
+
+	public void setApiKey(String apiKey) {
+		this.apiKey = apiKey;
+	}
+
+	public String getApiKey() {
+		return apiKey;
+	}
+
 	public String getEndpoint() {
 		return endpoint;
 	}
@@ -42,12 +80,44 @@ public void setEndpoint(String endpoint) {
 		this.endpoint = endpoint;
 	}
 
-	public void setApiKey(String apiKey) {
-		this.apiKey = apiKey;
+	public String getAuthType() {
+		return authType;
 	}
 
-	public String getApiKey() {
-		return apiKey;
+	public void setAuthType(String authType) {
+		this.authType = authType;
+	}
+
+	public String getClientId() {
+		return clientId;
+	}
+
+	public void setClientId(String clientId) {
+		this.clientId = clientId;
+	}
+
+	public String getClientSecret() {
+		return clientSecret;
+	}
+
+	public void setClientSecret(String clientSecret) {
+		this.clientSecret = clientSecret;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public Boolean getEnableLog() {
+		return enableLog;
+	}
+
+	public void setEnableLog(Boolean enableLog) {
+		this.enableLog = enableLog;
 	}
 
 }