Merge pull request #188 from nasa-petal/Issue185_OY

Issue185 oy

.gitignore

@@ -9,4 +9,6 @@
 !.vscode/settings.json
 !.vscode/extensions.json
 !.vscode/tasks.json
-.conda
+.conda
+.env
+.pdf

package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "deep-chat-dev": "^9.0.179",
     "jspdf": "^2.5.1",
+    "pino": "^9.5.0",
     "sirv-cli": "^2.0.0",
     "svelte-agnostic-draggable": "^0.2.0",
     "svelte-touch-to-mouse": "^1.0.0"

src/components/AssistantDeepChat.svelte

@@ -2,6 +2,8 @@
   import { DeepChat } from 'deep-chat-dev';
   import { setOpenAIKey, cancelThreadRun } from '../utils/openaiUtils';
   import * as threadUtils from '../utils/threadUtils';
+  import logger from '../utils/logger.js'; 
+
 
   export let key = null;
   export let thread = null;
@@ -18,6 +20,7 @@
   const threadId = thread?.id;
   const asstId = thread?.asst?.id;
   const asstConfig = asst?.config;
+  
 
   // vars for callbacks
   let lastMessageId;
@@ -63,7 +66,7 @@
     if (!deepChatRef || message.isInitial) {
       return
     }
-
+    
     if (thread.length === 0 || thread.length === asst.history + 1) {
       const maxCharLen = 50;
       const words = message.message.text.split(/\s+/);
@@ -195,15 +198,51 @@
   }
 
   async function requestInterceptor(request) {
-    if (newFileUploads.length > 0) {
-      newFileIds = request.body.attachments.map(attachment => attachment.file_id);
+    const body = request.body;
+
+    // logger.debug("Original Request Body:", JSON.stringify(body, null, 2));
+    // console.log("Original Request Body:", JSON.stringify(body, null, 2));
+    // Ensure placeholder text is added for file-only requests, or requests with empty message text.
+    if (
+      'attachments' in body && 
+      Array.isArray(body.attachments) && 
+      body.attachments.length > 0 && 
+      (
+        !('content' in body) || 
+        !Array.isArray(body.content) || 
+        body.content.length === 0 || 
+        !('text' in body.content[0]) || 
+        !(typeof body.content[0].text === 'string') || 
+        body.content[0].text.trim().length === 0
+      )
+    ) {
+      // logger.info("Adding placeholder text for file-only request.");
+      body.content = [
+        {
+          type: "text", 
+          text: 
+            "I just uploaded a file. Let me know if you got it and what tools you can use to analyze it. Wait for me to tell you what to do next with it though."
+        },
+      ];
+    } else {
+        // logger.warn("Request body does not contain a valid content structure.");
+    }
 
-      handleFileUploads(newFileIds, newFileUploads);
+    // Transform attachments to include file_id
+    if (newFileUploads.length > 0) {
+      if('attachments' in body && Array.isArray(body.attachments) && body.attachments.length > 0) {
+        newFileIds = request.body.attachments.map(attachment => attachment.file_id);
+        handleFileUploads(newFileIds, newFileUploads);
+      }
     }
 
+    // Debug modified request
+    // logger.debug("Final Request Body Sent to API:", JSON.stringify(body, null, 2));
+
     return request;
   }
 
+
   function setDeepChatKeyboardSupport() {
     const shadowRoot = deepChatRef.shadowRoot;
     const input = shadowRoot.getElementById("input");

src/utils/logger.js

@@ -0,0 +1,37 @@
+import pino from 'pino';
+// import fs from 'fs';
+// import path from 'path';
+
+
+// // Ensure the logs directory exists
+// const logsDir = path.resolve('./logs');
+// if (!fs.existsSync(logsDir)) {
+//     fs.mkdirSync(logsDir);
+// }
+
+
+
+// // Create a write stream for the log file
+// const logFileStream = fs.createWriteStream(path.join(logsDir, 'application.log'), { flags: 'a' });
+
+// const logger = pino(
+//     {
+//         level: 'debug', // Set the desired log level
+//         transport: {
+//             target: 'pino-pretty', // Human-readable logs in terminal
+//             options: { colorize: true }, // Colorize logs for console
+//         },
+//     },
+//     logFileStream // Write logs to the file
+// );
+
+// export default logger;
+
+const logger = {
+  debug: (msg, obj) => console.debug(`[DEBUG] ${msg}`, obj),
+  info: (msg, obj) => console.info(`[INFO] ${msg}`, obj),
+  warn: (msg, obj) => console.warn(`[WARN] ${msg}`, obj),
+  error: (msg, obj) => console.error(`[ERROR] ${msg}`, obj),
+};
+
+export default logger;

src/utils/openaiUtils.js

@@ -521,7 +521,13 @@ export async function getChatCompletion(model, messages, tokenLimit) {
 
   return r;
 }
-
+/**
+ * 
+ * @param {*} b64Data 
+ * @param {*} fileName 
+ * @param {*} type 
+ * @returns 
+ */
 export async function uploadFile(b64Data, fileName, type) {
   if (!openaiKey) {
     throw new Error('openai key not set. cannot validate thread.');