remove @core package and refactor tools code

Author: leehuwuj

templates/components/agents/typescript/financial_report/workflow/factory.ts

@@ -1,38 +1,19 @@
 import { ChatMessage, ToolCallLLM } from "llamaindex";
+import { getTool } from "../engine/tools";
 import { FinancialReportWorkflow } from "./fin-report";
-import { getAvailableTools } from "./tools";
+import { getQueryEngineTools } from "./tools";
 
 const TIMEOUT = 360 * 1000;
 
 export async function createWorkflow(options: {
   chatHistory: ChatMessage[];
   llm?: ToolCallLLM;
 }) {
-  const tools = await getAvailableTools();
-  const queryEngineTools = tools.filter((tool) =>
-    tool.metadata.name.includes("retriever"),
-  );
-  const documentGeneratorTool = tools.find(
-    (tool) => tool.metadata.name === "document_generator",
-  );
-  const codeInterpreterTool = tools.find(
-    (tool) => tool.metadata.name === "interpreter",
-  );
-  if (!queryEngineTools?.length) {
-    throw new Error("Query engine tools array must not be empty");
-  }
-  if (!documentGeneratorTool) {
-    throw new Error("Document generator tool not found");
-  }
-  if (!codeInterpreterTool) {
-    throw new Error("Code interpreter tool not found");
-  }
-
   return new FinancialReportWorkflow({
     chatHistory: options.chatHistory,
-    queryEngineTools,
-    codeInterpreterTool,
-    documentGeneratorTool,
+    queryEngineTools: (await getQueryEngineTools()) || [],
+    codeInterpreterTool: (await getTool("interpreter"))!,
+    documentGeneratorTool: (await getTool("document_generator"))!,
     llm: options.llm,
     timeout: TIMEOUT,
   });

templates/components/agents/typescript/form_filling/workflow/factory.ts

@@ -1,39 +1,20 @@
 import { ChatMessage, ToolCallLLM } from "llamaindex";
+import { getQueryEngineTools } from "../../../../multiagent/typescript/workflow/tools";
+import { getTool } from "../engine/tools";
 import { FormFillingWorkflow } from "./form-filling";
-import { getAvailableTools } from "./tools";
 
 const TIMEOUT = 360 * 1000;
 
 export async function createWorkflow(options: {
   chatHistory: ChatMessage[];
   llm?: ToolCallLLM;
 }) {
-  const tools = await getAvailableTools();
-  const extractorTool = tools.find(
-    (tool) => tool.metadata.name === "extract_missing_cells",
-  );
-  const queryEngineTools = tools.filter((tool) =>
-    tool.metadata.name.includes("retriever"),
-  );
-  const fillMissingCellsTool = tools.find(
-    (tool) => tool.metadata.name === "fill_missing_cells",
-  );
-
-  if (!extractorTool) {
-    throw new Error("Extractor tool not found");
-  }
-  if (!fillMissingCellsTool) {
-    throw new Error("Fill missing cells tool not found");
-  }
-
-  const formFilling = new FormFillingWorkflow({
+  return new FormFillingWorkflow({
     chatHistory: options.chatHistory,
-    extractorTool,
-    queryEngineTools,
-    fillMissingCellsTool,
+    queryEngineTools: (await getQueryEngineTools()) || [],
+    extractorTool: (await getTool("extract_missing_cells"))!,
+    fillMissingCellsTool: (await getTool("fill_missing_cells"))!,
     llm: options.llm,
     timeout: TIMEOUT,
   });
-
-  return formFilling;
 }

templates/components/engines/typescript/agent/tools/index.ts

@@ -1,5 +1,7 @@
 import { BaseToolWithCall } from "llamaindex";
 import { ToolsFactory } from "llamaindex/tools/ToolsFactory";
+import fs from "node:fs/promises";
+import path from "node:path";
 import { CodeGeneratorTool, CodeGeneratorToolParams } from "./code-generator";
 import {
   DocumentGenerator,
@@ -82,3 +84,19 @@ async function createLocalTools(
 
   return tools;
 }
+
+export async function getConfiguredTools(
+  configPath?: string,
+): Promise<BaseToolWithCall[]> {
+  const configFile = path.join(configPath ?? "config", "tools.json");
+  const toolConfig = JSON.parse(await fs.readFile(configFile, "utf8"));
+  const tools = await createTools(toolConfig);
+  return tools;
+}
+
+export async function getTool(
+  toolName: string,
+): Promise<BaseToolWithCall | undefined> {
+  const tools = await getConfiguredTools();
+  return tools.find((tool) => tool.metadata.name === toolName);
+}

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

@@ -1,5 +1,4 @@
 import { HandlerContext } from "@llamaindex/workflow";
-import fs from "fs/promises";
 import {
   BaseToolWithCall,
   callTool,
@@ -14,9 +13,7 @@ import {
   ToolCallLLMMessageOptions,
 } from "llamaindex";
 import crypto from "node:crypto";
-import path from "path";
 import { getDataSource } from "../engine";
-import { createTools } from "../engine/tools/index";
 import { AgentRunEvent } from "./type";
 
 export const getQueryEngineTools = async (): Promise<
@@ -71,35 +68,6 @@ export const getQueryEngineTools = async (): Promise<
   }
 };
 
-export const getAvailableTools = async (): Promise<BaseToolWithCall[]> => {
-  const configFile = path.join("config", "tools.json");
-  let toolConfig: any;
-  const tools: BaseToolWithCall[] = [];
-  try {
-    toolConfig = JSON.parse(await fs.readFile(configFile, "utf8"));
-  } catch (e) {
-    console.info(`Could not read ${configFile} file. Using no tools.`);
-  }
-  if (toolConfig) {
-    tools.push(...(await createTools(toolConfig)));
-  }
-  const queryEngineTools = await getQueryEngineTools();
-  if (queryEngineTools) {
-    tools.push(...queryEngineTools);
-  }
-
-  return tools;
-};
-
-export const lookupTools = async (
-  toolNames: string[],
-): Promise<BaseToolWithCall[]> => {
-  const availableTools = await getAvailableTools();
-  return availableTools.filter((tool) =>
-    toolNames.includes(tool.metadata.name),
-  );
-};
-
 /**
  * Call multiple tools and return the tool messages
  */

templates/types/streaming/express/package.json

@@ -34,7 +34,6 @@
     "@types/cors": "^2.8.16",
     "@types/express": "^4.17.21",
     "@types/node": "^20.9.5",
-    "@llamaindex/core": "^0.4.5",
     "@llamaindex/workflow": "^0.0.3",
     "@types/papaparse": "^5.3.15",
     "concurrently": "^8.2.2",

templates/types/streaming/nextjs/package.json

@@ -45,7 +45,6 @@
     "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",
     "@types/uuid": "^9.0.8",
-    "@llamaindex/core": "^0.4.5",
     "@llamaindex/workflow": "^0.0.3",
     "@types/papaparse": "^5.3.15",
     "autoprefixer": "^10.4.16",