From 0f4dbfabf7440ae73d7019acf3c9fa0b3e74ab1f Mon Sep 17 00:00:00 2001 From: Zeyo Date: Thu, 30 May 2024 06:44:02 +0530 Subject: [PATCH] Removed Redundant System Out Removed Test Tool Fixed bug where responses from response array would be used even if the tool is not response formatted --- src/main/java/me/ailama/commands/AiCommand.java | 3 +-- .../me/ailama/handler/commandhandler/OllamaManager.java | 4 ++++ src/main/java/me/ailama/tools/UtilityTools.java | 7 ------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/me/ailama/commands/AiCommand.java b/src/main/java/me/ailama/commands/AiCommand.java index c0c432f..e21edf8 100644 --- a/src/main/java/me/ailama/commands/AiCommand.java +++ b/src/main/java/me/ailama/commands/AiCommand.java @@ -151,9 +151,8 @@ public void handleCommand(SlashCommandInteractionEvent event) { else { // if tooled.response contains a string that has ({response}) in it, replace it with the result of the tool - if(tooled.response != null && tooled.response.length > 0) { + if(OllamaManager.getInstance().isToolResponseFormatted(tooled.name)) { - System.out.println(Arrays.toString(tooled.response)); response = String.join("\n\n", tooled.response).replace("({response})", OllamaManager.getInstance().executeTool(tooled.name, tooled.parameters.values().toArray()).toString()); } diff --git a/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java b/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java index 70a8010..ac7fc52 100644 --- a/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java +++ b/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java @@ -179,6 +179,10 @@ public boolean isToolRawResponse(String toolName) { return getTool(toolName) != null && getTool(toolName).getAnnotation(Tool.class).rawResponse(); } + public boolean isToolResponseFormatted(String toolName) { + return getTool(toolName) != null && getTool(toolName).getAnnotation(Tool.class).responseFormatter(); + } + // Execute the Tool public Object executeTool(String toolName, Object... args) { diff --git a/src/main/java/me/ailama/tools/UtilityTools.java b/src/main/java/me/ailama/tools/UtilityTools.java index dbfa1c7..26aebb5 100644 --- a/src/main/java/me/ailama/tools/UtilityTools.java +++ b/src/main/java/me/ailama/tools/UtilityTools.java @@ -31,11 +31,4 @@ public String toolsJson() { return gson.toJson(jsonElement); } - - @Tool(name = "testTool", description = "Test the tool", parameters = { - @Parameter(name = "fruitName", Type = "string") - }, responseFormatter = true) - public String testTool(String resp) { - return resp; - } }