@adminforth/bulk-ai-flow 1.14.0 → 1.14.2

package/build.log

@@ -13,5 +13,5 @@ custom/package-lock.json
 custom/package.json
 custom/tsconfig.json
 
-sent 74,113 bytes  received 172 bytes  148,570.00 bytes/sec
+sent 74,104 bytes  received 172 bytes  148,552.00 bytes/sec
 total size is 73,472  speedup is 0.99

package/custom/ImageGenerationCarousel.vue

@@ -1,7 +1,7 @@
 
 <template>
   <!-- Main modal -->
-  <div tabindex="-1" class="[scrollbar-gutter:stable] fixed inset-0 z-10 flex justify-center items-center bg-gray-800/50 dark:bg-gray-900/50 overflow-y-auto">
+  <div tabindex="-1" class="[scrollbar-gutter:stable] fixed inset-0 z-20 flex justify-center items-center bg-gray-800/50 dark:bg-gray-900/50 overflow-y-auto">
     <div class="relative p-4 w-full max-w-[1600px]">
         <!-- Modal content -->
         <div class="relative bg-white rounded-lg shadow-xl dark:bg-gray-700">

package/dist/custom/ImageGenerationCarousel.vue

@@ -1,7 +1,7 @@
 
 <template>
   <!-- Main modal -->
-  <div tabindex="-1" class="[scrollbar-gutter:stable] fixed inset-0 z-10 flex justify-center items-center bg-gray-800/50 dark:bg-gray-900/50 overflow-y-auto">
+  <div tabindex="-1" class="[scrollbar-gutter:stable] fixed inset-0 z-20 flex justify-center items-center bg-gray-800/50 dark:bg-gray-900/50 overflow-y-auto">
     <div class="relative p-4 w-full max-w-[1600px]">
         <!-- Modal content -->
         <div class="relative bg-white rounded-lg shadow-xl dark:bg-gray-700">

package/dist/index.js

@@ -80,6 +80,15 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                 return {};
             }
             else if (attachmentFiles.length !== 0) {
+                try {
+                    for (const fileUrl of attachmentFiles) {
+                        new URL(fileUrl);
+                    }
+                }
+                catch (e) {
+                    jobs.set(jobId, { status: 'failed', error: 'One of the image URLs is not valid' });
+                    return { ok: false, error: 'One of the image URLs is not valid' };
+                }
                 //create prompt for OpenAI
                 const compiledOutputFields = this.compileOutputFieldsTemplates(record);
                 const prompt = `Analyze the following image(s) and return a single JSON in format like: {'param1': 'value1', 'param2': 'value2'}. 
@@ -107,7 +116,14 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                         jobs.set(jobId, { status: 'failed', error: 'Unexpected AI response format' });
                     }
                     //parse response and update record
-                    const resData = JSON.parse(textOutput);
+                    let resData;
+                    try {
+                        resData = JSON.parse(textOutput);
+                    }
+                    catch (e) {
+                        jobs.set(jobId, { status: 'failed', error: 'AI response is not valid JSON. Probably attached invalid image URL' });
+                        return { ok: false, error: 'AI response is not valid JSON. Probably attached invalid image URL' };
+                    }
                     const result = resData;
                     jobs.set(jobId, { status: 'completed', result });
                     return { ok: true };
@@ -174,6 +190,15 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             }
             else {
                 attachmentFiles = yield this.options.attachFiles({ record });
+                try {
+                    for (const fileUrl of attachmentFiles) {
+                        new URL(fileUrl);
+                    }
+                }
+                catch (e) {
+                    jobs.set(jobId, { status: 'failed', error: 'One of the image URLs is not valid' });
+                    return { ok: false, error: 'One of the image URLs is not valid' };
+                }
             }
             const fieldTasks = Object.keys(((_b = this.options) === null || _b === void 0 ? void 0 : _b.generateImages) || {}).map((key) => __awaiter(this, void 0, void 0, function* () {
                 const prompt = this.compileGenerationFieldTemplates(record)[key];
@@ -228,9 +253,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                 recordResult[key] = images;
             });
             const result = recordResult;
-            this.totalCalls++;
-            this.totalDuration += (+new Date() - start) / 1000;
             if (!isError) {
+                this.totalCalls++;
+                this.totalDuration += (+new Date() - start) / 1000;
                 jobs.set(jobId, { status: 'completed', result });
                 return { ok: true };
             }
@@ -291,9 +316,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                 }
                 return resp.imageURLs[0];
             })));
-            this.totalCalls++;
-            this.totalDuration += (+new Date() - start) / 1000;
             if (!isError) {
+                this.totalCalls++;
+                this.totalDuration += (+new Date() - start) / 1000;
                 jobs.set(jobId, { status: 'completed', result: { [fieldName]: images } });
                 return { ok: true };
             }
@@ -563,10 +588,10 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                                         }
                                         catch (e) {
                                             // file might be e.g. already deleted, so we catch error
-                                            console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
+                                            console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`);
                                         }
                                     }
