updated from master

1 files changed, 27 insertions, 23 deletions

diff --git a/src/client/views/nodes/chatbot/agentsystem/Agent.ts b/src/client/views/nodes/chatbot/agentsystem/Agent.ts
index 8338879cf..689c152dd 100644
--- a/src/client/views/nodes/chatbot/agentsystem/Agent.ts
+++ b/src/client/views/nodes/chatbot/agentsystem/Agent.ts
@@ -1,28 +1,27 @@
 import dotenv from 'dotenv';
 import { XMLBuilder, XMLParser } from 'fast-xml-parser';
-import OpenAI from 'openai';
-import { ChatCompletionMessageParam } from 'openai/resources';
 import { escape } from 'lodash'; // Imported escape from lodash
+import OpenAI from 'openai';
+import { DocumentOptions } from '../../../../documents/Documents';
 import { AnswerParser } from '../response_parsers/AnswerParser';
 import { StreamedAnswerParser } from '../response_parsers/StreamedAnswerParser';
+import { BaseTool } from '../tools/BaseTool';
 import { CalculateTool } from '../tools/CalculateTool';
-import { CreateCSVTool } from '../tools/CreateCSVTool';
+import { CreateAnyDocumentTool } from '../tools/CreateAnyDocTool';
+import { CreateDocTool } from '../tools/CreateDocumentTool';
 import { DataAnalysisTool } from '../tools/DataAnalysisTool';
+import { ImageCreationTool } from '../tools/ImageCreationTool';
 import { NoTool } from '../tools/NoTool';
-import { RAGTool } from '../tools/RAGTool';
 import { SearchTool } from '../tools/SearchTool';
-import { WebsiteInfoScraperTool } from '../tools/WebsiteInfoScraperTool';
+import { Parameter, ParametersType, TypeMap } from '../types/tool_types';
 import { AgentMessage, ASSISTANT_ROLE, AssistantMessage, Observation, PROCESSING_TYPE, ProcessingInfo, TEXT_TYPE } from '../types/types';
 import { Vectorstore } from '../vectorstore/Vectorstore';
 import { getReactPrompt } from './prompts';
-import { BaseTool } from '../tools/BaseTool';
-import { Parameter, ParametersType, TypeMap } from '../types/tool_types';
-import { CreateTextDocTool } from '../tools/CreateTextDocumentTool';
-import { DocumentOptions } from '../../../../documents/Documents';
-import { CreateAnyDocumentTool } from '../tools/CreateAnyDocTool';
-import { ImageCreationTool } from '../tools/ImageCreationTool';
-import { DictionaryTool } from '../tools/DictionaryTool';
 //import { DictionaryTool } from '../tools/DictionaryTool';
+import { ChatCompletionMessageParam } from 'openai/resources';
+import { Doc } from '../../../../../fields/Doc';
+import { parsedDoc } from '../chatboxcomponents/ChatBox';
+import { CreateTextDocTool } from '../tools/CreateTextDocumentTool';
 
 dotenv.config();
 
@@ -61,9 +60,10 @@ export class Agent {
         history: () => string,
         csvData: () => { filename: string; id: string; text: string }[],
         addLinkedUrlDoc: (url: string, id: string) => void,
-        addLinkedDoc: (doc_type: string, data: string | undefined, options: DocumentOptions, id: string) => void,
-        createCSVInDash: (url: string, title: string, id: string, data: string) => void,
-        createImage: (result: any, options: DocumentOptions) => void
+        createImage: (result: any, options: DocumentOptions) => void,
+        addLinkedDoc: (doc: parsedDoc) => Doc | undefined,
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        createCSVInDash: (url: string, title: string, id: string, data: string) => void
     ) {
         // Initialize OpenAI client with API key from environment
         this.client = new OpenAI({ apiKey: process.env.OPENAI_KEY, dangerouslyAllowBrowser: true });
@@ -75,16 +75,17 @@ export class Agent {
         // Define available tools for the assistant
         this.tools = {
             calculate: new CalculateTool(),
-            rag: new RAGTool(this.vectorstore),
+            // rag: new RAGTool(this.vectorstore),
             dataAnalysis: new DataAnalysisTool(csvData),
-            websiteInfoScraper: new WebsiteInfoScraperTool(addLinkedUrlDoc),
+            // websiteInfoScraper: new WebsiteInfoScraperTool(addLinkedUrlDoc),
             searchTool: new SearchTool(addLinkedUrlDoc),
-            createCSV: new CreateCSVTool(createCSVInDash),
+            // createCSV: new CreateCSVTool(createCSVInDash),
             noTool: new NoTool(),
             imageCreationTool: new ImageCreationTool(createImage),
-            //createTextDoc: new CreateTextDocTool(addLinkedDoc),
+            createTextDoc: new CreateTextDocTool(addLinkedDoc),
+            createDoc: new CreateDocTool(addLinkedDoc),
             createAnyDocument: new CreateAnyDocumentTool(addLinkedDoc),
-            dictionary: new DictionaryTool(),
+            // dictionary: new DictionaryTool(),
         };
     }
 
@@ -142,6 +143,7 @@ export class Agent {
             console.log(this.interMessages);
             console.log(`Turn ${i}/${maxTurns}`);
 
+            // eslint-disable-next-line no-await-in-loop
             const result = await this.execute(onProcessingUpdate, onAnswerUpdate);
             this.interMessages.push({ role: 'assistant', content: result });
 
@@ -197,11 +199,13 @@ export class Agent {
                 } else if (key === 'action_input') {
                     // Handle action input stage
                     const actionInput = stage[key];
+                    console.log(`Action input full:`, actionInput);
                     console.log(`Action input:`, actionInput.inputs);
 
                     if (currentAction) {
                         try {
                             // Process the action with its input
+                            // eslint-disable-next-line no-await-in-loop
                             const observation = (await this.processAction(currentAction, actionInput.inputs)) as Observation[];
                             const nextPrompt = [{ type: 'text', text: `<stage number="${i + 1}" role="user"> <observation>` }, ...observation, { type: 'text', text: '</observation></stage>' }] as Observation[];
                             console.log(observation);
@@ -306,7 +310,7 @@ export class Agent {
      * @param response The parsed XML response from the assistant.
      * @throws An error if the response does not meet the expected structure.
      */
-    private validateAssistantResponse(response: any) {
+    private validateAssistantResponse(response: { stage: { [key: string]: object | string } }) {
         if (!response.stage) {
             throw new Error('Response does not contain a <stage> element');
         }
@@ -349,7 +353,7 @@ export class Agent {
 
             // If 'action_input' is present, validate its structure
             if ('action_input' in stage) {
-                const actionInput = stage.action_input;
+                const actionInput = stage.action_input as object;
 
                 if (!('action_input_description' in actionInput) || typeof actionInput.action_input_description !== 'string') {
                     throw new Error('action_input must contain an action_input_description string');
@@ -364,7 +368,7 @@ export class Agent {
 
             // If 'answer' is present, validate its structure
             if ('answer' in stage) {
-                const answer = stage.answer;
+                const answer = stage.answer as object;
 
                 // Ensure answer contains at least one of the required elements
                 if (!('grounded_text' in answer || 'normal_text' in answer)) {