Merge branch 'main' into feat/orchestration/embedding-conv

Author: rpanackal

.github/workflows/spec-update.yaml

@@ -59,11 +59,6 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           cache: 'maven'
 
-      - name: "Install Baseline SDK Version"
-        # this is needed as otherwise "process sources" will fail on e.g. orchestration module, if the core module isn't in the maven cache
-        run: |
-          mvn install -DskipTests
-
       - name: "Checkout or Create Branch"
         id: branch
         # Checkout branch if it exists, otherwise create it
@@ -110,6 +105,11 @@ jobs:
             echo "spec_diff=false" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: "Install Baseline SDK Version"
+        # this is needed as otherwise "process sources" will fail on e.g. orchestration module, if the core module isn't in the maven cache
+        run: |
+          mvn install -DskipTests
+
       - name: "Generate"
         id: generate
         if: steps.spec_diff.outputs.spec_diff == 'true'

.github/workflows/weekly-spec-update.yaml

@@ -8,25 +8,59 @@ jobs:
   update-all-specs:
     runs-on: ubuntu-latest
     permissions:
-      contents: write
-      pull-requests: write
+      actions: write
 
     strategy:
       matrix:
         file:
           - core
           - document-grounding
           - prompt-registry
+          - orchestration
 
     steps:
       - name: "Checkout repository"
         uses: actions/checkout@v4
 
+      - name: "Get orchestration version"
+        if: matrix.file == 'orchestration'
+        run: |
+          ORCH_VERSION=$(curl --silent --request GET --url "https://github.tools.sap/api/v3/repos/MLF-prod/mlf-gitops-prod/contents/services/llm-orchestration/source/Chart.yaml?ref=aws.eu-central-1.prod-eu/current" -H "Authorization: Bearer $TOKEN" -H "Accept: application/vnd.github.v3.raw" | grep 'version:' | awk '{print $2}')
+
+          if [ -z "$ORCH_VERSION" ]; then
+              echo "Failed to fetch orchestration version"
+              exit 1
+          fi
+          echo "Orchestration version: $ORCH_VERSION"
+          echo "ORCH_VERSION=$ORCH_VERSION" >> $GITHUB_ENV
+        env:
+          TOKEN: ${{ secrets.GH_TOOLS_TOKEN }}
+
+
       - name: "Trigger spec update"
         run: |
+          BRANCH="main"
+          if [ "${{ matrix.file }}" = "orchestration" ]; then
+            BRANCH="rel/$ORCH_VERSION"
+          fi
+          echo "Using branch: $BRANCH"
+
           gh workflow run spec-update.yaml \
             --field file=${{ matrix.file }} \
-            --field file-ref=main \
+            --field file-ref=$BRANCH \
             --field create-pr=true
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Slack Notification"
+        if: failure()
+        uses: slackapi/[email protected]
+        with:
+          webhook: ${{ secrets.SLACK_WEBHOOK }}
+          webhook-type: incoming-webhook
+          payload: |
+            blocks:
+              - type: "section"
+                text:
+                    type: "mrkdwn"
+                    text: "⚠️ Weekly spec update failed! 😬 Please inspect & fix by clicking <https://github.com/SAP/ai-sdk-java/actions/runs/${{ github.run_id }}|here>"

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

@@ -2,7 +2,6 @@
 
 import static lombok.AccessLevel.PACKAGE;
 
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionMessageToolCall;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionMessageToolCallFunction;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestAssistantMessage;
@@ -25,7 +24,6 @@
  *
  * @since 1.4.0
  */
-@Beta
 @Value
 @Accessors(fluent = true)
 @AllArgsConstructor(access = PACKAGE)
