Skip to content

Commit 329a7d3

Browse files
authored
Merge branch 'main' into feat-custom-headers
2 parents 4320d32 + de3ea51 commit 329a7d3

29 files changed

+432
-487
lines changed

.github/workflows/spec-update.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ jobs:
5959
java-version: ${{ env.JAVA_VERSION }}
6060
cache: 'maven'
6161

62-
- name: "Install Baseline SDK Version"
63-
# this is needed as otherwise "process sources" will fail on e.g. orchestration module, if the core module isn't in the maven cache
64-
run: |
65-
mvn install -DskipTests
66-
6762
- name: "Checkout or Create Branch"
6863
id: branch
6964
# Checkout branch if it exists, otherwise create it
@@ -110,6 +105,11 @@ jobs:
110105
echo "spec_diff=false" >> "$GITHUB_OUTPUT"
111106
fi
112107
108+
- name: "Install Baseline SDK Version"
109+
# this is needed as otherwise "process sources" will fail on e.g. orchestration module, if the core module isn't in the maven cache
110+
run: |
111+
mvn install -DskipTests
112+
113113
- name: "Generate"
114114
id: generate
115115
if: steps.spec_diff.outputs.spec_diff == 'true'

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static lombok.AccessLevel.PACKAGE;
44

5-
import com.google.common.annotations.Beta;
65
import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionMessageToolCall;
76
import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionMessageToolCallFunction;
87
import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestAssistantMessage;
@@ -25,7 +24,6 @@
2524
*
2625
* @since 1.4.0
2726
*/
28-
@Beta
2927
@Value
3028
@Accessors(fluent = true)
3129
@AllArgsConstructor(access = PACKAGE)
@@ -39,18 +37,14 @@ public class OpenAiAssistantMessage implements OpenAiMessage {
3937
*
4038
* <p>May contain an empty list of {@link OpenAiContentItem} when tool calls are present.
4139
*/
42-
@Getter(onMethod_ = @Beta)
43-
@Nonnull
44-
OpenAiMessageContent content;
40+
@Getter @Nonnull OpenAiMessageContent content;
4541

4642
/**
4743
* The tool calls associated with this message if present.
4844
*
4945
* @since 1.6.0
5046
*/
51-
@Getter(onMethod_ = @Beta)
52-
@Nonnull
53-
List<OpenAiToolCall> toolCalls;
47+
@Getter @Nonnull List<OpenAiToolCall> toolCalls;
5448

5549
/**
5650
* Creates a new assistant message with the given single message as text content.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import static lombok.AccessLevel.PACKAGE;
55

66
import com.fasterxml.jackson.annotation.JsonCreator;
7-
import com.google.common.annotations.Beta;
87
import com.sap.ai.sdk.core.common.StreamedDelta;
98
import com.sap.ai.sdk.foundationmodels.openai.generated.model.CompletionUsage;
109
import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionStreamResponse;
@@ -22,7 +21,6 @@
2221
*
2322
* @since 1.4.0
2423
*/
25-
@Beta
2624
@RequiredArgsConstructor(onConstructor_ = @JsonCreator, access = PACKAGE)
2725
@Getter
2826
@ToString

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.sap.ai.sdk.foundationmodels.openai;
22

3-
import com.google.common.annotations.Beta;
43
import com.google.common.collect.Lists;
54
import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionStreamOptions;
65
import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionTool;
@@ -30,7 +29,6 @@
3029
* API Reference</a>
3130
* @since 1.4.0
3231
*/
33-
@Beta
3432
@Value
3533
@With
3634
@AllArgsConstructor(access = AccessLevel.PRIVATE)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import static lombok.AccessLevel.NONE;
55
import static lombok.AccessLevel.PACKAGE;
66

7-
import com.google.common.annotations.Beta;
87
import com.sap.ai.sdk.foundationmodels.openai.generated.model.CompletionUsage;
98
import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionResponse;
109
import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionResponseChoicesInner;
@@ -21,7 +20,6 @@
2120
*
2221
* @since 1.4.0
2322
*/
24-
@Beta
2523
@Value
2624
@RequiredArgsConstructor(access = PACKAGE)
2725
@Setter(value = NONE)

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public OpenAiClient withApiVersion(@Nonnull final String apiVersion) {
102102
* @see AiCoreService#getInferenceDestination(String)
103103
* @return a new OpenAI client.
104104
*/
105-
@Beta
106105
@Nonnull
107106
public static OpenAiClient withCustomDestination(@Nonnull final Destination destination) {
108107
final OpenAiClient client = new OpenAiClient(destination);
@@ -175,7 +174,6 @@ public OpenAiChatCompletionOutput chatCompletion(@Nonnull final String prompt)
175174
* @throws OpenAiClientException if the request fails
176175
* @since 1.4.0
177176
*/
178-
@Beta
179177
@Nonnull
180178
public OpenAiChatCompletionResponse chatCompletion(
181179
@Nonnull final OpenAiChatCompletionRequest request) throws OpenAiClientException {
@@ -192,7 +190,6 @@ public OpenAiChatCompletionResponse chatCompletion(
192190
* @throws OpenAiClientException if the request fails
193191
* @since 1.4.0
194192
*/
195-
@Beta
196193
@Nonnull
197194
public CreateChatCompletionResponse chatCompletion(
198195
@Nonnull final CreateChatCompletionRequest request) throws OpenAiClientException {
@@ -293,7 +290,6 @@ private static void throwOnContentFilter(@Nonnull final OpenAiChatCompletionDelt
293290
* @see #streamChatCompletion(String)
294291
* @since 1.4.0
295292
*/
296-
@Beta
297293
@Nonnull
298294
public Stream<OpenAiChatCompletionDelta> streamChatCompletionDeltas(
299295
@Nonnull final OpenAiChatCompletionRequest request) throws OpenAiClientException {
@@ -310,7 +306,6 @@ public Stream<OpenAiChatCompletionDelta> streamChatCompletionDeltas(
310306
* @see #streamChatCompletionDeltas(OpenAiChatCompletionRequest) for a higher-level API
311307
* @since 1.4.0
312308
*/
313-
@Beta
314309
@Nonnull
315310
public Stream<OpenAiChatCompletionDelta> streamChatCompletionDeltas(
316311
@Nonnull final CreateChatCompletionRequest request) throws OpenAiClientException {
@@ -377,7 +372,6 @@ private void warnIfUnsupportedUsage() {
377372
* @see #embedding(EmbeddingsCreateRequest) for full confgurability.
378373
* @since 1.4.0
379374
*/
380-
@Beta
381375
@Nonnull
382376
public OpenAiEmbeddingResponse embedding(@Nonnull final OpenAiEmbeddingRequest request)
383377
throws OpenAiClientException {
@@ -393,7 +387,6 @@ public OpenAiEmbeddingResponse embedding(@Nonnull final OpenAiEmbeddingRequest r
393387
* @see #embedding(OpenAiEmbeddingRequest) for conveninece api
394388
* @since 1.4.0
395389
*/
396-
@Beta
397390
@Nonnull
398391
public EmbeddingsCreate200Response embedding(@Nonnull final EmbeddingsCreateRequest request)
399392
throws OpenAiClientException {
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package com.sap.ai.sdk.foundationmodels.openai;
22

3-
import com.google.common.annotations.Beta;
4-
53
/**
64
* Represents an item in a {@link OpenAiMessageContent} object.
75
*
86
* @since 1.4.0
97
*/
10-
@Beta
118
public sealed interface OpenAiContentItem permits OpenAiTextItem, OpenAiImageItem {}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.sap.ai.sdk.foundationmodels.openai;
22

3-
import com.google.common.annotations.Beta;
43
import com.sap.ai.sdk.foundationmodels.openai.generated.model.EmbeddingsCreateRequest;
54
import com.sap.ai.sdk.foundationmodels.openai.generated.model.EmbeddingsCreateRequestInput;
65
import java.util.Collections;
@@ -16,11 +15,10 @@
1615
*
1716
* @since 1.4.0
1817
*/
19-
@Beta
2018
@Value
2119
public class OpenAiEmbeddingRequest {
2220
/** List of tokens to be embedded. */
23-
@Nonnull private final List<String> tokens;
21+
@Nonnull List<String> tokens;
2422

2523
/**
2624
* Constructs an OpenAiEmbeddingRequest from a list of strings.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static lombok.AccessLevel.NONE;
44
import static lombok.AccessLevel.PACKAGE;
55

6-
import com.google.common.annotations.Beta;
76
import com.sap.ai.sdk.foundationmodels.openai.generated.model.EmbeddingsCreate200Response;
87
import java.util.ArrayList;
98
import java.util.List;
@@ -20,7 +19,6 @@
2019
*
2120
* @since 1.4.0
2221
*/
23-
@Beta
2422
@Value
2523
@AllArgsConstructor(access = PACKAGE)
2624
@Setter(value = NONE)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.sap.ai.sdk.foundationmodels.openai;
22

3-
import com.google.common.annotations.Beta;
43
import javax.annotation.Nonnull;
54
import lombok.AllArgsConstructor;
65
import lombok.Value;
@@ -10,7 +9,6 @@
109
*
1110
* @since 1.6.0
1211
*/
13-
@Beta
1412
@Value
1513
@AllArgsConstructor(access = lombok.AccessLevel.PACKAGE)
1614
public class OpenAiFunctionCall implements OpenAiToolCall {

0 commit comments

Comments
 (0)