Merge branch 'master' into ajs-finalagent

2 files changed, 35 insertions, 39 deletions

diff --git a/src/client/views/nodes/chatbot/tools/CreateDocumentTool.ts b/src/client/views/nodes/chatbot/tools/CreateDocumentTool.ts
index 6dc36b0d1..284879a4a 100644
--- a/src/client/views/nodes/chatbot/tools/CreateDocumentTool.ts
+++ b/src/client/views/nodes/chatbot/tools/CreateDocumentTool.ts
@@ -263,79 +263,79 @@ const standardOptions = ['title', 'backgroundColor'];
  * Description of document options and data field for each type.
  */
 const documentTypesInfo: { [key in supportedDocTypes]: { options: string[]; dataDescription: string } } = {
-    [supportedDocTypes.comparison]: {
+    comparison: {
         options: [...standardOptions, 'fontColor', 'text_align'],
         dataDescription: 'an array of two documents of any kind that can be compared.',
     },
-    [supportedDocTypes.deck]: {
+    deck: {
         options: [...standardOptions, 'fontColor', 'text_align'],
         dataDescription: 'an array of flashcard docs',
     },
-    [supportedDocTypes.flashcard]: {
+    flashcard: {
         options: [...standardOptions, 'fontColor', 'text_align'],
         dataDescription: 'an array of two strings.  the first string contains a question, and the second string contains an answer',
     },
-    [supportedDocTypes.text]: {
+    text: {
         options: [...standardOptions, 'fontColor', 'text_align'],
         dataDescription: 'The text content of the document.',
     },
-    [supportedDocTypes.web]: {
+    web: {
         options: [],
         dataDescription: 'A URL to a webpage. Example: https://en.wikipedia.org/wiki/Brown_University',
     },
-    [supportedDocTypes.html]: {
+    html: {
         options: [],
         dataDescription: 'The HTML-formatted text content of the document.',
     },
-    [supportedDocTypes.equation]: {
+    equation: {
         options: [...standardOptions, 'fontColor'],
         dataDescription: 'The equation content represented as a MathML string.',
     },
-    [supportedDocTypes.functionplot]: {
+    functionplot: {
         options: [...standardOptions, 'function_definition'],
         dataDescription: 'The function definition(s) for plotting. Provide as a string or array of function definitions.',
     },
-    [supportedDocTypes.dataviz]: {
+    dataviz: {
         options: [...standardOptions, 'chartType'],
         dataDescription: 'A string of comma-separated values representing the CSV data.',
     },
-    [supportedDocTypes.notetaking]: {
+    notetaking: {
         options: standardOptions,
         dataDescription: 'An array of related text documents with small amounts of text.',
     },
-    [supportedDocTypes.rtf]: {
+    rtf: {
         options: standardOptions,
         dataDescription: 'The rich text content in RTF format.',
     },
-    [supportedDocTypes.image]: {
+    image: {
         options: standardOptions,
         dataDescription: `A url string that must end with '.png', '.jpeg', '.gif', or '.jpg'`,
     },
-    [supportedDocTypes.pdf]: {
+    pdf: {
         options: standardOptions,
         dataDescription: 'the pdf content as a PDF file url.',
     },
-    [supportedDocTypes.audio]: {
+    audio: {
         options: standardOptions,
         dataDescription: 'The audio content as a file url.',
     },
-    [supportedDocTypes.video]: {
+    video: {
         options: standardOptions,
         dataDescription: 'The video content as a file url.',
     },
-    [supportedDocTypes.message]: {
+    message: {
         options: standardOptions,
         dataDescription: 'The message content of the document.',
     },
-    [supportedDocTypes.diagram]: {
+    diagram: {
         options: standardOptions,
         dataDescription: 'diagram content as a text string in Mermaid format.',
     },
-    [supportedDocTypes.script]: {
+    script: {
         options: standardOptions,
         dataDescription: 'The compilable JavaScript code. Use this for creating scripts.',
     },
-    [supportedDocTypes.collection]: {
+    collection: {
         options: [...standardOptions, 'type_collection'],
         dataDescription: 'A collection of Docs represented as an array.',
     },
diff --git a/src/client/views/nodes/chatbot/tools/ImageCreationTool.ts b/src/client/views/nodes/chatbot/tools/ImageCreationTool.ts
index 177552c5c..dc6140871 100644
--- a/src/client/views/nodes/chatbot/tools/ImageCreationTool.ts
+++ b/src/client/views/nodes/chatbot/tools/ImageCreationTool.ts
@@ -1,10 +1,10 @@
-import { v4 as uuidv4 } from 'uuid';
 import { RTFCast } from '../../../../../fields/Types';
 import { DocumentOptions } from '../../../../documents/Documents';
 import { Networking } from '../../../../Network';
 import { ParametersType, ToolInfo } from '../types/tool_types';
 import { Observation } from '../types/types';
 import { BaseTool } from './BaseTool';
+import { Upload } from '../../../../../server/SharedMediaTypes';
 
 const imageCreationToolParams = [
     {
@@ -25,8 +25,8 @@ const imageCreationToolInfo: ToolInfo<ImageCreationToolParamsType> = {
 };
 
 export class ImageCreationTool extends BaseTool<ImageCreationToolParamsType> {
-    private _createImage: (result: any, options: DocumentOptions) => void;
-    constructor(createImage: (result: any, options: DocumentOptions) => void) {
+    private _createImage: (result: Upload.FileInformation & Upload.InspectionResults, options: DocumentOptions) => void;
+    constructor(createImage: (result: Upload.FileInformation & Upload.InspectionResults, options: DocumentOptions) => void) {
         super(imageCreationToolInfo);
         this._createImage = createImage;
     }
@@ -42,23 +42,19 @@ export class ImageCreationTool extends BaseTool<ImageCreationToolParamsType> {
             });
             console.log('Image generation result:', result);
             this._createImage(result, { text: RTFCast(image_prompt) });
-            if (url) {
-                const id = uuidv4();
-
-                return [
-                    {
-                        type: 'image_url',
-                        image_url: { url },
-                    },
-                ];
-            } else {
-                return [
-                    {
-                        type: 'text',
-                        text: `An error occurred while generating image.`,
-                    },
-                ];
-            }
+            return url
+                ? [
+                      {
+                          type: 'image_url',
+                          image_url: { url },
+                      },
+                  ]
+                : [
+                      {
+                          type: 'text',
+                          text: `An error occurred while generating image.`,
+                      },
+                  ];
         } catch (error) {
             console.log(error);
             return [