Merge branch 'master' into alyssa-starter

1 files changed, 15 insertions, 12 deletions

diff --git a/src/client/views/nodes/chatbot/tools/WebsiteInfoScraperTool.ts b/src/client/views/nodes/chatbot/tools/WebsiteInfoScraperTool.ts
index f2e3863a6..19ccd0b36 100644
--- a/src/client/views/nodes/chatbot/tools/WebsiteInfoScraperTool.ts
+++ b/src/client/views/nodes/chatbot/tools/WebsiteInfoScraperTool.ts
@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { Networking } from '../../../../Network';
 import { BaseTool } from './BaseTool';
 import { Observation } from '../types/types';
-import { ParametersType } from './ToolTypes';
+import { ParametersType, ToolInfo } from '../types/tool_types';
 
 const websiteInfoScraperToolParams = [
     {
@@ -16,15 +16,10 @@ const websiteInfoScraperToolParams = [
 
 type WebsiteInfoScraperToolParamsType = typeof websiteInfoScraperToolParams;
 
-export class WebsiteInfoScraperTool extends BaseTool<WebsiteInfoScraperToolParamsType> {
-    private _addLinkedUrlDoc: (url: string, id: string) => void;
-
-    constructor(addLinkedUrlDoc: (url: string, id: string) => void) {
-        super(
-            'websiteInfoScraper',
-            'Scrape detailed information from specific websites relevant to the user query',
-            websiteInfoScraperToolParams,
-            `
+const websiteInfoScraperToolInfo: ToolInfo<WebsiteInfoScraperToolParamsType> = {
+    name: 'websiteInfoScraper',
+    description: 'Scrape detailed information from specific websites relevant to the user query. Returns the text content of the webpages for further analysis and grounding.',
+    citationRules: `
       Your task is to provide a comprehensive response to the user's prompt using the content scraped from relevant websites. Ensure you follow these guidelines for structuring your response:
 
       1. Grounded Text Tag Structure:
@@ -64,9 +59,17 @@ export class WebsiteInfoScraperTool extends BaseTool<WebsiteInfoScraperToolParam
               <question>Are there additional factors that could influence economic growth beyond investments and inflation?</question>
           </follow_up_questions>
       </answer>
+
+      ***NOTE***: Ensure that the response is structured correctly and adheres to the guidelines provided. Also, if needed/possible, cite multiple websites to provide a comprehensive response.
       `,
-            'Returns the text content of the webpages for further analysis and grounding.'
-        );
+    parameterRules: websiteInfoScraperToolParams,
+};
+
+export class WebsiteInfoScraperTool extends BaseTool<WebsiteInfoScraperToolParamsType> {
+    private _addLinkedUrlDoc: (url: string, id: string) => void;
+
+    constructor(addLinkedUrlDoc: (url: string, id: string) => void) {
+        super(websiteInfoScraperToolInfo);
         this._addLinkedUrlDoc = addLinkedUrlDoc;
     }