Merge branch 'agent-paper-main' into lanyi-expanded-agent-paper-main

1 files changed, 9 insertions, 8 deletions

diff --git a/src/client/views/nodes/chatbot/agentsystem/Agent.ts b/src/client/views/nodes/chatbot/agentsystem/Agent.ts
index d1248d098..3acdc6aa8 100644
--- a/src/client/views/nodes/chatbot/agentsystem/Agent.ts
+++ b/src/client/views/nodes/chatbot/agentsystem/Agent.ts
@@ -7,17 +7,14 @@ import { AnswerParser } from '../response_parsers/AnswerParser';
 import { StreamedAnswerParser } from '../response_parsers/StreamedAnswerParser';
 import { BaseTool } from '../tools/BaseTool';
 import { CalculateTool } from '../tools/CalculateTool';
-//import { CreateAnyDocumentTool } from '../tools/CreateAnyDocTool';
 import { DataAnalysisTool } from '../tools/DataAnalysisTool';
 import { DocumentMetadataTool } from '../tools/DocumentMetadataTool';
-import { ImageCreationTool } from '../tools/ImageCreationTool';
 import { NoTool } from '../tools/NoTool';
 import { SearchTool } from '../tools/SearchTool';
 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 { DictionaryTool } from '../tools/DictionaryTool';
 import { ChatCompletionMessageParam } from 'openai/resources';
 import { Doc } from '../../../../../fields/Doc';
 import { ChatBox, parsedDoc } from '../chatboxcomponents/ChatBox';
@@ -32,7 +29,7 @@ import { FileNamesTool } from '../tools/FileNamesTool';
 import { CreateNewTool } from '../tools/CreateNewTool';
 import { SortDocsTool} from '../tools/SortDocsTool';
 import { TagDocsTool } from '../tools/TagDocsTool';
-//import { CreateTextDocTool } from '../tools/CreateTextDocumentTool';
+import { GPTTutorialTool } from '../tools/TutorialTool';
 
 dotenv.config();
 
@@ -55,6 +52,7 @@ export class Agent {
     private streamedAnswerParser: StreamedAnswerParser = new StreamedAnswerParser();
     private tools: Record<string, BaseTool<ReadonlyArray<Parameter>>>;
     private _docManager: AgentDocumentManager;
+    private is_dash_doc_assistant: boolean;
     // Dynamic tool registry for tools created at runtime
     private dynamicToolRegistry: Map<string, BaseTool<ReadonlyArray<Parameter>>> = new Map();
     // Callback for notifying when tools are created and need reload
@@ -79,7 +77,8 @@ export class Agent {
         csvData: () => { filename: string; id: string; text: string }[],
         createImage: (result: Upload.FileInformation & Upload.InspectionResults, options: DocumentOptions) => void,
         createCSVInDash: (url: string, title: string, id: string, data: string) => void,
-        docManager: AgentDocumentManager
+        docManager: AgentDocumentManager,
+        isDashDocAssistant: boolean
     ) {
         // Initialize OpenAI client with API key from environment
         this.client = new OpenAI({ apiKey: process.env.OPENAI_KEY, dangerouslyAllowBrowser: true });
@@ -87,6 +86,7 @@ export class Agent {
         this._history = history;
         this._csvData = csvData;
         this._docManager = docManager;
+        this.is_dash_doc_assistant = isDashDocAssistant;
 
         // Initialize dynamic tool registry
         this.dynamicToolRegistry = new Map();
@@ -105,6 +105,7 @@ export class Agent {
             codebaseSummarySearch: new CodebaseSummarySearchTool(this.vectorstore),
             fileContent: new FileContentTool(this.vectorstore),
             fileNames: new FileNamesTool(this.vectorstore),
+            generateTutorialNode: new GPTTutorialTool(this._docManager),
             sortDocs: new SortDocsTool(this._docManager),
             tagDocs: new TagDocsTool(this._docManager),
         };
@@ -146,7 +147,7 @@ export class Agent {
 
                     const instance: BaseTool<ReadonlyArray<Parameter>> = new ToolClass();
 
-                    // Prefer the tool’s self-declared name (matches <action> tag)
+                    // Prefer the tool's self-declared name (matches <action> tag)
                     const key = (instance.name || '').trim() || legacyKey;
 
                     // Check for duplicates
@@ -301,7 +302,7 @@ export class Agent {
             ignoreAttributes: false,
             attributeNamePrefix: '@_',
             textNodeName: '_text',
-            isArray: name => ['query', 'url'].indexOf(name) !== -1,
+            isArray: name => name === 'url',
             processEntities: false, // Disable processing of entities
             stopNodes: ['*.entity'], // Do not process any entities
         });
@@ -763,7 +764,7 @@ export class Agent {
         const docSummaries = () => JSON.stringify(this._docManager.listDocs);
         const chatHistory = this._history();
 
-        return getReactPrompt(allTools, docSummaries, chatHistory);
+        return getReactPrompt(allTools, docSummaries, chatHistory, this.is_dash_doc_assistant);
     }
 
     /**