Openapi generator orchestration

.gitignore

@@ -26,4 +26,6 @@
 .java-version
 
 ### Environment ###
-*.env
+*.env
+
+.openapi-generator

orchestration/.openapi-generator-ignore

@@ -0,0 +1,22 @@
+# OpenAPI Generator Ignore
+
+.github/
+gradle/
+.gitignore
+.travis.yml
+build.gradle
+build.sbt
+git_push.sh
+gradle.properties
+gradlew
+gradlew.bat
+pom.xml
+README.md
+settings.gradle
+src/main/AndroidManifest.xml
+api/
+.openapi-generator/
+
+
+src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResult.java
+src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleResultsOutputUnmaskingInner.java

orchestration/pom.xml

@@ -118,54 +118,73 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Additional dependencies for OSS code generator resttemplate  -->
+    <dependency>
+      <groupId>org.openapitools</groupId>
+      <artifactId>jackson-databind-nullable</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>generate</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-        <property>
-          <name>generate</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.sap.cloud.sdk.datamodel</groupId>
-            <artifactId>openapi-generator-maven-plugin</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.openapitools</groupId>
+        <artifactId>openapi-generator-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <phase>generate-sources</phase>
             <configuration>
-              <skip>true</skip>
-              <!-- skip automatic generation until we can omit API classes from code generation -->
-              <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
-              <apiMaturity>beta</apiMaturity>
-              <enableOneOfAnyOfGeneration>true</enableOneOfAnyOfGeneration>
-              <compileScope>COMPILE</compileScope>
-              <deleteOutputDirectory>true</deleteOutputDirectory>
+              <!-- Specify the input OpenAPI spec file -->
+              <inputSpec>${project.basedir}/src/main/resources/spec/orchestration.yaml</inputSpec>
+              <output>${project.basedir}</output>
+              <!-- Specify the generator to use, e.g., java, spring, kotlin, etc. -->
+              <generatorName>java</generatorName>
+              <!-- Specify the package names for models, APIs, and invokers -->
+              <modelPackage>com.sap.ai.sdk.orchestration.client.model</modelPackage>
+              <apiPackage>com.sap.ai.sdk.orchestration.client.api</apiPackage>
+              <invokerPackage>com.sap.ai.sdk.orchestration.client.invoker</invokerPackage>
+
+              <!-- Global properties level; can be unpacked with 'generate' prefix-->
+              <globalProperties>
+                <apiDocs>false</apiDocs>
+                <modelDocs>false</modelDocs>
+                <modelTests>false</modelTests>
+                <apiTests>false</apiTests>
+                <minimalUpdate>true</minimalUpdate>
+              </globalProperties>
+
+              <!-- Generator Specific properties level; some can be unpacked-->
+              <configOptions>
+                <generateBuilders>true</generateBuilders>
+                <failOnUnknownProperties>false</failOnUnknownProperties>
+                <hideGenerationTimestamp>true</hideGenerationTimestamp>
+                <disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
+                <enumUnknownDefaultCase>true</enumUnknownDefaultCase>
+                <useBeanValidation>false</useBeanValidation>
+                <useOneOfInterfaces>true</useOneOfInterfaces>
+                <additionalModelTypeAnnotations>@com.google.common.annotations.Beta</additionalModelTypeAnnotations>
+              </configOptions>
+              <generateModels>true</generateModels>
+              <generateSupportingFiles>false</generateSupportingFiles>
+              <generateApis>false</generateApis>
+              <library>resttemplate</library>
+              <!--<configHelp>true</configHelp>-->
             </configuration>
-            <executions>
-              <execution>
-                <id>orchestration</id>
-                <goals>
-                  <goal>generate</goal>
-                </goals>
-                <phase>generate-sources</phase>
-                <configuration>
-                  <inputSpec>${project.basedir}/src/main/resources/spec/orchestration.yaml</inputSpec>
-                  <apiPackage>com.sap.ai.sdk.orchestration.client</apiPackage>
-                  <modelPackage>com.sap.ai.sdk.orchestration.client.model</modelPackage>
-                  <additionalProperties>
-                    <pojoBuilderMethodName>create</pojoBuilderMethodName>
-                    <pojoBuildMethodName/>
-                    <pojoConstructorVisibility>protected</pojoConstructorVisibility>
-                    <enumUnknownDefaultCase>true</enumUnknownDefaultCase>
-                  </additionalProperties>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

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

@@ -3,6 +3,7 @@
 import com.sap.ai.sdk.orchestration.client.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.client.model.ModuleConfigs;
 import com.sap.ai.sdk.orchestration.client.model.OrchestrationConfig;
