Cleanup

Author: MatKuhr

orchestration/pom.xml

@@ -59,11 +59,6 @@
       <artifactId>spring-ai-model</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.ai</groupId>
-      <artifactId>spring-ai-client-chat</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
@@ -154,6 +149,13 @@
       <artifactId>javaparser-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ai</groupId>
+      <artifactId>spring-ai-client-chat</artifactId>
+      <scope>test</scope>
+      <!-- optional is only set to satisfy our enforcer rule, it doesn't matter for test dependencies -->
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <profiles>

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatOptions.java

@@ -43,7 +43,7 @@ public class OrchestrationChatOptions implements ToolCallingChatOptions {
 
   @Nonnull private OrchestrationModuleConfig config;
 
-  private List<ToolCallback> functionCallbacks;
+  private List<ToolCallback> toolCallbacks;
 
   @Getter(AccessLevel.NONE)
   private Boolean internalToolExecutionEnabled;
@@ -177,44 +177,43 @@ private <T> T getLlmConfigParam(@Nonnull final String param) {
     return ((Map<String, T>) getLlmConfigNonNull().getModelParams()).get(param);
   }
 
-  @Nonnull
-  private LLMModuleConfig getLlmConfigNonNull() {
-    return Objects.requireNonNull(
-        config.getLlmConfig(),
-        "LLM config is not set. Please set it: new OrchestrationChatOptions(new OrchestrationModuleConfig().withLlmConfig(...))");
-  }
-
   @Nonnull
   @Override
   public List<ToolCallback> getToolCallbacks() {
-    return functionCallbacks;
+    return toolCallbacks;
   }
 
   @Override
   public void setToolCallbacks(@Nonnull final List<ToolCallback> toolCallbacks) {
-    this.functionCallbacks = toolCallbacks;
+    this.toolCallbacks = toolCallbacks;
     final Template template =
         Objects.requireNonNullElse(
             (Template) config.getTemplateConfig(), Template.create().template());
     val tools = toolCallbacks.stream().map(OrchestrationChatOptions::toOrchestrationTool).toList();
     config = config.withTemplateConfig(template.tools(tools));
   }
 
+  @Nullable
   @Override
   public Boolean getInternalToolExecutionEnabled() {
-    return true;
+    return this.internalToolExecutionEnabled;
+  }
+
+  @Nonnull
+  private LLMModuleConfig getLlmConfigNonNull() {
+    return Objects.requireNonNull(
+        config.getLlmConfig(),
+        "LLM config is not set. Please set it: new OrchestrationChatOptions(new OrchestrationModuleConfig().withLlmConfig(...))");
   }
 
-  private static ChatCompletionTool toOrchestrationTool(
-      @Nonnull final ToolCallback functionCallback) {
+  private static ChatCompletionTool toOrchestrationTool(@Nonnull final ToolCallback toolCallback) {
+    val toolDef = toolCallback.getToolDefinition();
     return ChatCompletionTool.create()
         .type(TypeEnum.FUNCTION)
         .function(
             FunctionObject.create()
-                .name(functionCallback.getToolDefinition().name())
-                .description(functionCallback.getToolDefinition().name())
-                .parameters(
-                    ModelOptionsUtils.jsonToMap(
-                        functionCallback.getToolDefinition().inputSchema())));
+                .name(toolDef.name())
+                .description(toolDef.description())
+                .parameters(ModelOptionsUtils.jsonToMap(toolDef.inputSchema())));
   }
 }

orchestration/src/test/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatModelTest.java

@@ -50,7 +50,7 @@
 import reactor.core.publisher.Flux;
 
 @WireMockTest
-public class OrchestrationChatModelTest {
+class OrchestrationChatModelTest {
 
   private final Function<String, InputStream> fileLoader =
       filename -> Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream(filename));