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

# Conflicts:
#	docs/release_notes.md
#	sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OrchestrationTest.java

Author: rpanackal

.github/workflows/spec-update.yaml

@@ -87,7 +87,7 @@ jobs:
               FILE_PATH='orchestration/src/main/resources/spec/orchestration.yaml'
               ;;
             prompt-registry)
-              API_URL="$API_BASE_URL/AI/prompt-registry/contents/src/spec/prompt-registry.yaml?ref=$REF"
+              API_URL="$API_BASE_URL/AI/prompt-registry/contents/src/spec/generated/prompt-registry-combined.yaml?ref=$REF"
               FILE_PATH='core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml'
               ;;
           esac
@@ -105,16 +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'
         run: |
-          mvn process-sources -Dgenerate ${{ env.MVN_MULTI_THREADED_ARGS }}
+          mvn install -DskipTests -Dgenerate ${{ env.MVN_MULTI_THREADED_ARGS }}
 
       - name: "Compile and Test"
         id: compile

core-services/document-grounding/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.12.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>document-grounding</artifactId>

core-services/prompt-registry/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.12.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>prompt-registry</artifactId>

core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/OrchestrationConfigsApi.java

@@ -57,10 +57,10 @@ public OrchestrationConfigsApi(@Nonnull final ApiClient apiClient) {
    *
    * <p><b>200</b> - Successful response
    *
-   * <p><b>403</b> - Forbidden Error
-   *
    * <p><b>400</b> - Bad Request
    *
+   * <p><b>403</b> - Forbidden Error
+   *
    * <p><b>0</b> - Common Error
    *
    * @param orchestrationConfigPostRequest (required) The value for the parameter
@@ -83,7 +83,7 @@ public OrchestrationConfigPostResponse createUpdateOrchestrationConfig(
     }
 
     final String localVarPath =
-        UriComponentsBuilder.fromPath("/lm/orchestrationConfigs").build().toUriString();
+        UriComponentsBuilder.fromPath("/registry/v2/orchestrationConfigs").build().toUriString();
 
     final MultiValueMap<String, String> localVarQueryParams =
         new LinkedMultiValueMap<String, String>();
@@ -121,10 +121,10 @@ public OrchestrationConfigPostResponse createUpdateOrchestrationConfig(
    *
    * <p><b>200</b> - Successful response
    *
-   * <p><b>403</b> - Forbidden Error
-   *
    * <p><b>400</b> - Bad Request
    *
+   * <p><b>403</b> - Forbidden Error
+   *
    * <p><b>0</b> - Common Error
    *
    * @param orchestrationConfigPostRequest The value for the parameter
@@ -144,10 +144,10 @@ public OrchestrationConfigPostResponse createUpdateOrchestrationConfig(
    *
    * <p><b>200</b> - Successful response
    *
-   * <p><b>404</b> - Bad Request
-   *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>404</b> - Bad Request
+   *
    * <p><b>0</b> - Common Error
    *
    * @param orchestrationConfigId (required) The value for the parameter orchestrationConfigId
@@ -171,7 +171,7 @@ public OrchestrationConfigDeleteResponse deleteOrchestrationConfig(
     final Map<String, Object> localVarPathParams = new HashMap<String, Object>();
     localVarPathParams.put("orchestrationConfigId", orchestrationConfigId);
     final String localVarPath =
-        UriComponentsBuilder.fromPath("/lm/orchestrationConfigs/{orchestrationConfigId}")
+        UriComponentsBuilder.fromPath("/registry/v2/orchestrationConfigs/{orchestrationConfigId}")
             .buildAndExpand(localVarPathParams)
             .toUriString();
 
@@ -211,10 +211,10 @@ public OrchestrationConfigDeleteResponse deleteOrchestrationConfig(
    *
    * <p><b>200</b> - Successful response
    *
-   * <p><b>404</b> - Bad Request
-   *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>404</b> - Bad Request
+   *
    * <p><b>0</b> - Common Error
    *
    * @param orchestrationConfigId The value for the parameter orchestrationConfigId
@@ -257,7 +257,8 @@ public File exportOrchestrationConfig(
     final Map<String, Object> localVarPathParams = new HashMap<String, Object>();
     localVarPathParams.put("orchestrationConfigId", orchestrationConfigId);
     final String localVarPath =
-        UriComponentsBuilder.fromPath("/lm/orchestrationConfigs/{orchestrationConfigId}/export")
+        UriComponentsBuilder.fromPath(
+                "/registry/v2/orchestrationConfigs/{orchestrationConfigId}/export")
             .buildAndExpand(localVarPathParams)
             .toUriString();
 
@@ -347,7 +348,7 @@ public OrchestrationConfigGetResponse getOrchestrationConfigByUuid(
     final Map<String, Object> localVarPathParams = new HashMap<String, Object>();
     localVarPathParams.put("orchestrationConfigId", orchestrationConfigId);
     final String localVarPath =
-        UriComponentsBuilder.fromPath("/lm/orchestrationConfigs/{orchestrationConfigId}")
+        UriComponentsBuilder.fromPath("/registry/v2/orchestrationConfigs/{orchestrationConfigId}")
             .buildAndExpand(localVarPathParams)
             .toUriString();
 
@@ -427,7 +428,9 @@ public OrchestrationConfigPostResponse importOrchestrationConfig(
     final Object localVarPostBody = null;
 
     final String localVarPath =
-        UriComponentsBuilder.fromPath("/lm/orchestrationConfigs/import").build().toUriString();
+        UriComponentsBuilder.fromPath("/registry/v2/orchestrationConfigs/import")
+            .build()
+            .toUriString();
 
     final MultiValueMap<String, String> localVarQueryParams =
         new LinkedMultiValueMap<String, String>();
@@ -546,7 +549,7 @@ public OrchestrationConfigListResponse listOrchestrationConfigHistory(
     localVarPathParams.put("model_name", modelName);
     final String localVarPath =
         UriComponentsBuilder.fromPath(
-                "/lm/scenarios/{scenario}/orchestrationConfigs/{name}/versions/{version}/models/{model_name}/history")
+                "/registry/v2/scenarios/{scenario}/orchestrationConfigs/{name}/versions/{version}/models/{model_name}/history")
             .buildAndExpand(localVarPathParams)
             .toUriString();
 
@@ -651,7 +654,7 @@ public OrchestrationConfigListResponse listOrchestrationConfigs(
     final Object localVarPostBody = null;
 
     final String localVarPath =
-        UriComponentsBuilder.fromPath("/lm/orchestrationConfigs").build().toUriString();
+        UriComponentsBuilder.fromPath("/registry/v2/orchestrationConfigs").build().toUriString();
 
     final MultiValueMap<String, String> localVarQueryParams =
         new LinkedMultiValueMap<String, String>();