@aj-archipelago/cortex 1.1.34 → 1.1.35

package/lib/pathwayManager.js

@@ -80,7 +80,7 @@ class AzureBlobStorage extends StorageStrategy {
       }
 
       const downloadBlockBlobResponse = await blockBlobClient.download();
-      const data = await this.streamToString(downloadBlockBlobResponse.readableStreamBody);
+      const data = await streamToString(downloadBlockBlobResponse.readableStreamBody);
       const parsedData = JSON.parse(data);
       logger.info(`Loaded pathways from Azure Blob Storage. ${Object.keys(parsedData).map(user => `${user}(${Object.keys(parsedData[user])})`).join(', ')}`);
       return parsedData;
@@ -124,18 +124,33 @@ class AzureBlobStorage extends StorageStrategy {
 class S3Storage extends StorageStrategy {
   constructor(config) {
     super();
-    this.s3 = new S3(config);
-    this.bucketName = config.bucketName;
+    this.s3 = new S3({
+      credentials: {
+        accessKeyId: config.awsAccessKeyId,
+        secretAccessKey: config.awsSecretAccessKey
+      },
+      region: config.awsRegion
+    });
+    this.bucketName = config.awsBucketName;
   }
 
   async load() {
     try {
+      // Check if bucket exists, create if it doesn't
+      await this.ensureBucketExists();
+
+      // Check if file exists, create if it doesn't
+      await this.ensureFileExists();
+
       const params = {
         Bucket: this.bucketName,
         Key: 'pathways.json'
       };
       const data = await this.s3.getObject(params);
-      return JSON.parse(data.Body.toString());
+
+      const readableStream = data.Body;
+      const dataString = await streamToString(readableStream);
+      return JSON.parse(dataString);
     } catch (error) {
       logger.error('Error loading pathways from S3:', error);
       throw error;
@@ -164,6 +179,41 @@ class S3Storage extends StorageStrategy {
     const data = await this.s3.headObject(params);
     return new Date(data.LastModified).getTime();
   }
+
+  async ensureBucketExists() {
+    try {
+      await this.s3.headBucket({ Bucket: this.bucketName });
+    } catch (error) {
+      if (error.name === 'NotFound') {
+        logger.info(`Bucket ${this.bucketName} does not exist, creating it`);
+        await this.s3.createBucket({ Bucket: this.bucketName });
+      } else {
+        throw error;
+      }
+    }
+  }
+
+  async ensureFileExists() {
+    try {
+      await this.s3.headObject({
+        Bucket: this.bucketName,
+        Key: 'pathways.json'
+      });
+    } catch (error) {
+      if (error.name === 'NotFound') {
+        logger.info('pathways.json does not exist, creating it with empty object');
+        const emptyContent = JSON.stringify({});
+        await this.s3.putObject({
+          Bucket: this.bucketName,
+          Key: 'pathways.json',
+          Body: emptyContent,
+          ContentType: 'application/json'
+        });
+      } else {
+        throw error;
+      }
+    }
+  }
 }
 
 class PathwayManager {
@@ -354,20 +404,19 @@ class PathwayManager {
 
     return pathways[userId][pathwayName];
   }
+}
 
-  // Helper function to convert a readable stream to a string
-  async streamToString(readableStream) {
-    return new Promise((resolve, reject) => {
-      const chunks = [];
-      readableStream.on('data', (data) => {
-        chunks.push(data.toString());
-      });
-      readableStream.on('end', () => {
-        resolve(chunks.join(''));
-      });
-      readableStream.on('error', reject);
+// Helper function to convert a readable stream to a string
+async function streamToString(readableStream) {
+  return new Promise((resolve, reject) => {
+    const chunks = [];
+    readableStream.on('data', (data) => {
+      chunks.push(data.toString());
     });
-  }
+    readableStream.on('end', () => {
+      resolve(chunks.join(''));
+    });
+    readableStream.on('error', reject);
+  });
 }
-
-export default PathwayManager;
+export default PathwayManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.1.34",
+  "version": "1.1.35",
   "description": "Cortex is a GraphQL API for AI. It provides a simple, extensible interface for using AI services from OpenAI, Azure and others.",
   "private": false,
   "repository": {

package/server/plugins/openAiVisionPlugin.js

@@ -27,17 +27,18 @@ class OpenAIVisionPlugin extends OpenAIChatPlugin {
                 }
                 if (Array.isArray(message.content)) {
                     message.content = message.content.map(item => {
-                        if (typeof item === 'string') {
-                            const parsedItem = safeJsonParse(item);
-                            return parsedItem.type ? parsedItem : { type: 'text', text: item };
-                        } else if (typeof item === 'object') {
-                            const { type, image_url, url } = item;
-                            if (type === 'image_url') {
-                                image_url.url = url || image_url.url;
-                                return { type, image_url };
-                            }
+                        const parsedItem = safeJsonParse(item);
+
+                        if (typeof parsedItem === 'string') {
+                            return { type: 'text', text: parsedItem };
+                        }
+
+                        if (typeof parsedItem === 'object' && parsedItem !== null && parsedItem.type === 'image_url') {
+                            parsedItem.image_url.url = parsedItem.url || parsedItem.image_url.url;
+                            return parsedItem;
                         }
-                        return item;
+                        
+                        return parsedItem;
                     });
                 }
             } catch (e) {