Skip to content

Commit fe07f70

Browse files
committed
Update orchestration based on main
1 parent 9927f24 commit fe07f70

File tree

4 files changed

+89
-99
lines changed

4 files changed

+89
-99
lines changed

orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/EmbeddingsOrchestrationConfig.java

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
public class EmbeddingsOrchestrationConfig
2929
// CHECKSTYLE:ON
3030
{
31-
@JsonProperty("module_configs")
32-
private EmbeddingsModuleConfigs moduleConfigs;
31+
@JsonProperty("modules")
32+
private EmbeddingsModuleConfigs modules;
3333

3434
@JsonAnySetter @JsonAnyGetter
3535
private final Map<String, Object> cloudSdkCustomFields = new LinkedHashMap<>();
@@ -38,36 +38,35 @@ public class EmbeddingsOrchestrationConfig
3838
protected EmbeddingsOrchestrationConfig() {}
3939

4040
/**
41-
* Set the moduleConfigs of this {@link EmbeddingsOrchestrationConfig} instance and return the
42-
* same instance.
41+
* Set the modules of this {@link EmbeddingsOrchestrationConfig} instance and return the same
42+
* instance.
4343
*
44-
* @param moduleConfigs The moduleConfigs of this {@link EmbeddingsOrchestrationConfig}
44+
* @param modules The modules of this {@link EmbeddingsOrchestrationConfig}
4545
* @return The same instance of this {@link EmbeddingsOrchestrationConfig} class
4646
*/
4747
@Nonnull
48-
public EmbeddingsOrchestrationConfig moduleConfigs(
49-
@Nonnull final EmbeddingsModuleConfigs moduleConfigs) {
50-
this.moduleConfigs = moduleConfigs;
48+
public EmbeddingsOrchestrationConfig modules(@Nonnull final EmbeddingsModuleConfigs modules) {
49+
this.modules = modules;
5150
return this;
5251
}
5352

5453
/**
55-
* Get moduleConfigs
54+
* Get modules
5655
*
57-
* @return moduleConfigs The moduleConfigs of this {@link EmbeddingsOrchestrationConfig} instance.
56+
* @return modules The modules of this {@link EmbeddingsOrchestrationConfig} instance.
5857
*/
5958
@Nonnull
60-
public EmbeddingsModuleConfigs getModuleConfigs() {
61-
return moduleConfigs;
59+
public EmbeddingsModuleConfigs getModules() {
60+
return modules;
6261
}
6362

6463
/**
65-
* Set the moduleConfigs of this {@link EmbeddingsOrchestrationConfig} instance.
64+
* Set the modules of this {@link EmbeddingsOrchestrationConfig} instance.
6665
*
67-
* @param moduleConfigs The moduleConfigs of this {@link EmbeddingsOrchestrationConfig}
66+
* @param modules The modules of this {@link EmbeddingsOrchestrationConfig}
6867
*/
69-
public void setModuleConfigs(@Nonnull final EmbeddingsModuleConfigs moduleConfigs) {
70-
this.moduleConfigs = moduleConfigs;
68+
public void setModules(@Nonnull final EmbeddingsModuleConfigs modules) {
69+
this.modules = modules;
7170
}
7271

7372
/**
@@ -110,7 +109,7 @@ public Object getCustomField(@Nonnull final String name) throws NoSuchElementExc
110109
@Nonnull
111110
public Map<String, Object> toMap() {
112111
final Map<String, Object> declaredFields = new LinkedHashMap<>(cloudSdkCustomFields);
113-
if (moduleConfigs != null) declaredFields.put("moduleConfigs", moduleConfigs);
112+
if (modules != null) declaredFields.put("modules", modules);
114113
return declaredFields;
115114
}
116115

@@ -139,20 +138,20 @@ public boolean equals(@Nullable final java.lang.Object o) {
139138
(EmbeddingsOrchestrationConfig) o;
140139
return Objects.equals(
141140
this.cloudSdkCustomFields, embeddingsOrchestrationConfig.cloudSdkCustomFields)
142-
&& Objects.equals(this.moduleConfigs, embeddingsOrchestrationConfig.moduleConfigs);
141+
&& Objects.equals(this.modules, embeddingsOrchestrationConfig.modules);
143142
}
144143

145144
@Override
146145
public int hashCode() {
147-
return Objects.hash(moduleConfigs, cloudSdkCustomFields);
146+
return Objects.hash(modules, cloudSdkCustomFields);
148147
}
149148

150149
@Override
151150
@Nonnull
152151
public String toString() {
153152
final StringBuilder sb = new StringBuilder();
154153
sb.append("class EmbeddingsOrchestrationConfig {\n");
155-
sb.append(" moduleConfigs: ").append(toIndentedString(moduleConfigs)).append("\n");
154+
sb.append(" modules: ").append(toIndentedString(modules)).append("\n");
156155
cloudSdkCustomFields.forEach(
157156
(k, v) ->
158157
sb.append(" ").append(k).append(": ").append(toIndentedString(v)).append("\n"));
@@ -175,18 +174,17 @@ private String toIndentedString(final java.lang.Object o) {
175174
* EmbeddingsOrchestrationConfig} instance with all required arguments.
176175
*/
177176
public static Builder create() {
178-
return (moduleConfigs) -> new EmbeddingsOrchestrationConfig().moduleConfigs(moduleConfigs);
177+
return (modules) -> new EmbeddingsOrchestrationConfig().modules(modules);
179178
}
180179

181180
/** Builder helper class. */
182181
public interface Builder {
183182
/**
184-
* Set the moduleConfigs of this {@link EmbeddingsOrchestrationConfig} instance.
183+
* Set the modules of this {@link EmbeddingsOrchestrationConfig} instance.
185184
*
186-
* @param moduleConfigs The moduleConfigs of this {@link EmbeddingsOrchestrationConfig}
185+
* @param modules The modules of this {@link EmbeddingsOrchestrationConfig}
187186
* @return The EmbeddingsOrchestrationConfig instance.
188187
*/
189-
EmbeddingsOrchestrationConfig moduleConfigs(
190-
@Nonnull final EmbeddingsModuleConfigs moduleConfigs);
188+
EmbeddingsOrchestrationConfig modules(@Nonnull final EmbeddingsModuleConfigs modules);
191189
}
192190
}

orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/EmbeddingsPostRequest.java

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
public class EmbeddingsPostRequest
2929
// CHECKSTYLE:ON
3030
{
31-
@JsonProperty("orchestration_config")
32-
private EmbeddingsOrchestrationConfig orchestrationConfig;
31+
@JsonProperty("config")
32+
private EmbeddingsOrchestrationConfig config;
3333

3434
@JsonProperty("input")
3535
private EmbeddingsInput input;
@@ -41,38 +41,34 @@ public class EmbeddingsPostRequest
4141
protected EmbeddingsPostRequest() {}
4242

4343
/**
44-
* Set the orchestrationConfig of this {@link EmbeddingsPostRequest} instance and return the same
45-
* instance.
44+
* Set the config of this {@link EmbeddingsPostRequest} instance and return the same instance.
4645
*
47-
* @param orchestrationConfig The orchestrationConfig of this {@link EmbeddingsPostRequest}
46+
* @param config The config of this {@link EmbeddingsPostRequest}
4847
* @return The same instance of this {@link EmbeddingsPostRequest} class
4948
*/
5049
@Nonnull
51-
public EmbeddingsPostRequest orchestrationConfig(
52-
@Nonnull final EmbeddingsOrchestrationConfig orchestrationConfig) {
53-
this.orchestrationConfig = orchestrationConfig;
50+
public EmbeddingsPostRequest config(@Nonnull final EmbeddingsOrchestrationConfig config) {
51+
this.config = config;
5452
return this;
5553
}
5654

5755
/**
58-
* Get orchestrationConfig
56+
* Get config
5957
*
60-
* @return orchestrationConfig The orchestrationConfig of this {@link EmbeddingsPostRequest}
61-
* instance.
58+
* @return config The config of this {@link EmbeddingsPostRequest} instance.
6259
*/
6360
@Nonnull
64-
public EmbeddingsOrchestrationConfig getOrchestrationConfig() {
65-
return orchestrationConfig;
61+
public EmbeddingsOrchestrationConfig getConfig() {
62+
return config;
6663
}
6764

6865
/**
69-
* Set the orchestrationConfig of this {@link EmbeddingsPostRequest} instance.
66+
* Set the config of this {@link EmbeddingsPostRequest} instance.
7067
*
71-
* @param orchestrationConfig The orchestrationConfig of this {@link EmbeddingsPostRequest}
68+
* @param config The config of this {@link EmbeddingsPostRequest}
7269
*/
73-
public void setOrchestrationConfig(
74-
@Nonnull final EmbeddingsOrchestrationConfig orchestrationConfig) {
75-
this.orchestrationConfig = orchestrationConfig;
70+
public void setConfig(@Nonnull final EmbeddingsOrchestrationConfig config) {
71+
this.config = config;
7672
}
7773

7874
/**
@@ -145,7 +141,7 @@ public Object getCustomField(@Nonnull final String name) throws NoSuchElementExc
145141
@Nonnull
146142
public Map<String, Object> toMap() {
147143
final Map<String, Object> declaredFields = new LinkedHashMap<>(cloudSdkCustomFields);
148-
if (orchestrationConfig != null) declaredFields.put("orchestrationConfig", orchestrationConfig);
144+
if (config != null) declaredFields.put("config", config);
149145
if (input != null) declaredFields.put("input", input);
150146
return declaredFields;
151147
}
@@ -172,23 +168,21 @@ public boolean equals(@Nullable final java.lang.Object o) {
172168
}
173169
final EmbeddingsPostRequest embeddingsPostRequest = (EmbeddingsPostRequest) o;
174170
return Objects.equals(this.cloudSdkCustomFields, embeddingsPostRequest.cloudSdkCustomFields)
175-
&& Objects.equals(this.orchestrationConfig, embeddingsPostRequest.orchestrationConfig)
171+
&& Objects.equals(this.config, embeddingsPostRequest.config)
176172
&& Objects.equals(this.input, embeddingsPostRequest.input);
177173
}
178174

179175
@Override
180176
public int hashCode() {
181-
return Objects.hash(orchestrationConfig, input, cloudSdkCustomFields);
177+
return Objects.hash(config, input, cloudSdkCustomFields);
182178
}
183179

184180
@Override
185181
@Nonnull
186182
public String toString() {
187183
final StringBuilder sb = new StringBuilder();
188184
sb.append("class EmbeddingsPostRequest {\n");
189-
sb.append(" orchestrationConfig: ")
190-
.append(toIndentedString(orchestrationConfig))
191-
.append("\n");
185+
sb.append(" config: ").append(toIndentedString(config)).append("\n");
192186
sb.append(" input: ").append(toIndentedString(input)).append("\n");
193187
cloudSdkCustomFields.forEach(
194188
(k, v) ->
@@ -212,20 +206,18 @@ private String toIndentedString(final java.lang.Object o) {
212206
* instance with all required arguments.
213207
*/
214208
public static Builder create() {
215-
return (orchestrationConfig) ->
216-
(input) ->
217-
new EmbeddingsPostRequest().orchestrationConfig(orchestrationConfig).input(input);
209+
return (config) -> (input) -> new EmbeddingsPostRequest().config(config).input(input);
218210
}
219211

220212
/** Builder helper class. */
221213
public interface Builder {
222214
/**
223-
* Set the orchestrationConfig of this {@link EmbeddingsPostRequest} instance.
215+
* Set the config of this {@link EmbeddingsPostRequest} instance.
224216
*
225-
* @param orchestrationConfig The orchestrationConfig of this {@link EmbeddingsPostRequest}
217+
* @param config The config of this {@link EmbeddingsPostRequest}
226218
* @return The EmbeddingsPostRequest builder.
227219
*/
228-
Builder1 orchestrationConfig(@Nonnull final EmbeddingsOrchestrationConfig orchestrationConfig);
220+
Builder1 config(@Nonnull final EmbeddingsOrchestrationConfig config);
229221
}
230222

231223
/** Builder helper class. */

orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/EmbeddingsPostResponse.java

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public class EmbeddingsPostResponse
3131
@JsonProperty("request_id")
3232
private String requestId;
3333

34-
@JsonProperty("module_results")
35-
private ModuleResultsBase moduleResults;
34+
@JsonProperty("intermediate_results")
35+
private ModuleResultsBase intermediateResults;
3636

37-
@JsonProperty("orchestration_result")
38-
private EmbeddingsResponse orchestrationResult;
37+
@JsonProperty("final_result")
38+
private EmbeddingsResponse finalResult;
3939

4040
@JsonAnySetter @JsonAnyGetter
4141
private final Map<String, Object> cloudSdkCustomFields = new LinkedHashMap<>();
@@ -75,69 +75,69 @@ public void setRequestId(@Nonnull final String requestId) {
7575
}
7676

7777
/**
78-
* Set the moduleResults of this {@link EmbeddingsPostResponse} instance and return the same
78+
* Set the intermediateResults of this {@link EmbeddingsPostResponse} instance and return the same
7979
* instance.
8080
*
81-
* @param moduleResults The moduleResults of this {@link EmbeddingsPostResponse}
81+
* @param intermediateResults The intermediateResults of this {@link EmbeddingsPostResponse}
8282
* @return The same instance of this {@link EmbeddingsPostResponse} class
8383
*/
8484
@Nonnull
85-
public EmbeddingsPostResponse moduleResults(@Nullable final ModuleResultsBase moduleResults) {
86-
this.moduleResults = moduleResults;
85+
public EmbeddingsPostResponse intermediateResults(
86+
@Nullable final ModuleResultsBase intermediateResults) {
87+
this.intermediateResults = intermediateResults;
8788
return this;
8889
}
8990

9091
/**
91-
* Get moduleResults
92+
* Get intermediateResults
9293
*
93-
* @return moduleResults The moduleResults of this {@link EmbeddingsPostResponse} instance.
94+
* @return intermediateResults The intermediateResults of this {@link EmbeddingsPostResponse}
95+
* instance.
9496
*/
9597
@Nonnull
96-
public ModuleResultsBase getModuleResults() {
97-
return moduleResults;
98+
public ModuleResultsBase getIntermediateResults() {
99+
return intermediateResults;
98100
}
99101

100102
/**
101-
* Set the moduleResults of this {@link EmbeddingsPostResponse} instance.
103+
* Set the intermediateResults of this {@link EmbeddingsPostResponse} instance.
102104
*
103-
* @param moduleResults The moduleResults of this {@link EmbeddingsPostResponse}
105+
* @param intermediateResults The intermediateResults of this {@link EmbeddingsPostResponse}
104106
*/
105-
public void setModuleResults(@Nullable final ModuleResultsBase moduleResults) {
106-
this.moduleResults = moduleResults;
107+
public void setIntermediateResults(@Nullable final ModuleResultsBase intermediateResults) {
108+
this.intermediateResults = intermediateResults;
107109
}
108110

109111
/**
110-
* Set the orchestrationResult of this {@link EmbeddingsPostResponse} instance and return the same
112+
* Set the finalResult of this {@link EmbeddingsPostResponse} instance and return the same
111113
* instance.
112114
*
113-
* @param orchestrationResult The orchestrationResult of this {@link EmbeddingsPostResponse}
115+
* @param finalResult The finalResult of this {@link EmbeddingsPostResponse}
114116
* @return The same instance of this {@link EmbeddingsPostResponse} class
115117
*/
116118
@Nonnull
117-
public EmbeddingsPostResponse orchestrationResult(
118-
@Nullable final EmbeddingsResponse orchestrationResult) {
119-
this.orchestrationResult = orchestrationResult;
119+
public EmbeddingsPostResponse finalResult(@Nullable final EmbeddingsResponse finalResult) {
120+
this.finalResult = finalResult;
120121
return this;
121122
}
122123

123124
/**
124-
* Get orchestrationResult
125+
* Get finalResult
125126
*
126-
* @return orchestrationResult The orchestrationResult of this {@link EmbeddingsPostResponse}
127-
* instance.
127+
* @return finalResult The finalResult of this {@link EmbeddingsPostResponse} instance.
128128
*/
129129
@Nonnull
130-
public EmbeddingsResponse getOrchestrationResult() {
131-
return orchestrationResult;
130+
public EmbeddingsResponse getFinalResult() {
131+
return finalResult;
132132
}
133133

134134
/**
135-
* Set the orchestrationResult of this {@link EmbeddingsPostResponse} instance.
135+
* Set the finalResult of this {@link EmbeddingsPostResponse} instance.
136136
*
137-
* @param orchestrationResult The orchestrationResult of this {@link EmbeddingsPostResponse}
137+
* @param finalResult The finalResult of this {@link EmbeddingsPostResponse}
138138
*/
139-
public void setOrchestrationResult(@Nullable final EmbeddingsResponse orchestrationResult) {
140-
this.orchestrationResult = orchestrationResult;
139+
public void setFinalResult(@Nullable final EmbeddingsResponse finalResult) {
140+
this.finalResult = finalResult;
141141
}
142142

143143
/**
@@ -180,8 +180,8 @@ public Object getCustomField(@Nonnull final String name) throws NoSuchElementExc
180180
public Map<String, Object> toMap() {
181181
final Map<String, Object> declaredFields = new LinkedHashMap<>(cloudSdkCustomFields);
182182
if (requestId != null) declaredFields.put("requestId", requestId);
183-
if (moduleResults != null) declaredFields.put("moduleResults", moduleResults);
184-
if (orchestrationResult != null) declaredFields.put("orchestrationResult", orchestrationResult);
183+
if (intermediateResults != null) declaredFields.put("intermediateResults", intermediateResults);
184+
if (finalResult != null) declaredFields.put("finalResult", finalResult);
185185
return declaredFields;
186186
}
187187

@@ -208,13 +208,13 @@ public boolean equals(@Nullable final java.lang.Object o) {
208208
final EmbeddingsPostResponse embeddingsPostResponse = (EmbeddingsPostResponse) o;
209209
return Objects.equals(this.cloudSdkCustomFields, embeddingsPostResponse.cloudSdkCustomFields)
210210
&& Objects.equals(this.requestId, embeddingsPostResponse.requestId)
211-
&& Objects.equals(this.moduleResults, embeddingsPostResponse.moduleResults)
212-
&& Objects.equals(this.orchestrationResult, embeddingsPostResponse.orchestrationResult);
211+
&& Objects.equals(this.intermediateResults, embeddingsPostResponse.intermediateResults)
212+
&& Objects.equals(this.finalResult, embeddingsPostResponse.finalResult);
213213
}
214214

215215
@Override
216216
public int hashCode() {
217-
return Objects.hash(requestId, moduleResults, orchestrationResult, cloudSdkCustomFields);
217+
return Objects.hash(requestId, intermediateResults, finalResult, cloudSdkCustomFields);
218218
}
219219

220220
@Override
@@ -223,10 +223,10 @@ public String toString() {
223223
final StringBuilder sb = new StringBuilder();
224224
sb.append("class EmbeddingsPostResponse {\n");
225225
sb.append(" requestId: ").append(toIndentedString(requestId)).append("\n");
226-
sb.append(" moduleResults: ").append(toIndentedString(moduleResults)).append("\n");
227-
sb.append(" orchestrationResult: ")
228-
.append(toIndentedString(orchestrationResult))
226+
sb.append(" intermediateResults: ")
227+
.append(toIndentedString(intermediateResults))
229228
.append("\n");
229+
sb.append(" finalResult: ").append(toIndentedString(finalResult)).append("\n");
230230
cloudSdkCustomFields.forEach(
231231
(k, v) ->
232232
sb.append(" ").append(k).append(": ").append(toIndentedString(v)).append("\n"));

0 commit comments

Comments
 (0)