@@ -39,18 +37,14 @@ public class OpenAiAssistantMessage implements OpenAiMessage {
    *
    * <p>May contain an empty list of {@link OpenAiContentItem} when tool calls are present.
    */
-  @Getter(onMethod_ = @Beta)
-  @Nonnull
-  OpenAiMessageContent content;
+  @Getter @Nonnull OpenAiMessageContent content;
 
   /**
    * The tool calls associated with this message if present.
    *
    * @since 1.6.0
    */
-  @Getter(onMethod_ = @Beta)
-  @Nonnull
-  List<OpenAiToolCall> toolCalls;
+  @Getter @Nonnull List<OpenAiToolCall> toolCalls;
 
   /**
    * Creates a new assistant message with the given single message as text content.

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

@@ -4,7 +4,6 @@
 import static lombok.AccessLevel.PACKAGE;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.StreamedDelta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CompletionUsage;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionStreamResponse;
@@ -22,7 +21,6 @@
  *
  * @since 1.4.0
  */
-@Beta
 @RequiredArgsConstructor(onConstructor_ = @JsonCreator, access = PACKAGE)
 @Getter
 @ToString

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

@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
-import com.google.common.annotations.Beta;
 import com.google.common.collect.Lists;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionStreamOptions;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionTool;
@@ -30,7 +29,6 @@
  *     API Reference</a>
  * @since 1.4.0
  */
-@Beta
 @Value
 @With
 @AllArgsConstructor(access = AccessLevel.PRIVATE)

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

@@ -4,7 +4,6 @@
 import static lombok.AccessLevel.NONE;
 import static lombok.AccessLevel.PACKAGE;
 
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CompletionUsage;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionResponse;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionResponseChoicesInner;
@@ -21,7 +20,6 @@
  *
  * @since 1.4.0
  */
-@Beta
 @Value
 @RequiredArgsConstructor(access = PACKAGE)
 @Setter(value = NONE)

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

@@ -101,7 +101,6 @@ public OpenAiClient withApiVersion(@Nonnull final String apiVersion) {
    * @see AiCoreService#getInferenceDestination(String)
    * @return a new OpenAI client.
    */
-  @Beta
   @Nonnull
   public static OpenAiClient withCustomDestination(@Nonnull final Destination destination) {
     final OpenAiClient client = new OpenAiClient(destination);
@@ -156,7 +155,6 @@ public OpenAiChatCompletionOutput chatCompletion(@Nonnull final String prompt)
    * @throws OpenAiClientException if the request fails
    * @since 1.4.0
    */
-  @Beta
   @Nonnull
   public OpenAiChatCompletionResponse chatCompletion(
       @Nonnull final OpenAiChatCompletionRequest request) throws OpenAiClientException {
@@ -173,7 +171,6 @@ public OpenAiChatCompletionResponse chatCompletion(
    * @throws OpenAiClientException if the request fails
    * @since 1.4.0
    */
-  @Beta
   @Nonnull
   public CreateChatCompletionResponse chatCompletion(
       @Nonnull final CreateChatCompletionRequest request) throws OpenAiClientException {
@@ -274,7 +271,6 @@ private static void throwOnContentFilter(@Nonnull final OpenAiChatCompletionDelt
    * @see #streamChatCompletion(String)
    * @since 1.4.0
    */
-  @Beta
   @Nonnull
   public Stream<OpenAiChatCompletionDelta> streamChatCompletionDeltas(
       @Nonnull final OpenAiChatCompletionRequest request) throws OpenAiClientException {
@@ -291,7 +287,6 @@ public Stream<OpenAiChatCompletionDelta> streamChatCompletionDeltas(
    * @see #streamChatCompletionDeltas(OpenAiChatCompletionRequest) for a higher-level API
    * @since 1.4.0
    */
-  @Beta
   @Nonnull
   public Stream<OpenAiChatCompletionDelta> streamChatCompletionDeltas(
       @Nonnull final CreateChatCompletionRequest request) throws OpenAiClientException {
@@ -358,7 +353,6 @@ private void warnIfUnsupportedUsage() {
    * @see #embedding(EmbeddingsCreateRequest) for full confgurability.
    * @since 1.4.0
    */
-  @Beta
   @Nonnull
   public OpenAiEmbeddingResponse embedding(@Nonnull final OpenAiEmbeddingRequest request)
       throws OpenAiClientException {
@@ -374,7 +368,6 @@ public OpenAiEmbeddingResponse embedding(@Nonnull final OpenAiEmbeddingRequest r
    * @see #embedding(OpenAiEmbeddingRequest) for conveninece api
    * @since 1.4.0
    */
-  @Beta
   @Nonnull
   public EmbeddingsCreate200Response embedding(@Nonnull final EmbeddingsCreateRequest request)
       throws OpenAiClientException {

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

@@ -1,11 +1,8 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
-import com.google.common.annotations.Beta;
-
 /**
  * Represents an item in a {@link OpenAiMessageContent} object.
  *
  * @since 1.4.0
  */
-@Beta
 public sealed interface OpenAiContentItem permits OpenAiTextItem, OpenAiImageItem {}

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

@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.EmbeddingsCreateRequest;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.EmbeddingsCreateRequestInput;
 import java.util.Collections;
@@ -16,11 +15,10 @@
  *
  * @since 1.4.0
  */
-@Beta
 @Value
 public class OpenAiEmbeddingRequest {
   /** List of tokens to be embedded. */
-  @Nonnull private final List<String> tokens;
+  @Nonnull List<String> tokens;
 
   /**
    * Constructs an OpenAiEmbeddingRequest from a list of strings.

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

@@ -3,7 +3,6 @@
 import static lombok.AccessLevel.NONE;
 import static lombok.AccessLevel.PACKAGE;
 
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.EmbeddingsCreate200Response;
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +19,6 @@
  *
  * @since 1.4.0
  */
-@Beta
 @Value
 @AllArgsConstructor(access = PACKAGE)
 @Setter(value = NONE)