+import com.sap.ai.sdk.orchestration.client.model.Template;
 import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
 import io.vavr.control.Option;
 import java.util.ArrayList;
@@ -25,9 +26,9 @@ static CompletionPostRequest toCompletionPostRequest(
     // subsequent requests
     val configCopy = config.withTemplateConfig(template);
 
-    return CompletionPostRequest.create()
+    return new CompletionPostRequest()
         .orchestrationConfig(
-            OrchestrationConfig.create().moduleConfigurations(toModuleConfigs(configCopy)))
+            new OrchestrationConfig().moduleConfigurations(toModuleConfigs(configCopy)))
         .inputParams(prompt.getTemplateParameters())
         .messagesHistory(prompt.getMessagesHistory());
   }
@@ -42,14 +43,14 @@ static TemplatingModuleConfig toTemplateModuleConfig(
      * In this case, the request will fail, since the templating module will try to resolve the parameter.
      * To be fixed with https://github.tools.sap/AI/llm-orchestration/issues/662
      */
-    val messages = Option.of(template).map(TemplatingModuleConfig::getTemplate).getOrElse(List::of);
+    val messages = Option.of(template).map(t -> ((Template) t).getTemplate()).getOrElse(List::of);
     val messagesWithPrompt = new ArrayList<>(messages);
     messagesWithPrompt.addAll(prompt.getMessages());
     if (messagesWithPrompt.isEmpty()) {
       throw new IllegalStateException(
           "A prompt is required. Pass at least one message or configure a template with messages or a template reference.");
     }
-    return TemplatingModuleConfig.create().template(messagesWithPrompt);
+    return new Template().template(messagesWithPrompt);
   }
 
   @Nonnull
