Merge branch 'main' into spec-update/orchestration/main

# Conflicts:
#	orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationConvenienceUnitTest.java

Author: CharlesDuboisSAP

core-services/document-grounding/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>document-grounding</artifactId>

core-services/prompt-registry/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>prompt-registry</artifactId>

core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>core</artifactId>
   <name>AI Core client</name>

foundation-models/openai/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>com.sap.ai.sdk.foundationmodels</groupId>

orchestration/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>orchestration</artifactId>
   <name>Orchestration client</name>
@@ -34,7 +34,7 @@
     <coverage.complexity>83%</coverage.complexity>
     <coverage.line>94%</coverage.line>
     <coverage.instruction>94%</coverage.instruction>
-    <coverage.branch>77%</coverage.branch>
+    <coverage.branch>78%</coverage.branch>
     <coverage.method>93%</coverage.method>
     <coverage.class>100%</coverage.class>
   </properties>
@@ -108,6 +108,10 @@
       <groupId>com.github.victools</groupId>
       <artifactId>jsonschema-module-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+    </dependency>
     <!-- scope "provided" -->
     <dependency>
       <groupId>org.projectlombok</groupId>

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

@@ -1,5 +1,6 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.sap.ai.sdk.orchestration.model.LLMChoice;
@@ -21,4 +22,22 @@ interface ModuleResultsOutputUnmaskingInnerMixIn {}
 
   @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
   interface NoneTypeInfoMixin {}
+
+  @JsonTypeInfo(
+      use = JsonTypeInfo.Id.NAME,
+      include = JsonTypeInfo.As.PROPERTY,
+      property = "type",
+      visible = true)
+  @JsonSubTypes({
+    @JsonSubTypes.Type(
+        value = com.sap.ai.sdk.orchestration.model.ResponseFormatJsonSchema.class,
+        name = "json_schema"),
+    @JsonSubTypes.Type(
+        value = com.sap.ai.sdk.orchestration.model.ResponseFormatJsonObject.class,
+        name = "json_object"),
+    @JsonSubTypes.Type(
+        value = com.sap.ai.sdk.orchestration.model.ResponseFormatText.class,
+        name = "text")
+  })
+  interface ResponseFormatSubTypesMixin {}
 }

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

