improve code

Author: leehuwuj

templates/components/agents/typescript/financial_report/app/api/chat/workflow/factory.ts

@@ -54,7 +54,7 @@ export async function createWorkflow(options: {
   const chatHistoryWithAgentMessages = prepareChatHistory(options.chatHistory);
 
   const tools = await getAvailableTools();
-  const retrieverTools = tools.filter((tool) =>
+  const queryEngineTool = tools.find((tool) =>
     tool.metadata.name.startsWith("retriever"),
   );
   const documentGeneratorTool = tools.find(
@@ -64,15 +64,15 @@ export async function createWorkflow(options: {
     (tool) => tool.metadata.name === "interpreter",
   );
 
-  if (!documentGeneratorTool || !codeInterpreterTool || !retrieverTools) {
+  if (!documentGeneratorTool || !codeInterpreterTool || !queryEngineTool) {
     throw new Error(
       "These tools are required: document_generator, code_interpreter, retriever",
     );
   }
 
   return new FinancialReportWorkflow({
     chatHistory: chatHistoryWithAgentMessages,
-    queryEngineTools: retrieverTools,
+    queryEngineTool: queryEngineTool,
     codeInterpreterTool,
     documentGeneratorTool,
     llm: options.llm,

templates/components/agents/typescript/financial_report/app/api/chat/workflow/finReport.ts

@@ -40,7 +40,7 @@ For the query engine tool, you should break down the user request into a list of
 export class FinancialReportWorkflow extends Workflow {
   llm: ToolCallLLM;
   memory: ChatMemoryBuffer;
-  queryEngineTools: BaseToolWithCall[];
+  queryEngineTool: BaseToolWithCall;
   codeInterpreterTool: BaseToolWithCall;
   documentGeneratorTool: BaseToolWithCall;
   systemPrompt?: string;
@@ -49,7 +49,7 @@ export class FinancialReportWorkflow extends Workflow {
   constructor(options: {
     llm?: ToolCallLLM;
     chatHistory: ChatMessage[];
-    queryEngineTools: BaseToolWithCall[];
+    queryEngineTool: BaseToolWithCall;
     codeInterpreterTool: BaseToolWithCall;
     documentGeneratorTool: BaseToolWithCall;
     systemPrompt?: string;
@@ -65,7 +65,7 @@ export class FinancialReportWorkflow extends Workflow {
     this.llm = options.llm ?? (Settings.llm as ToolCallLLM);
     this.systemPrompt = options.systemPrompt ?? DEFAULT_SYSTEM_PROMPT;
     this.writeEvents = options.writeEvents;
-    this.queryEngineTools = options.queryEngineTools;
+    this.queryEngineTool = options.queryEngineTool;
     this.codeInterpreterTool = options.codeInterpreterTool;
     this.documentGeneratorTool = options.documentGeneratorTool;
     this.memory = new ChatMemoryBuffer({
@@ -112,8 +112,8 @@ export class FinancialReportWorkflow extends Workflow {
     const chatHistory = ev.data.input;
 
     const tools = [this.codeInterpreterTool, this.documentGeneratorTool];
-    if (this.queryEngineTools) {
-      tools.push(...this.queryEngineTools);
+    if (this.queryEngineTool) {
+      tools.push(this.queryEngineTool);
     }
 
     const toolCallResponse = await chatWithTools(this.llm, tools, chatHistory);
@@ -169,7 +169,7 @@ export class FinancialReportWorkflow extends Workflow {
 
     const toolMsgs = await callTools(
       toolCalls,
-      this.queryEngineTools,
+      [this.queryEngineTool],
       ctx,
       "Researcher",
     );
@@ -197,7 +197,7 @@ export class FinancialReportWorkflow extends Workflow {
     );
     // Request by workflow LLM, input is a list of tool calls
     let toolCalls: ToolCall[] = [];
-    if (ev.data.input instanceof Array) {
+    if (Array.isArray(ev.data.input)) {
       toolCalls = ev.data.input;
     } else {
       // Requested by Researcher, input is a ChatMessage

templates/components/engines/typescript/agent/tools/form-filling.ts

@@ -240,6 +240,12 @@ export class FillMissingCellsTool
       skipEmptyLines: false, // Ensure empty lines are not skipped
     });
 
+    if (parseResult.errors.length) {
+      throw new Error(
+        "Failed to parse CSV file: " + parseResult.errors[0].message,
+      );
+    }
+
     const rows = parseResult.data;
 
     // Fill the cells with answers

templates/components/multiagent/typescript/workflow/tools.ts

@@ -83,8 +83,12 @@ export const callTools = async (
     return toolMsgs;
   }
   if (toolCalls.length === 1) {
+    const tool = tools.find((tool) => tool.metadata.name === toolCalls[0].name);
+    if (!tool) {
+      throw new Error(`Tool ${toolCalls[0].name} not found`);
+    }
     return [
-      (await callSingleTool(toolCalls[0], tools[0], (msg: string) => {
+      (await callSingleTool(toolCalls[0], tool, (msg: string) => {
         if (writeEvent) {
           ctx.writeEventToStream(
             new AgentRunEvent({