Apply PR comments

ballerina-platform · Jan 26, 2024 · 29c61d4 · 29c61d4
1 parent cf2a0a8
commit 29c61d4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/ballerina/agent.bal b/ballerina/agent.bal
@@ -300,6 +300,4 @@ isolated function getObservationString(anydata|error observation) returns string
 #
 # + agent - Agent instance
 # + return - Array of tools registered with the agent
-public isolated function getTools(BaseAgent agent) returns AgentTool[] {
-    return agent.toolStore.tools.toArray();
-}
+public isolated function getTools(BaseAgent agent) returns AgentTool[] => agent.toolStore.tools.toArray();
diff --git a/ballerina/error.bal b/ballerina/error.bal
@@ -47,7 +47,7 @@ public type HttpResponseParsingError distinct HttpServiceToolKitError;
 public type ToolExecutionError distinct error;
 
 # Error during unexpected output by the tool
-public type ToolInvaludOutputError distinct ToolExecutionError;
+public type ToolInvalidOutputError distinct ToolExecutionError;
 
 # Errors occurred due to invalid tool name generated by the LLM.
 public type ToolNotFoundError distinct LlmInvalidGenerationError;

diff --git a/ballerina/function_call.bal b/ballerina/function_call.bal
@@ -57,14 +57,13 @@ public isolated class FunctionCallAgent {
 
     isolated function selectNextTool(ExecutionProgress progress) returns json|LlmError {
         ChatMessage[] messages = createFunctionCallMessages(progress);
-        FunctionCall|string|LlmError functionaCall = self.model.functionaCall(messages,
+        return self.model.functionaCall(messages,
         from AgentTool tool in self.toolStore.tools.toArray()
         select {
             name: tool.name,
             description: tool.description,
             parameters: tool.variables
         });
-        return functionaCall;
     }
 }
 

diff --git a/ballerina/react.bal b/ballerina/react.bal
@@ -39,9 +39,7 @@ public isolated class ReActAgent {
         log:printDebug("Instruction Prompt Generated Successfully", instructionPrompt = self.instructionPrompt);
     }
 
-    isolated function parseLlmResponse(json llmResponse) returns LlmToolResponse|LlmChatResponse|LlmInvalidGenerationError {
-        return parseReActLlmResponse(normalizeLlmResponse(llmResponse.toString()));
-    }
+    isolated function parseLlmResponse(json llmResponse) returns LlmToolResponse|LlmChatResponse|LlmInvalidGenerationError => parseReActLlmResponse(normalizeLlmResponse(llmResponse.toString()));
 
     isolated function selectNextTool(ExecutionProgress progress) returns json|LlmError {
         map<json>|string? context = progress.context;
@@ -157,7 +155,7 @@ isolated function extractToolInfo(ToolStore toolStore) returns ToolInfo {
             description: tool.description,
             inputSchema: tool.variables
         };
-        toolIntroList.push(tool.name + ": " + toolDescription.toString());
+        toolIntroList.push(string `${tool.name}: ${toolDescription.toString()}`);
     }
     return {
         toolList: string:'join(", ", ...toolNameList).trim(),

diff --git a/ballerina/tool.bal b/ballerina/tool.bal
@@ -89,7 +89,7 @@ isolated class ToolStore {
             return {value: observation};
         }
         if observation !is error {
-            return error ToolInvaludOutputError("Tool returns an invalid output. Expected anydata or error.", outputType = typeof observation, toolName = name, inputs = inputValues.length() == 0 ? {} : inputValues);
+            return error ToolInvalidOutputError("Tool returns an invalid output. Expected anydata or error.", outputType = typeof observation, toolName = name, inputs = inputValues.length() == 0 ? {} : inputValues);
         }
         if observation.message() == "{ballerina/lang.function}IncompatibleArguments" {
             return error ToolInvalidInputError("Tool is provided with invalid inputs.", observation, toolName = name, inputs = inputValues.length() == 0 ? {} : inputValues, instruction = string `Tool "${name}"  execution failed due to invalid inputs provided. Use the schema to provide inputs: ${self.tools.get(name).variables.toString()}`);