@@ -86,6 +86,10 @@ public class OrchestrationAiModel {
   public static final OrchestrationAiModel CLAUDE_3_5_SONNET =
       new OrchestrationAiModel("anthropic--claude-3.5-sonnet");
 
+  /** Anthropic Claude 3.7 Sonnet model */
+  public static final OrchestrationAiModel CLAUDE_3_7_SONNET =
+      new OrchestrationAiModel("anthropic--claude-3.7-sonnet ");
+
   /** Amazon Titan Text Lite model */
   public static final OrchestrationAiModel TITAN_TEXT_LITE =
       new OrchestrationAiModel("amazon--titan-text-lite");
@@ -158,7 +162,14 @@ public class OrchestrationAiModel {
   /** Azure OpenAI o3-mini model */
   public static final OrchestrationAiModel OPENAI_O3_MINI = new OrchestrationAiModel("o3-mini");
 
-  /** Google Cloud Platform Gemini 1.0 Pro model */
+  /**
+   * Google Cloud Platform Gemini 1.0 Pro model
+   *
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-04-09. The
+   *     suggested replacement model is {@link OrchestrationAiModel#GEMINI_2_0_FLASH} or {@link
+   *     OrchestrationAiModel#GEMINI_2_0_FLASH_LITE}.
+   */
+  @Deprecated
   public static final OrchestrationAiModel GEMINI_1_0_PRO =
       new OrchestrationAiModel("gemini-1.0-pro");
 
@@ -170,6 +181,14 @@ public class OrchestrationAiModel {
   public static final OrchestrationAiModel GEMINI_1_5_FLASH =
       new OrchestrationAiModel("gemini-1.5-flash");
 
+  /** Google Cloud Platform Gemini 2.0 Flash model */
+  public static final OrchestrationAiModel GEMINI_2_0_FLASH =
+      new OrchestrationAiModel("gemini-2.0-flash");
+
+  /** Google Cloud Platform Gemini 2.0 Flash-Lite model */
+  public static final OrchestrationAiModel GEMINI_2_0_FLASH_LITE =
+      new OrchestrationAiModel("gemini-2.0-flash-lite");
+
   OrchestrationAiModel(@Nonnull final String name) {
     this(name, Map.of(), "latest");
   }

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

@@ -8,6 +8,7 @@
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.LLMModuleResult;
 import com.sap.ai.sdk.orchestration.model.ModuleResultsOutputUnmaskingInner;
+import com.sap.ai.sdk.orchestration.model.TemplateResponseFormat;
 import javax.annotation.Nonnull;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -47,7 +48,12 @@ public static ObjectMapper getOrchestrationObjectMapper() {
             .addDeserializer(
                 ChatMessage.class,
                 PolymorphicFallbackDeserializer.fromJsonSubTypes(ChatMessage.class))
-            .setMixInAnnotation(ChatMessage.class, JacksonMixins.NoneTypeInfoMixin.class);
+            .addDeserializer(
+                TemplateResponseFormat.class,
+                PolymorphicFallbackDeserializer.fromJsonSubTypes(TemplateResponseFormat.class))
+            .setMixInAnnotation(ChatMessage.class, JacksonMixins.NoneTypeInfoMixin.class)
+            .setMixInAnnotation(
+                TemplateResponseFormat.class, JacksonMixins.ResponseFormatSubTypesMixin.class);
     jackson.registerModule(module);
     return jackson;
   }

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

@@ -1,5 +1,10 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.orchestration.model.ChatCompletionTool;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
@@ -9,6 +14,7 @@
 import com.sap.ai.sdk.orchestration.model.Template;
 import com.sap.ai.sdk.orchestration.model.TemplateResponseFormat;
 import com.sap.ai.sdk.orchestration.model.TemplatingModuleConfig;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,14 +41,22 @@
 @NoArgsConstructor(force = true, access = AccessLevel.PACKAGE)
 @Beta
 public class OrchestrationTemplate extends TemplateConfig {
-  @Nullable List<ChatMessage> template;
-  @Nullable Map<String, String> defaults;
+  @JsonProperty("template")
+  @Nullable
+  List<ChatMessage> template;
+
+  @JsonProperty("defaults")
+  @Nullable
+  Map<String, String> defaults;
 
+  @JsonProperty("response_format")
   @With(AccessLevel.PRIVATE)
   @Nullable
   TemplateResponseFormat responseFormat;
 
-  @Nullable List<ChatCompletionTool> tools;
+  @JsonProperty("tools")
+  @Nullable
+  List<ChatCompletionTool> tools;
 
   /**
    * Create a low-level representation of the template.
@@ -93,4 +107,45 @@ public OrchestrationTemplate withJsonResponse() {
         ResponseFormatJsonObject.create().type(ResponseFormatJsonObject.TypeEnum.JSON_OBJECT);
     return this.withResponseFormat(responseFormatJsonObject);
   }
+
+  /**
+   * Create a {@link Template} object from a JSON provided as String.
+   *
+   * @throws IOException if the JSON cannot be deserialized
+   * @param inputString the provided JSON
+   * @return A Template object representing the provided JSON
+   * @since 1.7.0
+   */
+  @Nullable
+  private OrchestrationTemplate fromJson(@Nonnull final String inputString) throws IOException {
+    final ObjectMapper objectMapper =
+        OrchestrationJacksonConfiguration.getOrchestrationObjectMapper();
+    final JsonNode rootNode = objectMapper.readTree(inputString);
+    return objectMapper.treeToValue(rootNode.get("spec"), OrchestrationTemplate.class);
+  }
+
+  /**
+   * Create a {@link Template} object from a YAML provided as String.
+   *
+   * @throws IOException if the YAML cannot be parsed or deserialized
+   * @param inputYaml the provided YAML
+   * @return A Template object representing the provided YAML
+   * @since 1.7.0
+   */
+  @Nullable
+  public OrchestrationTemplate fromYaml(@Nonnull final String inputYaml) throws IOException {
+    final Object obj;
+    try {
+      final ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
+      obj = yamlReader.readValue(inputYaml, Object.class);
+    } catch (JsonProcessingException ex) {
+      throw new IOException("Failed to parse the YAML input: " + ex.getMessage(), ex);
+    }
+    try {
+      final ObjectMapper jsonWriter = new ObjectMapper();
+      return fromJson(jsonWriter.writeValueAsString(obj));
+    } catch (JsonProcessingException ex) {
+      throw new IOException("Failed to deserialize the input: " + ex.getMessage(), ex);
+    }
+  }
 }

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationConvenienceUnitTest.java

@@ -15,6 +15,9 @@
 import com.sap.ai.sdk.orchestration.model.TemplateRefByScenarioNameVersion;
 import com.sap.ai.sdk.orchestration.model.UserChatMessage;
 import com.sap.ai.sdk.orchestration.model.UserChatMessageContent;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -181,4 +184,96 @@ void testTemplateReferenceConstruction() {
     assertThat(templateReferenceScenarioNameVersion.toLowLevel())
         .isEqualTo(templateReferenceScenarioNameVersionLowLevel);
   }
+
+  @Test
+  void testTemplateFromLocalFileWithJsonSchemaAndTools() throws IOException {
+    String promptTemplateYaml =
+        Files.readString(Path.of("src/test/resources/promptTemplateExample.yaml"));
+    var templateWithJsonSchemaTools = TemplateConfig.create().fromYaml(promptTemplateYaml);
+    var schema =
+        Map.of(
+            "type",
+            "object",
+            "properties",
+            Map.of(
+                "language", Map.of("type", "string"),
+                "translation", Map.of("type", "string")),
+            "required",
+            List.of("language", "translation"),
+            "additionalProperties",
+            false);
+    var expectedTemplateWithJsonSchemaTools =
+        OrchestrationTemplate.create()
+            .withTemplate(
+                List.of(
+                    SingleChatMessage.create()
+                        .role("system")
+                        .content("You are a language translator."),
+                    SingleChatMessage.create()
+                        .role("user")
+                        .content("Whats {{ ?word }} in {{ ?language }}?")))
+            .withDefaults(Map.of("word", "apple"))
+            .withJsonSchemaResponse(
+                ResponseJsonSchema.fromMap(schema, "translation-schema")
+                    .withDescription("Translate the given word into the provided language.")
+                    .withStrict(true))
+            .withTools(
+                List.of(
+                    ChatCompletionTool.create()
+                        .type(ChatCompletionTool.TypeEnum.FUNCTION)
+                        .function(
+                            FunctionObject.create()
+                                .name("translate")
+                                .parameters(
+                                    Map.of(
+                                        "type",
+                                        "object",
+                                        "additionalProperties",
+                                        false,
+                                        "required",
+                                        List.of("language", "wordToTranslate"),
+                                        "properties",
+                                        Map.of(
+                                            "language", Map.of("type", "string"),
+                                            "wordToTranslate", Map.of("type", "string"))))
+                                .description("Translate a word.")
+                                .strict(true))));
+    assertThat(templateWithJsonSchemaTools).isEqualTo(expectedTemplateWithJsonSchemaTools);
+  }
+
+  @Test
+  void testTemplateFromLocalFileWithJsonObject() throws IOException {
+    String promptTemplateWithJsonObject =
+        """
+ name: translator
+ version: 0.0.1
+ scenario: translation scenario
+ spec:
+  template:
+    - role: "system"
+      content: |-
+        You are a language translator.
+    - role: "user"
+      content: |-
+        Whats {{ ?word }} in {{ ?language }}?
+  defaults:
+    word: "apple"
+  response_format:
+    type: json_object
+ """;
+    var templateWithJsonObject = TemplateConfig.create().fromYaml(promptTemplateWithJsonObject);
+    var expectedTemplateWithJsonObject =
+        OrchestrationTemplate.create()
+            .withTemplate(
+                List.of(
+                    SingleChatMessage.create()
+                        .role("system")
+                        .content("You are a language translator."),
+                    SingleChatMessage.create()
+                        .role("user")
+                        .content("Whats {{ ?word }} in {{ ?language }}?")))
+            .withDefaults(Map.of("word", "apple"))
+            .withJsonResponse();
+    assertThat(templateWithJsonObject).isEqualTo(expectedTemplateWithJsonObject);
+  }
 }