Skip to content

Commit 0952513

Browse files
rpanackalrpanackal
committed
Using discriminator spec everywhere. test success.
1 parent 561a201 commit 0952513

15 files changed

+371
-46
lines changed

‎orchestration/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<phase>generate-sources</phase>
144144
<configuration>
145145
<!-- Specify the input OpenAPI spec file -->
146-
<inputSpec>${project.basedir}/src/main/resources/spec/orchestration.yaml</inputSpec>
146+
<inputSpec>${project.basedir}/src/main/resources/spec/orchestration_discrim.yaml</inputSpec>
147147
<output>${project.basedir}</output>
148148
<!-- Specify the generator to use, e.g., java, spring, kotlin, etc. -->
149149
<generatorName>java</generatorName>
@@ -176,6 +176,14 @@
176176
<generateSupportingFiles>false</generateSupportingFiles>
177177
<generateApis>false</generateApis>
178178
<library>resttemplate</library>
179+
<!--<importMappings>
180+
<importMapping>com.sap.ai.sdk.orchestration.client.model.FilterConfig=com.sap.ai.sdk.orchestration.client
181+
.oneofs.FilterConfig</importMapping>
182+
<importMapping>com.sap.ai.sdk.orchestration.client.model.GroundingModuleConfigConfigFiltersInner=com.sap
183+
.ai.sdk.orchestration.client.oneofs.GroundingModuleConfigConfigFiltersInner</importMapping>
184+
<importMapping>com.sap.ai.sdk.orchestration.client.model.LLMModuleResult=com.sap.ai.sdk
185+
.orchestration.client.oneofs.LLMModuleResult</importMapping>
186+
</importMappings>-->
179187
<!--<configHelp>true</configHelp>-->
180188
</configuration>
181189
</execution>

‎orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationClient.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ public class OrchestrationClient implements OrchestrationConfig<OrchestrationCli
4747
.visibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
4848
.visibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE)
4949
.serializationInclusion(JsonInclude.Include.NON_NULL)
50-
.build()
51-
.disableDefaultTyping();
50+
.build();
5251
}
5352

5453
@Delegate(types = IDelegate.class)

‎orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafetyFilterConfig.java‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@
2121

