Merge remote-tracking branch 'origin/main' into advertising-new-api

Author: newtork

.github/workflows/e2e-test.yaml

@@ -44,9 +44,9 @@ jobs:
         id: run_tests
         run: |
           if [ "${{ matrix.environment }}" = "canary" ]; then
-              export AICORE_SERVICE_KEY="${{ secrets.AI_CORE_CANARY }}"
+              export AICORE_SERVICE_KEY='${{ secrets.AI_CORE_CANARY }}'
           else
-              export AICORE_SERVICE_KEY="${{ secrets.AI_CORE_PRODUCTION }}"
+              export AICORE_SERVICE_KEY='${{ secrets.AI_CORE_PRODUCTION }}'
           fi
           
           MVN_ARGS="${{ env.MVN_MULTI_THREADED_ARGS }} surefire:test -pl :spring-app -DskipTests=false"
@@ -74,9 +74,9 @@ jobs:
       - name: "Start Application Locally"
         run: |
           if [ "${{ matrix.environment }}" = "canary" ]; then
-              export AICORE_SERVICE_KEY="${{ secrets.AI_CORE_CANARY }}"
+              export AICORE_SERVICE_KEY='${{ secrets.AI_CORE_CANARY }}'
           else
-              export AICORE_SERVICE_KEY="${{ secrets.AI_CORE_PRODUCTION }}"
+              export AICORE_SERVICE_KEY='${{ secrets.AI_CORE_PRODUCTION }}'
           fi
           
           cd sample-code/spring-app
@@ -114,4 +114,4 @@ jobs:
               - type: "section"
                 text:
                   type: "plain_text"
-                  text: "${{ steps.run_tests.outputs.error_message }}"
+                  text: "${{ steps.run_tests.outputs.error_message }} "

.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/slack-github-action@v2.1.1
+        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>"

pom.xml

@@ -298,7 +298,7 @@
         <plugin>
           <groupId>org.openapitools</groupId>
           <artifactId>openapi-generator-maven-plugin</artifactId>
-          <version>7.14.0</version>
+          <version>7.15.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -749,7 +749,7 @@ https://gitbox.apache.org/repos/asf?p=maven-pmd-plugin.git;a=blob_plain;f=src/ma
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>4.9.3.2</version>
+        <version>4.9.4.0</version>
         <configuration>
           <includeFilterFile>${project.rootdir}/.pipeline/spotbugs.xml</includeFilterFile>
           <!-- Exclude generated clients -->

sample-code/spring-app/pom.xml

@@ -33,7 +33,7 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
-    <spring-boot.version>3.5.4</spring-boot.version>
+    <spring-boot.version>3.5.5</spring-boot.version>
     <logback.version>1.5.18</logback.version>
     <cf-logging.version>3.8.6</cf-logging.version>
     <apache-tomcat-embed.version>11.0.10</apache-tomcat-embed.version>

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

@@ -24,6 +24,7 @@
 import com.sap.ai.sdk.orchestration.model.GenericModuleResult;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -323,7 +324,10 @@ void testImageInputBase64() {
     String dataUrl = "";
     try {
       URL url = new URL("https://upload.wikimedia.org/wikipedia/commons/c/c9/Sap-logo-700x700.jpg");
-      try (InputStream inputStream = url.openStream()) {
+      // the "User-Agent" header is required to avoid a 403
+      HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+      connection.setRequestProperty("User-Agent", "Test implementation");
+      try (InputStream inputStream = connection.getInputStream()) {
         byte[] imageBytes = inputStream.readAllBytes();
         byte[] encodedBytes = Base64.getEncoder().encode(imageBytes);
         String encodedString = new String(encodedBytes, StandardCharsets.UTF_8);