Requested changes

Author: Jonas-Isr

.pipeline/spotbugs-exclusions.xml

@@ -9,4 +9,9 @@
       <Package name="com.sap.ai.sdk.grounding.model"/>
     </Or>
   </Match>
+  <Match>
+    <Class name="com.sap.ai.sdk.orchestration.ResponseJsonSchema" />
+    <Method name="withStrict" />
+    <Bug pattern="RC_REF_COMPARISON_BAD_PRACTICE_BOOLEAN" />
+  </Match>
 </FindBugsFilter>

orchestration/pom.xml

@@ -34,7 +34,7 @@
     <coverage.complexity>82%</coverage.complexity>
     <coverage.line>93%</coverage.line>
     <coverage.instruction>94%</coverage.instruction>
-    <coverage.branch>74%</coverage.branch>
+    <coverage.branch>76%</coverage.branch>
     <coverage.method>93%</coverage.method>
     <coverage.class>100%</coverage.class>
   </properties>

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

@@ -62,7 +62,7 @@ public class OrchestrationModuleConfig {
    * @link <a href="https://help.sap.com/docs/sap-ai-core/sap-ai-core-service-guide/templating">SAP
    *     AI Core: Orchestration - Templating</a>
    */
-  @With @Nullable TemplatingModuleConfig templateConfig;
+  @Nullable TemplatingModuleConfig templateConfig;
 
   /**
    * A masking configuration to pseudonymous or anonymize sensitive data in the input.

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

@@ -11,7 +11,6 @@
 import com.sap.ai.sdk.orchestration.model.TemplatingModuleConfig;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
@@ -37,14 +36,13 @@
 @Beta
 public class OrchestrationTemplate extends TemplateConfig {
   @Nullable List<ChatMessage> template;
-  @Nonnull Map<String, String> defaults = new HashMap<>();
+  @Nullable Map<String, String> defaults;
 
   @With(AccessLevel.PRIVATE)
   @Nullable
   TemplateResponseFormat responseFormat;
 
-  @Nonnull List<ChatCompletionTool> tools = new ArrayList<>();
-  @Nonnull Map<String, Object> cloudSdkCustomFields = new LinkedHashMap<>();
+  @Nullable List<ChatCompletionTool> tools;
 
   /**
    * Create a low-level representation of the template.
@@ -55,6 +53,8 @@ public class OrchestrationTemplate extends TemplateConfig {
   @Nonnull
   protected TemplatingModuleConfig toLowLevel() {
     final List<ChatMessage> template = this.template != null ? this.template : List.of();
+    final Map<String, String> defaults = this.defaults != null ? this.defaults : new HashMap<>();
+    final List<ChatCompletionTool> tools = this.tools != null ? this.tools : new ArrayList<>();
     return Template.create()
         .template(template)
         .defaults(defaults)
@@ -77,7 +77,7 @@ public OrchestrationTemplate withJsonSchemaResponse(@Nonnull final ResponseJsonS
                 ResponseFormatJsonSchemaJsonSchema.create()
                     .name(schema.getName())
                     .schema(schema.getSchemaMap())
-                    .strict(schema.getIsStrict())
+                    .strict(schema.getStrict())
                     .description(schema.getDescription()));
     return this.withResponseFormat(responseFormatJsonSchema);
   }

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

@@ -33,20 +33,7 @@ public class ResponseJsonSchema {
   @Nonnull Map<String, Object> schemaMap;
   @Nonnull String name;
   @Nullable String description;
-
-  @With(AccessLevel.NONE)
-  @Nullable
-  Boolean isStrict;
-
-  /**
-   * Create a new instance of {@link ResponseJsonSchema} with the given strictness.
-   *
-   * @return A new ResponseJsonSchema instance with the given strictness
-   */
-  @Nonnull
-  public ResponseJsonSchema withStrict(@Nullable final Boolean isStrict) {
-    return new ResponseJsonSchema(schemaMap, name, description, isStrict);
-  }
+  @Nullable Boolean strict;
 
   /**
    * Create a new instance of {@link ResponseJsonSchema} with the given schema map and name.

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

@@ -3,8 +3,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.sap.ai.sdk.orchestration.model.ChatCompletionTool;
+import com.sap.ai.sdk.orchestration.model.ChatMessage;
+import com.sap.ai.sdk.orchestration.model.FunctionObject;
+import com.sap.ai.sdk.orchestration.model.ResponseFormatJsonObject;
 import com.sap.ai.sdk.orchestration.model.ResponseFormatJsonSchema;
 import com.sap.ai.sdk.orchestration.model.ResponseFormatJsonSchemaJsonSchema;
+import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
 import com.sap.ai.sdk.orchestration.model.Template;
 import com.sap.ai.sdk.orchestration.model.TemplateRef;
 import com.sap.ai.sdk.orchestration.model.TemplateRefByID;
@@ -113,6 +118,34 @@ void testConfigWithResponseSchema() {
     assertThat(configWithResponseSchemaFromClass).isEqualTo(configWithResponseSchemaLowLevel);
   }
 
+  @Test
+  void testTemplateConstruction() {
+    List<ChatMessage> templateMessages =
+        List.of(SingleChatMessage.create().role("user").content("message"));
+    var defaults = Map.of("key", "value");
+    var tools =
+        List.of(
+            ChatCompletionTool.create()
+                .type(ChatCompletionTool.TypeEnum.FUNCTION)
+                .function(FunctionObject.create().name("func")));
+    var template =
+        TemplateConfig.create()
+            .withTemplate(templateMessages)
+            .withDefaults(defaults)
+            .withTools(tools)
+            .withJsonResponse();
+
+    var templateLowLevel =
+        Template.create()
+            .template(templateMessages)
+            .defaults(defaults)
+            .responseFormat(
+                ResponseFormatJsonObject.create()
+                    .type(ResponseFormatJsonObject.TypeEnum.JSON_OBJECT))
+            .tools(tools);
+    assertThat(template.toLowLevel()).isEqualTo(templateLowLevel);
+  }
+
   @Test
   void testTemplateReferenceConstruction() {
     var templateReferenceId = TemplateConfig.reference().byId("id");