Projects Client - Get Azure OpenAI should use the parent resource unless caller provides a connection name (#45790)

Author: jayantjha

sdk/ai/azure-ai-projects/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Projects Client: Get Azure OpenAI should use the parent resource unless caller provides a connection name
+
 ### Other Changes
 
 ## 1.0.0-beta.2 (2025-06-17)

sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/AIProjectClientBuilder.java

@@ -52,6 +52,8 @@
 import com.openai.azure.AzureOpenAIServiceVersion;
 import com.openai.client.okhttp.OpenAIOkHttpClient;
 import com.openai.credential.BearerTokenCredential;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -419,31 +421,36 @@ private OpenAIOkHttpClient.Builder createOpenAIOkHttpClientDelegateBuilder() {
         OpenAIOkHttpClient.Builder builder = OpenAIOkHttpClient.builder();
         ConnectionsClient connectionsClient = this.buildConnectionsClient();
         if (openAIConnectionName == null) {
-            throw LOGGER.logExceptionAsError(new IllegalArgumentException("OpenAI connection name is not set."));
-        }
-        Connection connection = connectionsClient.getConnection(openAIConnectionName, true);
-        if (connection.getType() != ConnectionType.AZURE_OPEN_AI) {
-            throw LOGGER.logExceptionAsError(new IllegalArgumentException("The connection is not of type OPENAI."));
-        }
-        String azureOpenAIEndpoint = connection.getTarget();
-        if (azureOpenAIEndpoint.endsWith("/")) {
-            azureOpenAIEndpoint = azureOpenAIEndpoint.substring(0, azureOpenAIEndpoint.length() - 1);
-        }
-        builder.baseUrl(azureOpenAIEndpoint);
-        BaseCredentials credentials = connection.getCredentials();
-        if (credentials.getType() == CredentialType.API_KEY && credentials instanceof ApiKeyCredentials) {
-            String apiKey = ((ApiKeyCredentials) credentials).getApiKey();
-            builder.apiKey(apiKey);
-        } else if (credentials.getType() == CredentialType.ENTRA_ID) {
-            if (tokenCredential == null) {
-                throw LOGGER
-                    .logExceptionAsError(new IllegalArgumentException("Credential is required for OpenAI connection."));
-            }
+            // use the parent resource
+            String azureOpenAIEndpoint = getOpenAIInferenceUrl(this.endpoint);
+            builder.baseUrl(azureOpenAIEndpoint);
             builder.credential(BearerTokenCredential
-                .create(getBearerTokenSupplier(tokenCredential, "https://cognitiveservices.azure.com/.default")));
+                .create(getBearerTokenSupplier(this.tokenCredential, "https://cognitiveservices.azure.com/.default")));
         } else {
-            throw LOGGER.logExceptionAsError(
-                new IllegalArgumentException("Unsupported credential type for OpenAI connection."));
+            Connection connection = connectionsClient.getConnection(openAIConnectionName, true);
+            if (connection.getType() != ConnectionType.AZURE_OPEN_AI) {
+                throw LOGGER.logExceptionAsError(new IllegalArgumentException("The connection is not of type OPENAI."));
+            }
+            String azureOpenAIEndpoint = connection.getTarget();
+            if (azureOpenAIEndpoint.endsWith("/")) {
+                azureOpenAIEndpoint = azureOpenAIEndpoint.substring(0, azureOpenAIEndpoint.length() - 1);
+            }
+            builder.baseUrl(azureOpenAIEndpoint);
+            BaseCredentials credentials = connection.getCredentials();
+            if (credentials.getType() == CredentialType.API_KEY && credentials instanceof ApiKeyCredentials) {
+                String apiKey = ((ApiKeyCredentials) credentials).getApiKey();
+                builder.apiKey(apiKey);
+            } else if (credentials.getType() == CredentialType.ENTRA_ID) {
+                if (tokenCredential == null) {
+                    throw LOGGER.logExceptionAsError(
+                        new IllegalArgumentException("Credential is required for OpenAI connection."));
+                }
+                builder.credential(BearerTokenCredential
+                    .create(getBearerTokenSupplier(tokenCredential, "https://cognitiveservices.azure.com/.default")));
+            } else {
+                throw LOGGER.logExceptionAsError(
+                    new IllegalArgumentException("Unsupported credential type for OpenAI connection."));
+            }
         }
         if (azureOpenAIServiceVersion != null) {
             builder.azureServiceVersion(azureOpenAIServiceVersion);
@@ -602,6 +609,31 @@ private static Supplier<String> getBearerTokenSupplier(TokenCredential credentia
         };
     }
 
+    /**
+     * Converts an input URL in the format:
+     * https://[host-name]/[some-path]
+     * to:
+     * https://[host-name]
+     *
+     * @param inputUrl The input endpoint URL used to construct AIProjectClient.
+     * @return The endpoint URL required to construct an AzureOpenAI client.
+     */
+    private static String getOpenAIInferenceUrl(String inputUrl) {
+        URL parsed = null;
+        try {
+            parsed = new URL(inputUrl);
+        } catch (MalformedURLException e) {
+            throw LOGGER
+                .logExceptionAsError(new IllegalArgumentException("Invalid endpoint URL format. Malformed.", e));
+        }
+        if (!"https".equals(parsed.getProtocol()) || parsed.getHost().isEmpty()) {
+            throw LOGGER.logExceptionAsError(
+                new IllegalArgumentException("Invalid endpoint URL format. Must be an https URL with a host."));
+        }
+        String newUrl = "https://" + parsed.getHost();
+        return newUrl;
+    }
+
     /**
      * Create an instance of the AIProjectClientBuilder.
      */

sdk/ai/azure-ai-projects/tsp-location.yaml

@@ -1,5 +1,5 @@
 directory: specification/ai/Azure.AI.Projects/
-commit: 9f58ff4442493f8f333c751656d4b3a7e10d6e83
+commit: ff0bb49f83506566af01d38027029cd05469ab6a
 repo: Azure/azure-rest-api-specs
 additionalDirectories: []