Merge branch 'master' into alyssa-starter

1 files changed, 9 insertions, 8 deletions

diff --git a/src/client/views/nodes/chatbot/tools/CalculateTool.ts b/src/client/views/nodes/chatbot/tools/CalculateTool.ts
index e96c9a98a..ca7223803 100644
--- a/src/client/views/nodes/chatbot/tools/CalculateTool.ts
+++ b/src/client/views/nodes/chatbot/tools/CalculateTool.ts
@@ -1,5 +1,5 @@
 import { Observation } from '../types/types';
-import { ParametersType } from './ToolTypes';
+import { ParametersType, ToolInfo } from '../types/tool_types';
 import { BaseTool } from './BaseTool';
 
 const calculateToolParams = [
@@ -13,15 +13,16 @@ const calculateToolParams = [
 
 type CalculateToolParamsType = typeof calculateToolParams;
 
+const calculateToolInfo: ToolInfo<CalculateToolParamsType> = {
+    name: 'calculate',
+    citationRules: 'No citation needed.',
+    parameterRules: calculateToolParams,
+    description: 'Runs a calculation and returns the number - uses JavaScript so be sure to use floating point syntax if necessary',
+};
+
 export class CalculateTool extends BaseTool<CalculateToolParamsType> {
     constructor() {
-        super(
-            'calculate',
-            'Perform a calculation',
-            calculateToolParams, // Use the reusable param config here
-            'Provide a mathematical expression to calculate that would work with JavaScript eval().',
-            'Runs a calculation and returns the number - uses JavaScript so be sure to use floating point syntax if necessary'
-        );
+        super(calculateToolInfo);
     }
 
     async execute(args: ParametersType<CalculateToolParamsType>): Promise<Observation[]> {