Merge branch 'main' into feat/orchestration-prompt

Author: MatKuhr

core/src/main/java/com/sap/ai/sdk/core/DeploymentCache.java

@@ -135,13 +135,9 @@ protected static boolean isDeploymentOfModel(
     if (resources == null) {
       return false;
     }
-    Object detailsObject = resources.getBackendDetails();
-    // workaround for AIWDF-2124
+    final Object detailsObject = resources.getBackendDetails();
     if (detailsObject == null) {
-      if (!resources.getCustomFieldNames().contains("backend_details")) {
-        return false;
-      }
-      detailsObject = resources.getCustomField("backend_details");
+      return false;
     }
 
     if (detailsObject instanceof Map<?, ?> details

core/src/test/java/com/sap/ai/sdk/core/CacheTest.java

@@ -161,7 +161,7 @@ public void isDeploymentOfModel() {
             .createdAt(OffsetDateTime.parse("2024-01-22T17:57:23+00:00"))
             .modifiedAt(OffsetDateTime.parse("2024-02-08T08:41:23+00:00"));
     deployment.setDetails(AiDeploymentDetails.create().resources(AiResourcesDetails.create()));
-    deployment.getDetails().getResources().setCustomField("backend_details", model);
+    deployment.getDetails().getResources().setBackendDetails(model);
 
     // Check if the deployment is of the target model
     assertThat(DeploymentCache.isDeploymentOfModel(gpt4AnyVersion, deployment)).isTrue();

core/src/test/java/com/sap/ai/sdk/core/client/DeploymentUnitTest.java

@@ -62,8 +62,7 @@ void getDeployments() {
                               "ttl": null,
                               "details": {
                                 "scaling": {
-                                  "backendDetails": {},
-                                  "backend_details": {}
+                                  "backendDetails": {}
                                 },
                                 "resources": {
                                   "backendDetails": {
@@ -104,7 +103,6 @@ void getDeployments() {
     assertThat(deployment.getDeploymentUrl())
         .isEqualTo(
             "https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/d889e3a61050c085");
-    // Response contains key "backend_details" while spec (mistakenly) defines key "backendDetails".
     val expected = Map.of("model", Map.of("name", "gpt-4-32k", "version", "latest"));
     assertThat(deployment.getDetails().getResources().getBackendDetails()).isEqualTo(expected);
     assertThat(deployment.getDetails().getScaling().getBackendDetails()).isEqualTo(Map.of());
@@ -243,12 +241,12 @@ void getDeploymentById() {
                            "deploymentUrl": "https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/db1d64d9f06be467",
                            "details": {
                              "resources": {
-                               "backend_details": {},
-                               "backendDetails": {}
+                               "backendDetails": {},
+                               "backend_details": {}
                              },
                              "scaling": {
-                               "backend_details": {},
-                               "backendDetails": {}
+                               "backendDetails": {},
+                               "backend_details": {}
                              }
                            },
                            "id": "db1d64d9f06be467",
@@ -272,8 +270,12 @@ void getDeploymentById() {
     assertThat(deployment.getDeploymentUrl())
         .isEqualTo(
             "https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/db1d64d9f06be467");
-    assertThat(deployment.getDetails().getResources().getBackendDetails()).isNotNull();
-    assertThat(deployment.getDetails().getScaling().getBackendDetails()).isNotNull();
+    assertThat(deployment.getDetails().getResources().getBackendDetails()).isEqualTo(Map.of());
+    assertThat(deployment.getDetails().getResources().getCustomField("backend_details"))
+        .isEqualTo(Map.of());
+    assertThat(deployment.getDetails().getScaling().getBackendDetails()).isEqualTo(Map.of());
+    assertThat(deployment.getDetails().getScaling().getCustomField("backend_details"))
+        .isEqualTo(Map.of());
     assertThat(deployment.getId()).isEqualTo("db1d64d9f06be467");
     assertThat(deployment.getLastOperation())
         .isEqualTo(AiDeploymentResponseWithDetails.LastOperationEnum.CREATE);

core/src/test/resources/__files/GPT4DeploymentResponse.json

@@ -8,15 +8,15 @@
       "deploymentUrl": "https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/d19b998f347341aa",
       "details": {
         "resources": {
-          "backend_details": {
+          "backendDetails": {
             "model": {
               "name": "gpt-4-32k",
               "version": "latest"
             }
           }
         },
         "scaling": {
-          "backend_details": {}
+          "backendDetails": {}
         }
       },
       "id": "d19b998f347341aa",

docs/guides/OPENAI_CHAT_COMPLETION.md

@@ -65,12 +65,10 @@ In addition to the prerequisites above, we assume you have already set up the fo
         "ttl": null,
         "details": {
           "scaling": {
-            "backendDetails": null,
-            "backend_details": {}
+            "backendDetails": {}
           },
           "resources": {
-            "backendDetails": null,
-            "backend_details": {
+            "backendDetails": {
               "model": {
                 "name": "gpt-35-turbo",
                 "version": "latest"