@@ -60,7 +61,7 @@ static ModuleConfigs toModuleConfigs(@Nonnull final OrchestrationModuleConfig co
 
     //noinspection DataFlowIssue the template is always non-null here
     val moduleConfig =
-        ModuleConfigs.create()
+        new ModuleConfigs()
             .llmModuleConfig(llmConfig)
             .templatingModuleConfig(config.getTemplateConfig());
 

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

@@ -0,0 +1,82 @@
+package com.sap.ai.sdk.orchestration;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.sap.ai.sdk.orchestration.client.model.LLMModuleResult;
+import com.sap.ai.sdk.orchestration.client.model.LLMModuleResultStreaming;
+import com.sap.ai.sdk.orchestration.client.model.LLMModuleResultSynchronous;
+import java.io.IOException;
+import javax.annotation.Nonnull;
+
+/**
+ * A deserializer for {@link LLMModuleResult} that determines the concrete implementation based on
+ * the structure of the JSON object.
+ */
+public class LLMModuleResultDeserializer extends StdDeserializer<LLMModuleResult> {
+
+  public LLMModuleResultDeserializer() {
+    super(LLMModuleResult.class);
+  }
+
+  /**
+   * Deserialize the JSON object into one of the subtypes of the base type.
+   *
+   * <ul>
+   *   <li>If elements of "choices" array contains "delta", deserialize into {@link
+   *       LLMModuleResultStreaming}.
+   *   <li>Otherwise, deserialize into {@link LLMModuleResultSynchronous}.
+   * </ul>
+   *
+   * @param parser The JSON parser.
+   * @param context The deserialization context.
+   * @return The deserialized object.
+   * @throws IOException If an I/O error occurs.
+   */
+  @Override
+  public LLMModuleResult deserialize(JsonParser parser, @Nonnull DeserializationContext context)
+      throws IOException {
+
+    // Check if the target type is a concrete class
+    JavaType targetType = context.getContextualType();
+    if (targetType != null && !LLMModuleResult.class.equals(targetType.getRawClass())) {
+      return delegateToDefaultDeserializer(parser, context, targetType);
+    }
+
+    // Custom deserialization logic for LLMModuleResult interface
+    var mapper = (ObjectMapper) parser.getCodec();
+    var rootNode = mapper.readTree(parser);
+    Class<? extends LLMModuleResult> concreteClass = LLMModuleResultSynchronous.class;
+
+    // Inspect the "choices" field
+    var choicesNode = rootNode.get("choices");
+    if (choicesNode != null && choicesNode.isArray()) {
+      var firstChoice = (JsonNode) choicesNode.get(0);
+      if (firstChoice != null && firstChoice.has("delta")) {
+        concreteClass = LLMModuleResultStreaming.class;
+      }
+    }
+
+    // Create a new parser for the root node
+    var rootParser = rootNode.traverse(mapper);
+    rootParser.nextToken(); // Advance to the first token
+
+    // Use the default deserializer for the concrete class
+    return delegateToDefaultDeserializer(rootParser, context, mapper.constructType(concreteClass));
+  }
+
+  /**
+   * Delegate deserialization to the default deserializer for the given concrete type.
+   *
+   * @param parser The JSON parser.
+   * @param context The deserialization context.
+   * @param concreteType The concrete type to deserialize into.
+   * @return The deserialized object.
+   * @throws IOException If an I/O error occurs.
+   */
+  private LLMModuleResult delegateToDefaultDeserializer(
+      JsonParser parser, DeserializationContext context, JavaType concreteType) throws IOException {
+    var defaultDeserializer = context.findRootValueDeserializer(concreteType);
+    return (LLMModuleResult) defaultDeserializer.deserialize(parser, context);
+  }
+}

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

@@ -0,0 +1,7 @@
+package com.sap.ai.sdk.orchestration;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+/** Mixin to suppress @JsonTypeInfo for oneOf interfaces. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+public interface NoTypeInfoMixin {}

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

@@ -10,8 +10,14 @@
 import com.sap.ai.sdk.core.AiCoreService;
 import com.sap.ai.sdk.orchestration.client.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.client.model.CompletionPostResponse;
+import com.sap.ai.sdk.orchestration.client.model.FilterConfig;
+import com.sap.ai.sdk.orchestration.client.model.GroundingModuleConfigConfigFiltersInner;
+import com.sap.ai.sdk.orchestration.client.model.LLMModuleResult;
+import com.sap.ai.sdk.orchestration.client.model.MaskingProviderConfig;
 import com.sap.ai.sdk.orchestration.client.model.ModuleConfigs;
 import com.sap.ai.sdk.orchestration.client.model.OrchestrationConfig;
+import com.sap.ai.sdk.orchestration.client.model.TemplateRefTemplateRef;
+import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationNotFoundException;
@@ -40,6 +46,12 @@ public class OrchestrationClient {
             .visibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
             .visibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE)
             .serializationInclusion(JsonInclude.Include.NON_NULL)
+            .deserializerByType(LLMModuleResult.class, new LLMModuleResultDeserializer())
+            .mixIn(FilterConfig.class, NoTypeInfoMixin.class)
+            .mixIn(GroundingModuleConfigConfigFiltersInner.class, NoTypeInfoMixin.class)
+            .mixIn(MaskingProviderConfig.class, NoTypeInfoMixin.class)
+            .mixIn(TemplateRefTemplateRef.class, NoTypeInfoMixin.class)
+            .mixIn(TemplatingModuleConfig.class, NoTypeInfoMixin.class)
             .build();
   }
 
@@ -66,6 +78,20 @@ public OrchestrationClient(@Nonnull final AiCoreDeployment deployment) {
     this.deployment = () -> deployment;
   }
 
+  /**
+   * Convert the given prompt and config into a low-level request data object. The data object
+   * allows for further customization before sending the request.
+   *
+   * @param prompt The {@link OrchestrationPrompt} to generate a completion for.
+   * @param config The {@link OrchestrationConfig } configuration to use for the completion.
+   * @return The low-level request data object to send to orchestration.
+   */
+  @Nonnull
+  public static CompletionPostRequest toCompletionPostRequest(
+      @Nonnull final OrchestrationPrompt prompt, @Nonnull final OrchestrationModuleConfig config) {
+    return ConfigToRequestTransformer.toCompletionPostRequest(prompt, config);
+  }
+
   /**
    * Generate a completion for the given prompt.
    *
@@ -118,20 +144,6 @@ public CompletionPostResponse executeRequest(@Nonnull final CompletionPostReques
     return executeRequest(postRequest);
   }
 
-  /**
-   * Convert the given prompt and config into a low-level request data object. The data object
-   * allows for further customization before sending the request.
-   *
-   * @param prompt The {@link OrchestrationPrompt} to generate a completion for.
-   * @param config The {@link OrchestrationConfig } configuration to use for the completion.
-   * @return The low-level request data object to send to orchestration.
-   */
-  @Nonnull
-  public static CompletionPostRequest toCompletionPostRequest(
-      @Nonnull final OrchestrationPrompt prompt, @Nonnull final OrchestrationModuleConfig config) {
-    return ConfigToRequestTransformer.toCompletionPostRequest(prompt, config);
-  }
-
   @SuppressWarnings("UnstableApiUsage")
   @Nonnull
   CompletionPostResponse executeRequest(@Nonnull final BasicClassicHttpRequest request) {

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

@@ -32,7 +32,7 @@ public class OrchestrationPrompt {
    * @param message A user message.
    */
   public OrchestrationPrompt(@Nonnull final String message) {
-    messages.add(ChatMessage.create().role("user").content(message));
+    messages.add(new ChatMessage().role("user").content(message));
   }
 
   /**