Skip to content

Commit af0dd02

Browse files
authored
Update with new generator version (#235)
1 parent 3e596de commit af0dd02

File tree

10 files changed

+39
-47
lines changed

10 files changed

+39
-47
lines changed

orchestration/src/main/java/com/sap/ai/sdk/orchestration/JacksonMixins.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@ interface LLMModuleResultMixIn {}
1818
@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
1919
@JsonDeserialize(as = LLMChoice.class)
2020
interface ModuleResultsOutputUnmaskingInnerMixIn {}
21-
22-
/** Mixin to suppress @JsonTypeInfo for oneOf interfaces. */
23-
@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
24-
interface NoTypeInfoMixin {}
2521
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@
1111
import com.sap.ai.sdk.core.DeploymentResolutionException;
1212
import com.sap.ai.sdk.orchestration.model.CompletionPostRequest;
1313
import com.sap.ai.sdk.orchestration.model.CompletionPostResponse;
14-
import com.sap.ai.sdk.orchestration.model.FilterConfig;
1514
import com.sap.ai.sdk.orchestration.model.LLMModuleResult;
16-
import com.sap.ai.sdk.orchestration.model.MaskingProviderConfig;
1715
import com.sap.ai.sdk.orchestration.model.ModuleConfigs;
1816
import com.sap.ai.sdk.orchestration.model.ModuleResultsOutputUnmaskingInner;
1917
import com.sap.ai.sdk.orchestration.model.OrchestrationConfig;
20-
import com.sap.ai.sdk.orchestration.model.TemplatingModuleConfig;
2118
import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor;
2219
import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestination;
2320
import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
@@ -47,9 +44,6 @@ public class OrchestrationClient {
4744
JACKSON.addMixIn(
4845
ModuleResultsOutputUnmaskingInner.class,
4946
JacksonMixins.ModuleResultsOutputUnmaskingInnerMixIn.class);
50-
JACKSON.addMixIn(FilterConfig.class, JacksonMixins.NoTypeInfoMixin.class);
51-
JACKSON.addMixIn(MaskingProviderConfig.class, JacksonMixins.NoTypeInfoMixin.class);
52-
JACKSON.addMixIn(TemplatingModuleConfig.class, JacksonMixins.NoTypeInfoMixin.class);
5347
}
5448

5549
@Nonnull private final Supplier<HttpDestination> destinationSupplier;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
public enum DataRepositoryType {
2121
VECTOR("vector"),
2222

23-
HELP_SAP_COM("help.sap.com"),
24-
2523
UNKNOWN_DEFAULT_OPEN_API("unknown_default_open_api");
2624

2725
private final String value;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
package com.sap.ai.sdk.orchestration.model;
1414

15+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1516
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1617

1718
/** FilterConfig */
18-
@JsonTypeInfo(
19-
use = JsonTypeInfo.Id.NAME,
20-
include = JsonTypeInfo.As.PROPERTY,
21-
property = "",
22-
visible = true)
19+
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
20+
@JsonSubTypes({
21+
@JsonSubTypes.Type(value = AzureContentSafetyFilterConfig.class),
22+
})
2323
public interface FilterConfig {}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
package com.sap.ai.sdk.orchestration.model;
1414

15+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1516
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1617

1718
/** GroundingModuleConfigConfigFiltersInner */
18-
@JsonTypeInfo(
19-
use = JsonTypeInfo.Id.NAME,
20-
include = JsonTypeInfo.As.PROPERTY,
21-
property = "",
22-
visible = true)
19+
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
20+
@JsonSubTypes({
21+
@JsonSubTypes.Type(value = DocumentGroundingFilter.class),
22+
})
2323
public interface GroundingModuleConfigConfigFiltersInner {}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212

1313
package com.sap.ai.sdk.orchestration.model;
1414

15+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1516
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1617

1718
/** Output of LLM module. Follows the OpenAI spec. */
18-
@JsonTypeInfo(
19-
use = JsonTypeInfo.Id.NAME,
20-
include = JsonTypeInfo.As.PROPERTY,
21-
property = "",
22-
visible = true)
19+
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
20+
@JsonSubTypes({
21+
@JsonSubTypes.Type(value = LLMModuleResultStreaming.class),
22+
@JsonSubTypes.Type(value = LLMModuleResultSynchronous.class),
23+
})
2324
public interface LLMModuleResult {}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
package com.sap.ai.sdk.orchestration.model;
1414

15+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1516
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1617

1718
/** MaskingProviderConfig */
18-
@JsonTypeInfo(
19-
use = JsonTypeInfo.Id.NAME,
20-
include = JsonTypeInfo.As.PROPERTY,
21-
property = "",
22-
visible = true)
19+
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
20+
@JsonSubTypes({
21+
@JsonSubTypes.Type(value = DPIConfig.class),
22+
})
2323
public interface MaskingProviderConfig {}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212

1313
package com.sap.ai.sdk.orchestration.model;
1414

15+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1516
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1617

1718
/** ModuleResultsOutputUnmaskingInner */
18-
@JsonTypeInfo(
19-
use = JsonTypeInfo.Id.NAME,
20-
include = JsonTypeInfo.As.PROPERTY,
21-
property = "",
22-
visible = true)
19+
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
20+
@JsonSubTypes({
21+
@JsonSubTypes.Type(value = LLMChoice.class),
22+
@JsonSubTypes.Type(value = LLMChoiceStreaming.class),
23+
})
2324
public interface ModuleResultsOutputUnmaskingInner {}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212

1313
package com.sap.ai.sdk.orchestration.model;
1414

15+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1516
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1617

1718
/** Reference to a template in the prompt registry by ID or by scenario, name and version */
18-
@JsonTypeInfo(
19-
use = JsonTypeInfo.Id.NAME,
20-
include = JsonTypeInfo.As.PROPERTY,
21-
property = "",
22-
visible = true)
19+
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
20+
@JsonSubTypes({
21+
@JsonSubTypes.Type(value = TemplateRefByID.class),
22+
@JsonSubTypes.Type(value = TemplateRefByScenarioNameVersion.class),
23+
})
2324
public interface TemplateRefTemplateRef {}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212

1313
package com.sap.ai.sdk.orchestration.model;
1414

15+
import com.fasterxml.jackson.annotation.JsonSubTypes;
1516
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1617

1718
/** TemplatingModuleConfig */
18-
@JsonTypeInfo(
19-
use = JsonTypeInfo.Id.NAME,
20-
include = JsonTypeInfo.As.PROPERTY,
21-
property = "",
22-
visible = true)
19+
@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
20+
@JsonSubTypes({
21+
@JsonSubTypes.Type(value = Template.class),
22+
@JsonSubTypes.Type(value = TemplateRef.class),
23+
})
2324
public interface TemplatingModuleConfig {}

0 commit comments

Comments
 (0)