2222
/** AzureContentSafetyFilterConfig */
2323
@JsonPropertyOrder({
24+
AzureContentSafetyFilterConfig.JSON_PROPERTY_X_DISCRIMINATOR_VALUE,
2425
AzureContentSafetyFilterConfig.JSON_PROPERTY_TYPE,
2526
AzureContentSafetyFilterConfig.JSON_PROPERTY_CONFIG
2627
})
2728
@javax.annotation.Generated(
2829
value = "org.openapitools.codegen.languages.JavaClientCodegen",
2930
comments = "Generator version: 7.9.0")
3031
public class AzureContentSafetyFilterConfig implements FilterConfig {
32+
public static final String JSON_PROPERTY_X_DISCRIMINATOR_VALUE = "x-discriminator-value";
33+
private String xDiscriminatorValue;
34+
3135
/** String represents name of the filter provider */
3236
public enum TypeEnum {
3337
AZURE_CONTENT_SAFETY("azure_content_safety"),
@@ -69,6 +73,30 @@ public static TypeEnum fromValue(String value) {
6973

7074
public AzureContentSafetyFilterConfig() {}
7175

76+
public AzureContentSafetyFilterConfig xDiscriminatorValue(String xDiscriminatorValue) {
77+
78+
this.xDiscriminatorValue = xDiscriminatorValue;
79+
return this;
80+
}
81+
82+
/**
83+
* Discriminator for the type of the object
84+
*
85+
* @return xDiscriminatorValue
86+
*/
87+
@javax.annotation.Nullable
88+
@JsonProperty(JSON_PROPERTY_X_DISCRIMINATOR_VALUE)
89+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
90+
public String getxDiscriminatorValue() {
91+
return xDiscriminatorValue;
92+
}
93+
94+
@JsonProperty(JSON_PROPERTY_X_DISCRIMINATOR_VALUE)
95+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
96+
public void setxDiscriminatorValue(String xDiscriminatorValue) {
97+
this.xDiscriminatorValue = xDiscriminatorValue;
98+
}
99+
72100
public AzureContentSafetyFilterConfig type(TypeEnum type) {
73101

74102
this.type = type;
@@ -127,19 +155,24 @@ public boolean equals(Object o) {
127155
}
128156
AzureContentSafetyFilterConfig azureContentSafetyFilterConfig =
129157
(AzureContentSafetyFilterConfig) o;
130-
return Objects.equals(this.type, azureContentSafetyFilterConfig.type)
158+
return Objects.equals(
159+
this.xDiscriminatorValue, azureContentSafetyFilterConfig.xDiscriminatorValue)
160+
&& Objects.equals(this.type, azureContentSafetyFilterConfig.type)
131161
&& Objects.equals(this.config, azureContentSafetyFilterConfig.config);
132162
}
133163

134164
@Override
135165
public int hashCode() {
136-
return Objects.hash(type, config);
166+
return Objects.hash(xDiscriminatorValue, type, config);
137167
}
138168

139169
@Override
140170
public String toString() {
141171
StringBuilder sb = new StringBuilder();
142172
sb.append("class AzureContentSafetyFilterConfig {\n");
173+
sb.append(" xDiscriminatorValue: ")
174+
.append(toIndentedString(xDiscriminatorValue))
175+
.append("\n");
143176
sb.append(" type: ").append(toIndentedString(type)).append("\n");
144177
sb.append(" config: ").append(toIndentedString(config)).append("\n");
145178
sb.append("}");
@@ -168,6 +201,11 @@ protected Builder(AzureContentSafetyFilterConfig instance) {
168201
this.instance = instance;
169202
}
170203

204+
public AzureContentSafetyFilterConfig.Builder xDiscriminatorValue(String xDiscriminatorValue) {
205+
this.instance.xDiscriminatorValue = xDiscriminatorValue;
206+
return this;
207+
}
208+
171209
public AzureContentSafetyFilterConfig.Builder type(TypeEnum type) {
172210
this.instance.type = type;
173211
return this;
@@ -205,6 +243,9 @@ public static AzureContentSafetyFilterConfig.Builder builder() {
205243

206244
/** Create a builder with a shallow copy of this instance. */
207245
public AzureContentSafetyFilterConfig.Builder toBuilder() {
208-
return new AzureContentSafetyFilterConfig.Builder().type(getType()).config(getConfig());
246+
return new AzureContentSafetyFilterConfig.Builder()
247+
.xDiscriminatorValue(getxDiscriminatorValue())
248+
.type(getType())
249+
.config(getConfig());
209250
}
210251
}

‎orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIConfig.java‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/** DPIConfig */
2525
@JsonPropertyOrder({
26+
DPIConfig.JSON_PROPERTY_X_DISCRIMINATOR_VALUE,
2627
DPIConfig.JSON_PROPERTY_TYPE,
2728
DPIConfig.JSON_PROPERTY_METHOD,
2829
DPIConfig.JSON_PROPERTY_ENTITIES
@@ -31,6 +32,9 @@
3132
value = "org.openapitools.codegen.languages.JavaClientCodegen",
3233
comments = "Generator version: 7.9.0")
3334
public class DPIConfig implements MaskingProviderConfig {
35+
public static final String JSON_PROPERTY_X_DISCRIMINATOR_VALUE = "x-discriminator-value";
36+
private String xDiscriminatorValue;
37+
3438
/** Type of masking service provider */
3539
public enum TypeEnum {
3640
SAP_DATA_PRIVACY_INTEGRATION("sap_data_privacy_integration"),
@@ -110,6 +114,30 @@ public static MethodEnum fromValue(String value) {
110114

111115
public DPIConfig() {}
112116

117+
public DPIConfig xDiscriminatorValue(String xDiscriminatorValue) {
118+
119+
this.xDiscriminatorValue = xDiscriminatorValue;
120+
return this;
121+
}
122+
123+
/**
124+
* Discriminator for the type of the object
125+
*
126+
* @return xDiscriminatorValue
127+
*/
128+
@javax.annotation.Nullable
129+
@JsonProperty(JSON_PROPERTY_X_DISCRIMINATOR_VALUE)
130+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
131+
public String getxDiscriminatorValue() {
132+
return xDiscriminatorValue;
133+
}
134+
135+
@JsonProperty(JSON_PROPERTY_X_DISCRIMINATOR_VALUE)
136+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
137+
public void setxDiscriminatorValue(String xDiscriminatorValue) {
138+
this.xDiscriminatorValue = xDiscriminatorValue;
139+
}
140+
113141
public DPIConfig type(TypeEnum type) {
114142

115143
this.type = type;
@@ -199,20 +227,24 @@ public boolean equals(Object o) {
199227
return false;
200228
}
201229
DPIConfig dpIConfig = (DPIConfig) o;
202-
return Objects.equals(this.type, dpIConfig.type)
230+
return Objects.equals(this.xDiscriminatorValue, dpIConfig.xDiscriminatorValue)
231+
&& Objects.equals(this.type, dpIConfig.type)
203232
&& Objects.equals(this.method, dpIConfig.method)
204233
&& Objects.equals(this.entities, dpIConfig.entities);
205234
}
206235

207236
@Override
208237
public int hashCode() {
209-
return Objects.hash(type, method, entities);
238+
return Objects.hash(xDiscriminatorValue, type, method, entities);
210239
}
211240

212241
@Override
213242
public String toString() {
214243
StringBuilder sb = new StringBuilder();
215244
sb.append("class DPIConfig {\n");
245+
sb.append(" xDiscriminatorValue: ")
246+
.append(toIndentedString(xDiscriminatorValue))
247+
.append("\n");
216248
sb.append(" type: ").append(toIndentedString(type)).append("\n");
217249
sb.append(" method: ").append(toIndentedString(method)).append("\n");
218250
sb.append(" entities: ").append(toIndentedString(entities)).append("\n");
@@ -242,6 +274,11 @@ protected Builder(DPIConfig instance) {
242274
this.instance = instance;
243275
}
244276

277+
public DPIConfig.Builder xDiscriminatorValue(String xDiscriminatorValue) {
278+
this.instance.xDiscriminatorValue = xDiscriminatorValue;
279+
return this;
280+
}
281+
245282
public DPIConfig.Builder type(TypeEnum type) {
246283
this.instance.type = type;
247284
return this;
@@ -284,6 +321,10 @@ public static DPIConfig.Builder builder() {
284321

285322
/** Create a builder with a shallow copy of this instance. */
286323
public DPIConfig.Builder toBuilder() {
287-
return new DPIConfig.Builder().type(getType()).method(getMethod()).entities(getEntities());
324+
return new DPIConfig.Builder()
325+
.xDiscriminatorValue(getxDiscriminatorValue())
326+
.type(getType())
327+
.method(getMethod())
328+
.entities(getEntities());
288329
}
289330
}

‎orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilterConfig.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,27 @@
1313
package com.sap.ai.sdk.orchestration.client.model;
1414

1515
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
16+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1617
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1718

1819
@javax.annotation.Generated(
1920
value = "org.openapitools.codegen.languages.JavaClientCodegen",
2021
comments = "Generator version: 7.9.0")
2122
@JsonIgnoreProperties(
22-
value = "", // ignore manually set , it will be automatically generated by Jackson during
23-
// serialization
24-
allowSetters = true // allows the to be set during deserialization
23+
value = "x-discriminator-value", // ignore manually set x-discriminator-value, it will be
24+
// automatically generated by Jackson during serialization
25+
allowSetters = true // allows the x-discriminator-value to be set during deserialization
2526
)
2627
@JsonTypeInfo(
2728
use = JsonTypeInfo.Id.NAME,
2829
include = JsonTypeInfo.As.PROPERTY,
29-
property = "",
30+
property = "x-discriminator-value",
3031
visible = true)
31-
public interface FilterConfig {}
32+
@JsonSubTypes({
33+
@JsonSubTypes.Type(
34+
value = AzureContentSafetyFilterConfig.class,
35+
name = "AzureContentSafetyFilterConfig"),
36+
})
37+
public interface FilterConfig {
38+
public String getxDiscriminatorValue();
39+
}

‎orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoice.java‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/** LLMChoice */
2525
@JsonPropertyOrder({
26+
LLMChoice.JSON_PROPERTY_X_DISCRIMINATOR_VALUE,
2627
LLMChoice.JSON_PROPERTY_INDEX,
2728
LLMChoice.JSON_PROPERTY_MESSAGE,
2829
LLMChoice.JSON_PROPERTY_LOGPROBS,
@@ -32,6 +33,9 @@
3233
value = "org.openapitools.codegen.languages.JavaClientCodegen",
3334
comments = "Generator version: 7.9.0")
3435
public class LLMChoice implements ModuleResultsOutputUnmaskingInner {
36+
public static final String JSON_PROPERTY_X_DISCRIMINATOR_VALUE = "x-discriminator-value";
37+
private String xDiscriminatorValue;
38+
3539
public static final String JSON_PROPERTY_INDEX = "index";
3640
private Integer index;
3741

@@ -46,6 +50,30 @@ public class LLMChoice implements ModuleResultsOutputUnmaskingInner {
4650

4751
public LLMChoice() {}
4852

53+
public LLMChoice xDiscriminatorValue(String xDiscriminatorValue) {
54+
55+
this.xDiscriminatorValue = xDiscriminatorValue;
56+
return this;
57+
}
58+
59+
/**
60+
* Discriminator for the type of the object
61+
*
62+
* @return xDiscriminatorValue
63+
*/
64+
@javax.annotation.Nullable
65+
@JsonProperty(JSON_PROPERTY_X_DISCRIMINATOR_VALUE)
66+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
67+
public String getxDiscriminatorValue() {
68+
return xDiscriminatorValue;
69+
}
70+
71+
@JsonProperty(JSON_PROPERTY_X_DISCRIMINATOR_VALUE)
72+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
73+
public void setxDiscriminatorValue(String xDiscriminatorValue) {
74+
this.xDiscriminatorValue = xDiscriminatorValue;
75+
}
76+
4977
public LLMChoice index(Integer index) {
5078

5179
this.index = index;
@@ -162,21 +190,25 @@ public boolean equals(Object o) {
162190
return false;
163191
}
164192
LLMChoice llMChoice = (LLMChoice) o;
165-
return Objects.equals(this.index, llMChoice.index)
193+
return Objects.equals(this.xDiscriminatorValue, llMChoice.xDiscriminatorValue)
194+
&& Objects.equals(this.index, llMChoice.index)
166195
&& Objects.equals(this.message, llMChoice.message)
167196
&& Objects.equals(this.logprobs, llMChoice.logprobs)
168197
&& Objects.equals(this.finishReason, llMChoice.finishReason);
169198
}
170199

171200
@Override
172201
public int hashCode() {
173-
return Objects.hash(index, message, logprobs, finishReason);
202+
return Objects.hash(xDiscriminatorValue, index, message, logprobs, finishReason);
174203
}
175204

176205
@Override
177206
public String toString() {
178207
StringBuilder sb = new StringBuilder();
179208
sb.append("class LLMChoice {\n");
209+
sb.append(" xDiscriminatorValue: ")
210+
.append(toIndentedString(xDiscriminatorValue))
211+
.append("\n");
180212
sb.append(" index: ").append(toIndentedString(index)).append("\n");
181213
sb.append(" message: ").append(toIndentedString(message)).append("\n");
182214
sb.append(" logprobs: ").append(toIndentedString(logprobs)).append("\n");
@@ -207,6 +239,11 @@ protected Builder(LLMChoice instance) {
207239
this.instance = instance;
208240
}
209241

242+
public LLMChoice.Builder xDiscriminatorValue(String xDiscriminatorValue) {
243+
this.instance.xDiscriminatorValue = xDiscriminatorValue;
244+
return this;
245+
}
246+
210247
public LLMChoice.Builder index(Integer index) {
211248
this.instance.index = index;
212249
return this;
@@ -255,6 +292,7 @@ public static LLMChoice.Builder builder() {
255292
/** Create a builder with a shallow copy of this instance. */
256293
public LLMChoice.Builder toBuilder() {
257294
return new LLMChoice.Builder()
295+
.xDiscriminatorValue(getxDiscriminatorValue())
258296
.index(getIndex())
259297
.message(getMessage())
260298
.logprobs(getLogprobs())

0 commit comments

Comments
 (0)