Add endpoints for supplying resource groups

- fix bug on resource group with custom destinaiton on openai
- update tests

Author: rpanackal

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClient.java

@@ -94,7 +94,13 @@ public OpenAiClient withApiVersion(@Nonnull final String apiVersion) {
   @Beta
   @Nonnull
   public static OpenAiClient withCustomDestination(@Nonnull final Destination destination) {
-    return new OpenAiClient(destination);
+    OpenAiClient client = new OpenAiClient(destination);
+
+    if (!destination.get("URL.queries.api-version").isDefined()) {
+      client = client.withApiVersion(DEFAULT_API_VERSION);
+    }
+
+    return client;
   }
 
   /**

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClientTest.java

@@ -74,7 +74,9 @@ void apiVersion() {
     stubFor(post(anyUrl()).willReturn(okJson("{}")));
     Try.of(() -> client.chatCompletion(new OpenAiChatCompletionParameters()));
 
-    verify(exactly(1), postRequestedFor(anyUrl()).withoutQueryParam("api-version"));
+    verify(
+        exactly(1),
+        postRequestedFor(anyUrl()).withQueryParam("api-version", equalTo("2024-02-01")));
 
     Try.of(
         () -> client.withApiVersion("fooBar").chatCompletion(new OpenAiChatCompletionParameters()));
@@ -85,7 +87,9 @@ void apiVersion() {
             "withApiVersion should return a new object, the sut object should remain unchanged")
         .isNotSameAs(client.withApiVersion("fooBar"));
     Try.of(() -> client.chatCompletion(new OpenAiChatCompletionParameters()));
-    verify(exactly(2), postRequestedFor(anyUrl()).withoutQueryParam("api-version"));
+    verify(
+        exactly(2),
+        postRequestedFor(anyUrl()).withQueryParam("api-version", equalTo("2024-02-01")));
   }
 
   private static Runnable[] errorHandlingCalls() {
@@ -197,7 +201,11 @@ void chatCompletion(@Nonnull final Callable<OpenAiChatCompletionOutput> request)
     try (var inputStream = fileLoader.apply("__files/chatCompletionResponse.json")) {
 
       final String response = new String(inputStream.readAllBytes());
-      stubFor(post("/chat/completions").willReturn(okJson(response)));
+      // with query parameter api-version=2024-02-01
+      stubFor(
+          post(urlPathEqualTo("/chat/completions"))
+              .withQueryParam("api-version", equalTo("2024-02-01"))
+              .willReturn(okJson(response)));
 
       final OpenAiChatCompletionOutput result = request.call();
 
@@ -264,6 +272,7 @@ void chatCompletion(@Nonnull final Callable<OpenAiChatCompletionOutput> request)
 
       verify(
           postRequestedFor(urlPathEqualTo("/chat/completions"))
+              .withQueryParam("api-version", equalTo("2024-02-01"))
               .withRequestBody(
                   equalToJson(
                       """

sample-code/spring-app/pom.xml

@@ -157,6 +157,10 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.sap.cloud.sdk.cloudplatform</groupId>
+      <artifactId>cloudplatform-connectivity</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java

@@ -193,7 +193,7 @@ OpenAiEmbeddingOutput embedding() {
   }
 
   /**
-   * Chat request to OpenAI with filtering by resource group
+   * Chat request to OpenAI filtering by resource group
    *
    * @param resourceGroup The resource group to use
    * @return the assistant message response
@@ -203,13 +203,10 @@ OpenAiEmbeddingOutput embedding() {
   public static OpenAiChatCompletionOutput chatCompletionWithResource(
       @Nonnull @PathVariable("resourceGroup") final String resourceGroup) {
 
-    final var destinationWithResource =
-        new AiCoreService()
-            .forDeploymentByModel(GPT_4O)
-            .withResourceGroup(resourceGroup)
-            .destination();
+    final var destination =
+        new AiCoreService().getInferenceDestination(resourceGroup).forModel(GPT_4O);
 
-    return OpenAiClient.withCustomDestination(destinationWithResource)
+    return OpenAiClient.withCustomDestination(destination)
         .chatCompletion("Where is the nearest coffee shop?");
   }
 }

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java

@@ -156,11 +156,9 @@ OrchestrationChatResponse maskingAnonymization() {
   public OrchestrationChatResponse completionWithResourceGroup(
       @PathVariable("resourceGroup") @Nonnull final String resourceGroup) {
 
-    var deployment =
-        new AiCoreService()
-            .forDeploymentByScenario("orchestration")
-            .withResourceGroup(resourceGroup);
-    var clientWithResourceGroup = new OrchestrationClient(deployment);
+    final var destination =
+        new AiCoreService().getInferenceDestination(resourceGroup).forScenario("orchestration");
+    final var clientWithResourceGroup = new OrchestrationClient(destination);
 
     final var prompt = new OrchestrationPrompt("Hello world! Why is this phrase so famous?");
 

sample-code/spring-app/src/main/resources/static/index.html

@@ -85,6 +85,7 @@ <h2>Endpoints</h2>
                 <li><a href="/chatCompletionTool">/chatCompletionTool</a></li>
                 <li><a href="/chatCompletionImage">/chatCompletionImage</a></li>
                 <li><a href="/embedding">/embedding</a></li>
+                <li><a href="/chatCompletion/ai-sdk-java-e2e">/chatCompletion/resourceGroup</a></li>
             </ul>
         </ul>
     </li>

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OpenAiTest.java

@@ -9,7 +9,6 @@
 import com.sap.ai.sdk.foundationmodels.openai.model.OpenAiChatMessage.OpenAiChatUserMessage;
 import java.util.concurrent.atomic.AtomicInteger;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -91,7 +90,6 @@ void embedding() {
   }
 
   @Test
-  @Disabled
   void chatCompletionWithResource() {
     final var completion = OpenAiController.chatCompletionWithResource("ai-sdk-java-e2e");