OSS generator on customer facing orchestration spec

rpanackal · rpanackal · commit 4750bb824f8f · 2024-11-08T17:18:24.000+01:00
- Introduce a generic fallback and LLMModuleResult specific
  deserializers.

- Generator ignoring all interfaces

- Adapt jackson annotations
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,6 @@
 .java-version
 
 ### Environment ###
-*.env
+*.env
+
+.openapi-generator
diff --git a/orchestration/.openapi-generator/orchestration.yaml-default.sha256 b/orchestration/.openapi-generator/orchestration.yaml-default.sha256
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafety.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafety.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class AzureContentSafety {
   public static final String JSON_PROPERTY_HATE = "Hate";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafetyFilterConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafetyFilterConfig.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class AzureContentSafetyFilterConfig implements FilterConfig {
   /** String represents name of the filter provider */
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureThreshold.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureThreshold.java
@@ -1,8 +1,8 @@
 /*
- * Internal Orchestration Service API
- * SAP AI Core - Orchestration Service API
+ * Orchestration
+ * Orchestration is an inference service which provides common additional capabilities for business AI scenarios, such as content filtering and data masking. At the core of the service is the LLM module which allows for an easy, harmonized access to the language models of gen AI hub. The service is designed to be modular and extensible, allowing for the addition of new modules in the future. Each module can be configured independently and at runtime, allowing for a high degree of flexibility in the orchestration of AI services.
  *
- * The version of the OpenAPI document: 0.0.1
+ * The version of the OpenAPI document: 0.29.3
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -15,7 +15,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-/** Gets or Sets AzureThreshold */
+/**
+ * Threshold for the filter. Setting it to &#x60;0&#x60; blocks content with low severity, whereas
+ * &#x60;6&#x60; is the most permissive and blocks only the highest severity
+ */
 public enum AzureThreshold {
   NUMBER_0(0),
 
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatDelta.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatDelta.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({ChatDelta.JSON_PROPERTY_ROLE, ChatDelta.JSON_PROPERTY_CONTENT})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ChatDelta {
   public static final String JSON_PROPERTY_ROLE = "role";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatMessage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatMessage.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({ChatMessage.JSON_PROPERTY_ROLE, ChatMessage.JSON_PROPERTY_CONTENT})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ChatMessage {
   public static final String JSON_PROPERTY_ROLE = "role";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostRequest.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostRequest.java
@@ -29,7 +29,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class CompletionPostRequest {
   public static final String JSON_PROPERTY_ORCHESTRATION_CONFIG = "orchestration_config";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponse.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponse.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class CompletionPostResponse {
   public static final String JSON_PROPERTY_REQUEST_ID = "request_id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponseStreaming.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponseStreaming.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class CompletionPostResponseStreaming {
   public static final String JSON_PROPERTY_REQUEST_ID = "request_id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIConfig.java
@@ -29,7 +29,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class DPIConfig implements MaskingProviderConfig {
   /** Type of masking service provider */
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIEntities.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIEntities.java
@@ -1,8 +1,8 @@
 /*
- * Internal Orchestration Service API
- * SAP AI Core - Orchestration Service API
+ * Orchestration
+ * Orchestration is an inference service which provides common additional capabilities for business AI scenarios, such as content filtering and data masking. At the core of the service is the LLM module which allows for an easy, harmonized access to the language models of gen AI hub. The service is designed to be modular and extensible, allowing for the addition of new modules in the future. Each module can be configured independently and at runtime, allowing for a high degree of flexibility in the orchestration of AI services.
  *
- * The version of the OpenAPI document: 0.0.1
+ * The version of the OpenAPI document: 0.29.3
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIEntityConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIEntityConfig.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({DPIEntityConfig.JSON_PROPERTY_TYPE})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class DPIEntityConfig {
   public static final String JSON_PROPERTY_TYPE = "type";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ErrorResponse.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ErrorResponse.java
@@ -27,7 +27,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ErrorResponse {
   public static final String JSON_PROPERTY_REQUEST_ID = "request_id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringModuleConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringModuleConfig.java
@@ -24,7 +24,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class FilteringModuleConfig {
   public static final String JSON_PROPERTY_INPUT = "input";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringStreamOptions.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringStreamOptions.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({FilteringStreamOptions.JSON_PROPERTY_OVERLAP})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class FilteringStreamOptions {
   public static final String JSON_PROPERTY_OVERLAP = "overlap";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GenericModuleResult.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GenericModuleResult.java
@@ -24,7 +24,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class GenericModuleResult {
   public static final String JSON_PROPERTY_MESSAGE = "message";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GlobalStreamOptions.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GlobalStreamOptions.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({GlobalStreamOptions.JSON_PROPERTY_CHUNK_SIZE})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class GlobalStreamOptions {
   public static final String JSON_PROPERTY_CHUNK_SIZE = "chunk_size";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/InputFilteringConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/InputFilteringConfig.java
@@ -23,7 +23,7 @@
 @JsonPropertyOrder({InputFilteringConfig.JSON_PROPERTY_FILTERS})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class InputFilteringConfig {
   public static final String JSON_PROPERTY_FILTERS = "filters";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoice.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoice.java
@@ -30,7 +30,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMChoice implements ModuleResultsOutputUnmaskingInner {
   public static final String JSON_PROPERTY_INDEX = "index";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoiceStreaming.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoiceStreaming.java
@@ -30,7 +30,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMChoiceStreaming implements ModuleResultsOutputUnmaskingInner {
   public static final String JSON_PROPERTY_INDEX = "index";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleConfig.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMModuleConfig {
   public static final String JSON_PROPERTY_MODEL_NAME = "model_name";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultStreaming.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultStreaming.java
@@ -31,7 +31,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMModuleResultStreaming implements LLMModuleResult {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultSynchronous.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultSynchronous.java
@@ -31,7 +31,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMModuleResultSynchronous implements LLMModuleResult {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/MaskingModuleConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/MaskingModuleConfig.java
@@ -23,7 +23,7 @@
 @JsonPropertyOrder({MaskingModuleConfig.JSON_PROPERTY_MASKING_PROVIDERS})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class MaskingModuleConfig {
   public static final String JSON_PROPERTY_MASKING_PROVIDERS = "masking_providers";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleConfigs.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleConfigs.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ModuleConfigs {
   public static final String JSON_PROPERTY_LLM_MODULE_CONFIG = "llm_module_config";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleResults.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleResults.java
@@ -30,7 +30,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ModuleResults {
   public static final String JSON_PROPERTY_TEMPLATING = "templating";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OrchestrationConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OrchestrationConfig.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class OrchestrationConfig {
   public static final String JSON_PROPERTY_MODULE_CONFIGURATIONS = "module_configurations";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OutputFilteringConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OutputFilteringConfig.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class OutputFilteringConfig {
   public static final String JSON_PROPERTY_FILTERS = "filters";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/Template.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/Template.java
@@ -23,7 +23,7 @@
 @JsonPropertyOrder({Template.JSON_PROPERTY_TEMPLATE, Template.JSON_PROPERTY_DEFAULTS})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class Template implements TemplatingModuleConfig {
   public static final String JSON_PROPERTY_TEMPLATE = "template";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/TokenUsage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/TokenUsage.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T15:36:05.863594+01:00[Europe/Berlin]",
+    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class TokenUsage {
   public static final String JSON_PROPERTY_COMPLETION_TOKENS = "completion_tokens";
diff --git a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java
diff --git a/sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OrchestrationTest.java b/sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OrchestrationTest.java
