File tree Expand file tree Collapse file tree 10 files changed +39
-47
lines changed
orchestration/src/main/java/com/sap/ai/sdk/orchestration Expand file tree Collapse file tree 10 files changed +39
-47
lines changed Original file line number Diff line number Diff 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}
Original file line number Diff line number Diff line change 1111import com .sap .ai .sdk .core .DeploymentResolutionException ;
1212import com .sap .ai .sdk .orchestration .model .CompletionPostRequest ;
1313import com .sap .ai .sdk .orchestration .model .CompletionPostResponse ;
14- import com .sap .ai .sdk .orchestration .model .FilterConfig ;
1514import com .sap .ai .sdk .orchestration .model .LLMModuleResult ;
16- import com .sap .ai .sdk .orchestration .model .MaskingProviderConfig ;
1715import com .sap .ai .sdk .orchestration .model .ModuleConfigs ;
1816import com .sap .ai .sdk .orchestration .model .ModuleResultsOutputUnmaskingInner ;
1917import com .sap .ai .sdk .orchestration .model .OrchestrationConfig ;
20- import com .sap .ai .sdk .orchestration .model .TemplatingModuleConfig ;
2118import com .sap .cloud .sdk .cloudplatform .connectivity .ApacheHttpClient5Accessor ;
2219import com .sap .cloud .sdk .cloudplatform .connectivity .HttpDestination ;
2320import 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 ;
Original file line number Diff line number Diff line change 2020public 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 ;
Original file line number Diff line number Diff line change 1212
1313package com .sap .ai .sdk .orchestration .model ;
1414
15+ import com .fasterxml .jackson .annotation .JsonSubTypes ;
1516import 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+ })
2323public interface FilterConfig {}
Original file line number Diff line number Diff line change 1212
1313package com .sap .ai .sdk .orchestration .model ;
1414
15+ import com .fasterxml .jackson .annotation .JsonSubTypes ;
1516import 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+ })
2323public interface GroundingModuleConfigConfigFiltersInner {}
Original file line number Diff line number Diff line change 1212
1313package com .sap .ai .sdk .orchestration .model ;
1414
15+ import com .fasterxml .jackson .annotation .JsonSubTypes ;
1516import 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+ } )
2324public interface LLMModuleResult {}
Original file line number Diff line number Diff line change 1212
1313package com .sap .ai .sdk .orchestration .model ;
1414
15+ import com .fasterxml .jackson .annotation .JsonSubTypes ;
1516import 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+ })
2323public interface MaskingProviderConfig {}
Original file line number Diff line number Diff line change 1212
1313package com .sap .ai .sdk .orchestration .model ;
1414
15+ import com .fasterxml .jackson .annotation .JsonSubTypes ;
1516import 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+ } )
2324public interface ModuleResultsOutputUnmaskingInner {}
Original file line number Diff line number Diff line change 1212
1313package com .sap .ai .sdk .orchestration .model ;
1414
15+ import com .fasterxml .jackson .annotation .JsonSubTypes ;
1516import 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+ } )
2324public interface TemplateRefTemplateRef {}
Original file line number Diff line number Diff line change 1212
1313package com .sap .ai .sdk .orchestration .model ;
1414
15+ import com .fasterxml .jackson .annotation .JsonSubTypes ;
1516import 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+ } )
2324public interface TemplatingModuleConfig {}
You can’t perform that action at this time.
0 commit comments