-                                    if (fieldsToUpdate[idx][key] && fieldsToUpdate[idx][key] !== null) {
+                                    if (fieldsToUpdate[idx][value] && fieldsToUpdate[idx][value] !== null) {
                                         // remove tag from new file
                                         // in this case we let it crash if it fails: this is a new file which just was uploaded. 
                                         yield columnPlugin.pluginOptions.storageAdapter.markKeyForNotDeletation(fieldsToUpdate[idx][value]);

package/index.ts

@@ -89,6 +89,14 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       }
       return {};
     } else if (attachmentFiles.length !== 0) {
+      try {
+        for (const fileUrl of attachmentFiles) {
+          new URL(fileUrl);
+        }
+      } catch (e) {
+        jobs.set(jobId, { status: 'failed', error: 'One of the image URLs is not valid' });
+        return { ok: false, error: 'One of the image URLs is not valid' };
+      }
       //create prompt for OpenAI
       const compiledOutputFields = this.compileOutputFieldsTemplates(record);
       const prompt = `Analyze the following image(s) and return a single JSON in format like: {'param1': 'value1', 'param2': 'value2'}. 
@@ -118,7 +126,13 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
         }
 
         //parse response and update record
-        const resData = JSON.parse(textOutput);
+        let resData;
+        try {
+          resData = JSON.parse(textOutput);
+        } catch (e) {
+          jobs.set(jobId, { status: 'failed', error: 'AI response is not valid JSON. Probably attached invalid image URL' });
+          return { ok: false, error: 'AI response is not valid JSON. Probably attached invalid image URL' };
+        }
         const result = resData;
         jobs.set(jobId, { status: 'completed', result });
         return { ok: true };
@@ -180,6 +194,14 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       attachmentFiles = [];
     } else {
       attachmentFiles = await this.options.attachFiles({ record });
+      try {
+        for (const fileUrl of attachmentFiles) {
+          new URL(fileUrl);
+        }
+      } catch (e) {
+        jobs.set(jobId, { status: 'failed', error: 'One of the image URLs is not valid' });
+        return { ok: false, error: 'One of the image URLs is not valid' };
+      }
     }
     const fieldTasks = Object.keys(this.options?.generateImages || {}).map(async (key) => {
       const prompt = this.compileGenerationFieldTemplates(record)[key];
@@ -235,9 +257,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
 
     const result = recordResult;
     
-    this.totalCalls++;
-    this.totalDuration += (+new Date() - start) / 1000;
     if (!isError) {
+      this.totalCalls++;
+      this.totalDuration += (+new Date() - start) / 1000;
       jobs.set(jobId, { status: 'completed', result });
       return { ok: true }
     } else {
@@ -297,9 +319,10 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
         return resp.imageURLs[0]
       })
     );
-    this.totalCalls++;
-    this.totalDuration += (+new Date() - start) / 1000;
+
     if (!isError) {
+      this.totalCalls++;
+      this.totalDuration += (+new Date() - start) / 1000;
       jobs.set(jobId, { status: 'completed', result: { [fieldName]: images } });
       return { ok: true };
     } else {
@@ -591,10 +614,10 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
                       await columnPlugin.pluginOptions.storageAdapter.markKeyForDeletation(oldRecord[value]);
                     } catch (e) {
                       // file might be e.g. already deleted, so we catch error
-                      console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
+                      console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`);
                     }
                   }
-                  if (fieldsToUpdate[idx][key] && fieldsToUpdate[idx][key] !== null) {
+                  if (fieldsToUpdate[idx][value] && fieldsToUpdate[idx][value] !== null) {
                   // remove tag from new file
                   // in this case we let it crash if it fails: this is a new file which just was uploaded. 
                     await  columnPlugin.pluginOptions.storageAdapter.markKeyForNotDeletation(fieldsToUpdate[idx][value]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/bulk-ai-flow",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "publishConfig": {
     "access": "public"
   },