Skip to content

Commit 06db2e7

Browse files
authored
chore: Remove Backend_details workaround (#142)
* chore: Remove Backend_details workaround * add missing final
1 parent 0ce84a3 commit 06db2e7

File tree

5 files changed

+18
-22
lines changed

5 files changed

+18
-22
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,9 @@ protected static boolean isDeploymentOfModel(
135135
if (resources == null) {
136136
return false;
137137
}
138-
Object detailsObject = resources.getBackendDetails();
139-
// workaround for AIWDF-2124
138+
final Object detailsObject = resources.getBackendDetails();
140139
if (detailsObject == null) {
141-
if (!resources.getCustomFieldNames().contains("backend_details")) {
142-
return false;
143-
}
144-
detailsObject = resources.getCustomField("backend_details");
140+
return false;
145141
}
146142

147143
if (detailsObject instanceof Map<?, ?> details

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void isDeploymentOfModel() {
161161
.createdAt(OffsetDateTime.parse("2024-01-22T17:57:23+00:00"))
162162
.modifiedAt(OffsetDateTime.parse("2024-02-08T08:41:23+00:00"));
163163
deployment.setDetails(AiDeploymentDetails.create().resources(AiResourcesDetails.create()));
164-
deployment.getDetails().getResources().setCustomField("backend_details", model);
164+
deployment.getDetails().getResources().setBackendDetails(model);
165165

166166
// Check if the deployment is of the target model
167167
assertThat(DeploymentCache.isDeploymentOfModel(gpt4AnyVersion, deployment)).isTrue();

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ void getDeployments() {
6262
"ttl": null,
6363
"details": {
6464
"scaling": {
65-
"backendDetails": {},
66-
"backend_details": {}
65+
"backendDetails": {}
6766
},
6867
"resources": {
6968
"backendDetails": {
@@ -104,7 +103,6 @@ void getDeployments() {
104103
assertThat(deployment.getDeploymentUrl())
105104
.isEqualTo(
106105
"https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/d889e3a61050c085");
107-
// Response contains key "backend_details" while spec (mistakenly) defines key "backendDetails".
108106
val expected = Map.of("model", Map.of("name", "gpt-4-32k", "version", "latest"));
109107
assertThat(deployment.getDetails().getResources().getBackendDetails()).isEqualTo(expected);
110108
assertThat(deployment.getDetails().getScaling().getBackendDetails()).isEqualTo(Map.of());
@@ -243,12 +241,12 @@ void getDeploymentById() {
243241
"deploymentUrl": "https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/db1d64d9f06be467",
244242
"details": {
245243
"resources": {
246-
"backend_details": {},
247-
"backendDetails": {}
244+
"backendDetails": {},
245+
"backend_details": {}
248246
},
249247
"scaling": {
250-
"backend_details": {},
251-
"backendDetails": {}
248+
"backendDetails": {},
249+
"backend_details": {}
252250
}
253251
},
254252
"id": "db1d64d9f06be467",
@@ -272,8 +270,12 @@ void getDeploymentById() {
272270
assertThat(deployment.getDeploymentUrl())
273271
.isEqualTo(
274272
"https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/db1d64d9f06be467");
275-
assertThat(deployment.getDetails().getResources().getBackendDetails()).isNotNull();
276-
assertThat(deployment.getDetails().getScaling().getBackendDetails()).isNotNull();
273+
assertThat(deployment.getDetails().getResources().getBackendDetails()).isEqualTo(Map.of());
274+
assertThat(deployment.getDetails().getResources().getCustomField("backend_details"))
275+
.isEqualTo(Map.of());
276+
assertThat(deployment.getDetails().getScaling().getBackendDetails()).isEqualTo(Map.of());
277+
assertThat(deployment.getDetails().getScaling().getCustomField("backend_details"))
278+
.isEqualTo(Map.of());
277279
assertThat(deployment.getId()).isEqualTo("db1d64d9f06be467");
278280
assertThat(deployment.getLastOperation())
279281
.isEqualTo(AiDeploymentResponseWithDetails.LastOperationEnum.CREATE);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
"deploymentUrl": "https://api.ai.intprod-eu12.eu-central-1.aws.ml.hana.ondemand.com/v2/inference/deployments/d19b998f347341aa",
99
"details": {
1010
"resources": {
11-
"backend_details": {
11+
"backendDetails": {
1212
"model": {
1313
"name": "gpt-4-32k",
1414
"version": "latest"
1515
}
1616
}
1717
},
1818
"scaling": {
19-
"backend_details": {}
19+
"backendDetails": {}
2020
}
2121
},
2222
"id": "d19b998f347341aa",

docs/guides/OPENAI_CHAT_COMPLETION.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,10 @@ In addition to the prerequisites above, we assume you have already set up the fo
6565
"ttl": null,
6666
"details": {
6767
"scaling": {
68-
"backendDetails": null,
69-
"backend_details": {}
68+
"backendDetails": {}
7069
},
7170
"resources": {
72-
"backendDetails": null,
73-
"backend_details": {
71+
"backendDetails": {
7472
"model": {
7573
"name": "gpt-35-turbo",
7674
"version": "latest"

0 commit comments

Comments
 (0)