Skip to content

Commit 9b7ad42

Browse files
committed
Revert embedding convenience.
1 parent 5f8d64b commit 9b7ad42

File tree

3 files changed

+9
-49
lines changed

3 files changed

+9
-49
lines changed

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClientTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionRequest;
2626
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionStreamResponse;
2727
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionStreamResponseChoicesInner;
28+
import com.sap.ai.sdk.foundationmodels.openai.model2.EmbeddingsCreateRequest;
29+
import com.sap.ai.sdk.foundationmodels.openai.model2.EmbeddingsCreateRequestInput;
2830
import com.sap.ai.sdk.foundationmodels.openai.model2.PromptFilterResult;
2931
import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor;
3032
import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Cache;
@@ -381,7 +383,8 @@ void embedding() {
381383
.withBodyFile("embeddingResponse.json")
382384
.withHeader("Content-Type", "application/json")));
383385

384-
final var request = OpenAiEmbeddingsRequestFactory.fromStrings("Hello World");
386+
final var request =
387+
new EmbeddingsCreateRequest().input(EmbeddingsCreateRequestInput.create("Hello World"));
385388
final var result = client.embedding(request);
386389

387390
assertThat(result).isNotNull();
@@ -413,7 +416,7 @@ void embedding() {
413416
.withRequestBody(
414417
equalToJson(
415418
"""
416-
{"input": [ "Hello World" ]}""")));
419+
{"input": "Hello World"}""")));
417420
}
418421

419422
@Test

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.sap.ai.sdk.foundationmodels.openai.OpenAiChatCompletionOutput;
1616
import com.sap.ai.sdk.foundationmodels.openai.OpenAiChatCompletionPrompt;
1717
import com.sap.ai.sdk.foundationmodels.openai.OpenAiClient;
18-
import com.sap.ai.sdk.foundationmodels.openai.OpenAiEmbeddingsRequestFactory;
1918
import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionNamedToolChoice;
2019
import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionNamedToolChoiceFunction;
2120
import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestMessageContentPartImage;
@@ -27,6 +26,8 @@
2726
import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionToolChoiceOption;
2827
import com.sap.ai.sdk.foundationmodels.openai.model2.CreateChatCompletionRequest;
2928
import com.sap.ai.sdk.foundationmodels.openai.model2.EmbeddingsCreate200Response;
29+
import com.sap.ai.sdk.foundationmodels.openai.model2.EmbeddingsCreateRequest;
30+
import com.sap.ai.sdk.foundationmodels.openai.model2.EmbeddingsCreateRequestInput;
3031
import com.sap.ai.sdk.foundationmodels.openai.model2.FunctionObject;
3132
import java.net.URI;
3233
import java.util.List;
@@ -162,7 +163,8 @@ public OpenAiChatCompletionOutput chatCompletionTools(@Nonnull final String desc
162163
*/
163164
@Nonnull
164165
public EmbeddingsCreate200Response embedding(@Nonnull final String input) {
165-
final var request = OpenAiEmbeddingsRequestFactory.fromStrings(input);
166+
final var request =
167+
new EmbeddingsCreateRequest().input(EmbeddingsCreateRequestInput.create(input));
166168

167169
return OpenAiClient.forModel(TEXT_EMBEDDING_ADA_002).embedding(request);
168170
}

0 commit comments

Comments
 (0)