merge issues

1 files changed, 8 insertions, 9 deletions

diff --git a/src/client/views/nodes/chatbot/agentsystem/Agent.ts b/src/client/views/nodes/chatbot/agentsystem/Agent.ts
index a16794e10..8516f054b 100644
--- a/src/client/views/nodes/chatbot/agentsystem/Agent.ts
+++ b/src/client/views/nodes/chatbot/agentsystem/Agent.ts
@@ -7,14 +7,17 @@ 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';
@@ -27,7 +30,7 @@ import { CodebaseSummarySearchTool } from '../tools/CodebaseSummarySearchTool';
 import { FileContentTool } from '../tools/FileContentTool';
 import { FileNamesTool } from '../tools/FileNamesTool';
 import { CreateNewTool } from '../tools/CreateNewTool';
-import { GPTTutorialTool } from '../tools/TutorialTool';
+//import { CreateTextDocTool } from '../tools/CreateTextDocumentTool';
 
 dotenv.config();
 
@@ -50,7 +53,6 @@ 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
@@ -75,8 +77,7 @@ 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,
-        isDashDocAssistant: boolean
+        docManager: AgentDocumentManager
     ) {
         // Initialize OpenAI client with API key from environment
         this.client = new OpenAI({ apiKey: process.env.OPENAI_KEY, dangerouslyAllowBrowser: true });
@@ -84,7 +85,6 @@ 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();
@@ -103,7 +103,6 @@ export class Agent {
             codebaseSummarySearch: new CodebaseSummarySearchTool(this.vectorstore),
             fileContent: new FileContentTool(this.vectorstore),
             fileNames: new FileNamesTool(this.vectorstore),
-            generateTutorialNode: new GPTTutorialTool(this._docManager),
         };
 
         // Add the createNewTool after other tools are defined
@@ -143,7 +142,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
@@ -298,7 +297,7 @@ export class Agent {
             ignoreAttributes: false,
             attributeNamePrefix: '@_',
             textNodeName: '_text',
-            isArray: name => name === 'url',
+            isArray: name => ['query', 'url'].indexOf(name) !== -1,
             processEntities: false, // Disable processing of entities
             stopNodes: ['*.entity'], // Do not process any entities
         });
@@ -760,7 +759,7 @@ export class Agent {
         const docSummaries = () => JSON.stringify(this._docManager.listDocs);
         const chatHistory = this._history();
 
-        return getReactPrompt(allTools, docSummaries, chatHistory, this.is_dash_doc_assistant);
+        return getReactPrompt(allTools, docSummaries, chatHistory);
     }
 
     /**