@adminforth/bulk-ai-flow 1.5.3 → 1.5.5

package/build.log

@@ -11,5 +11,5 @@ custom/tsconfig.json
 custom/visionAction.vue
 custom/visionTable.vue
 
-sent 182,050 bytes  received 134 bytes  364,368.00 bytes/sec
-total size is 181,515  speedup is 1.00
+sent 182,651 bytes  received 134 bytes  365,570.00 bytes/sec
+total size is 182,116  speedup is 1.00

package/custom/visionAction.vue

@@ -106,6 +106,7 @@ const openGenerationCarousel = ref([]);
 const isLoading = ref(false);
 const isError = ref(false);
 const isCriticalError = ref(false);
+const isImageGenerationError = ref(false);
 const errorMessage = ref('');
 const checkedCount = ref(0);
 
@@ -289,26 +290,27 @@ async function prepareDataForSave() {
     .filter(item => item.isChecked === true)
     .map(item => item[primaryKey]);
 
-  const promises = [];
-  for (const item of checkedItems) {
-    for (const [key, value] of Object.entries(item)) {
-      if(props.meta.outputImageFields?.includes(key)) {
-        const p = convertImages(key, value).then(result => {
-          item[key] = result;
-        });
-      
-        promises.push(p);
+  if (isImageGenerationError.value !== true) {
+    const promises = [];
+    for (const item of checkedItems) {
+      for (const [key, value] of Object.entries(item)) {
+        if(props.meta.outputImageFields?.includes(key)) {
+          const p = convertImages(key, value).then(result => {
+            item[key] = result;
+          });
+        
+          promises.push(p);
+        }
       }
     }
+    await Promise.all(promises);
   }
-  await Promise.all(promises);
-
   return [checkedItemsIDs, checkedItems];
 }
 
 async function convertImages(fieldName, img) {
   let imgBlob;
-  if (img.startsWith('data:')) {
+  if (typeof img === 'string' && img.startsWith('data:')) {
     const base64 = img.split(',')[1];
     const mimeType = img.split(';')[0].split(':')[1];
     const byteCharacters = atob(base64);
@@ -318,7 +320,7 @@ async function convertImages(fieldName, img) {
     }
     const byteArray = new Uint8Array(byteNumbers);
     imgBlob = new Blob([byteArray], { type: mimeType });
-  } else {
+  } else if (typeof img === 'string') {
     imgBlob = await fetch(
       `/adminapi/v1/plugin/${props.meta.outputImagesPluginInstanceIds[fieldName]}/cors-proxy?url=${encodeURIComponent(img)}`
     ).then(res => { return res.blob() });
@@ -328,9 +330,8 @@ async function convertImages(fieldName, img) {
 
 
 async function analyzeFields() {
+  isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
   try {
-    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
-
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/analyze`,
       method: 'POST',
@@ -339,8 +340,6 @@ async function analyzeFields() {
       },
     });
 
-    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
-
     if (res?.error) {
       adminforth.alert({
         message: res.error,
@@ -350,7 +349,7 @@ async function analyzeFields() {
 
       console.error('Failed to analyze image(s):', res.error);
       isError.value = true;
-      isCriticalError.value = true;
+      //isCriticalError.value = true;
       errorMessage.value = `Failed to fetch analyze image(s). Please, try to re-run the action.`;
     } else {
       res.result.forEach((item, idx) => {
@@ -375,16 +374,16 @@ async function analyzeFields() {
 
     console.error('Failed to analyze image(s):', error);
     isError.value = true;
-    isCriticalError.value = true;
+    //isCriticalError.value = true;
     errorMessage.value = res.error;
   }
+  isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
 }
 
 
 async function analyzeFieldsNoImages() {
+  isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
   try {
-    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
-
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/analyze_no_images`,
       method: 'POST',
@@ -392,9 +391,6 @@ async function analyzeFieldsNoImages() {
         selectedIds: props.checkboxes,
       },
     });
-    if(!props.meta.isFieldsForAnalizeFromImages) {
-      isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
-    }
     if(res?.error) {
       adminforth.alert({
         message: res.error,
@@ -403,7 +399,7 @@ async function analyzeFieldsNoImages() {
       });
       console.error('Failed to analyze fields:', res.error);
       isError.value = true;
-      isCriticalError.value = true;
+      //isCriticalError.value = true;
       errorMessage.value = res.error;
     } else {
       res.result.forEach((item, idx) => {
@@ -427,9 +423,12 @@ async function analyzeFieldsNoImages() {
       });
       console.error('Failed to analyze fields:', error);
       isError.value = true;
-      isCriticalError.value = true;
+      //isCriticalError.value = true;
       errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
   }
+  if(!props.meta.isFieldsForAnalizeFromImages) {
+    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
+  }
 }
 
 
@@ -443,19 +442,23 @@ async function saveData() {
   try {
     isLoading.value = true;
     const [checkedItemsIDs, reqData] = await prepareDataForSave();
-
-    const imagesToUpload = [];
-    for (const item of reqData) {
-      for (const [key, value] of Object.entries(item)) {
-        if(props.meta.outputImageFields?.includes(key)) {
-          const p = uploadImage(value, item[primaryKey], key).then(result => {
-            item[key] = result;
-          });
-          imagesToUpload.push(p);
+    if (isImageGenerationError.value === false) {
+      const imagesToUpload = [];
+      for (const item of reqData) {
+        for (const [key, value] of Object.entries(item)) {
+          if(props.meta.outputImageFields?.includes(key)) {
+            if (!value) {
+              continue;
+            }
+            const p = uploadImage(value, item[primaryKey], key).then(result => {
+              item[key] = result;
+            });
+            imagesToUpload.push(p);
+          }
         }
       }
+      await Promise.all(imagesToUpload);
     }
-    await Promise.all(imagesToUpload);
 
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/update_fields`,
@@ -463,6 +466,7 @@ async function saveData() {
       body: {
         selectedIds: checkedItemsIDs,
         fields: reqData,
+        saveImages: !isImageGenerationError.value
       },
     });
 
@@ -508,7 +512,7 @@ async function generateImages() {
   } catch (e) {
     console.error('Error generating images:', e);
     isError.value = true;
-    isCriticalError.value = true;
+    isImageGenerationError.value = true;
     errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
   isAiResponseReceivedImage.value = props.checkboxes.map(() => true);
@@ -519,7 +523,7 @@ async function generateImages() {
   if (!res) {
     error = 'Error generating images, something went wrong';
     isError.value = true;
-    isCriticalError.value = true;
+    isImageGenerationError.value = true;
     errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
 
@@ -528,9 +532,9 @@ async function generateImages() {
       message: error,
       variant: 'danger',
       timeout: 'unlimited',
-    });;
+    });
     isError.value = true;
-    isCriticalError.value = true;
+    isImageGenerationError.value = true;
     errorMessage.value = error;
   } else {
     res.result.forEach((item, idx) => {

package/custom/visionTable.vue

@@ -78,7 +78,7 @@
           </div>
         </div>
 
-        <div v-else-if="isAiResponseReceivedImage[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])]">
+        <div v-if="isAiResponseReceivedImage[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])]">
           <div v-if="isInColumnImage(n)">
             <div class="mt-2 flex items-center justify-center gap-2">
               <img 
@@ -102,11 +102,11 @@
           </div>
         </div>
 
-        <div v-else-if="isInColumnImage(n)">
+        <div v-if="!isAiResponseReceivedImage[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])] && isInColumnImage(n)">
             <Skeleton type="image" class="w-20 h-20" />
         </div>
 
-        <div v-else>
+        <div v-if="!isAiResponseReceivedAnalize[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])] && !isInColumnImage(n)">
           <Skeleton class="w-full h-6" />
         </div>
       </template>

package/dist/custom/visionAction.vue

@@ -106,6 +106,7 @@ const openGenerationCarousel = ref([]);
 const isLoading = ref(false);
 const isError = ref(false);
 const isCriticalError = ref(false);
+const isImageGenerationError = ref(false);
 const errorMessage = ref('');
 const checkedCount = ref(0);
 
@@ -289,26 +290,27 @@ async function prepareDataForSave() {
     .filter(item => item.isChecked === true)
     .map(item => item[primaryKey]);
 
-  const promises = [];
-  for (const item of checkedItems) {
-    for (const [key, value] of Object.entries(item)) {
-      if(props.meta.outputImageFields?.includes(key)) {
-        const p = convertImages(key, value).then(result => {
-          item[key] = result;
-        });
-      
-        promises.push(p);
+  if (isImageGenerationError.value !== true) {
+    const promises = [];
+    for (const item of checkedItems) {
+      for (const [key, value] of Object.entries(item)) {
+        if(props.meta.outputImageFields?.includes(key)) {
+          const p = convertImages(key, value).then(result => {
+            item[key] = result;
+          });
+        
+          promises.push(p);
+        }
       }
     }
+    await Promise.all(promises);
   }
-  await Promise.all(promises);
-
   return [checkedItemsIDs, checkedItems];
 }
 
 async function convertImages(fieldName, img) {
   let imgBlob;
-  if (img.startsWith('data:')) {
+  if (typeof img === 'string' && img.startsWith('data:')) {
     const base64 = img.split(',')[1];
     const mimeType = img.split(';')[0].split(':')[1];
     const byteCharacters = atob(base64);
@@ -318,7 +320,7 @@ async function convertImages(fieldName, img) {
     }
     const byteArray = new Uint8Array(byteNumbers);
     imgBlob = new Blob([byteArray], { type: mimeType });
-  } else {
+  } else if (typeof img === 'string') {
     imgBlob = await fetch(
       `/adminapi/v1/plugin/${props.meta.outputImagesPluginInstanceIds[fieldName]}/cors-proxy?url=${encodeURIComponent(img)}`
     ).then(res => { return res.blob() });
@@ -328,9 +330,8 @@ async function convertImages(fieldName, img) {
 
 
 async function analyzeFields() {
+  isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
   try {
-    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
-
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/analyze`,
       method: 'POST',
@@ -339,8 +340,6 @@ async function analyzeFields() {
       },
     });
 
-    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
-
     if (res?.error) {
       adminforth.alert({
         message: res.error,
@@ -350,7 +349,7 @@ async function analyzeFields() {
 
       console.error('Failed to analyze image(s):', res.error);
       isError.value = true;
-      isCriticalError.value = true;
+      //isCriticalError.value = true;
       errorMessage.value = `Failed to fetch analyze image(s). Please, try to re-run the action.`;
     } else {
       res.result.forEach((item, idx) => {
@@ -375,16 +374,16 @@ async function analyzeFields() {
 
     console.error('Failed to analyze image(s):', error);
     isError.value = true;
-    isCriticalError.value = true;
+    //isCriticalError.value = true;
     errorMessage.value = res.error;
   }
+  isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
 }
 
 
 async function analyzeFieldsNoImages() {
+  isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
   try {
-    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => false);
-
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/analyze_no_images`,
       method: 'POST',
@@ -392,9 +391,6 @@ async function analyzeFieldsNoImages() {
         selectedIds: props.checkboxes,
       },
     });
-    if(!props.meta.isFieldsForAnalizeFromImages) {
-      isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
-    }
     if(res?.error) {
       adminforth.alert({
         message: res.error,
@@ -403,7 +399,7 @@ async function analyzeFieldsNoImages() {
       });
       console.error('Failed to analyze fields:', res.error);
       isError.value = true;
-      isCriticalError.value = true;
+      //isCriticalError.value = true;
       errorMessage.value = res.error;
     } else {
       res.result.forEach((item, idx) => {
@@ -427,9 +423,12 @@ async function analyzeFieldsNoImages() {
       });
       console.error('Failed to analyze fields:', error);
       isError.value = true;
-      isCriticalError.value = true;
+      //isCriticalError.value = true;
       errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
   }
+  if(!props.meta.isFieldsForAnalizeFromImages) {
+    isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
+  }
 }
 
 
@@ -443,19 +442,23 @@ async function saveData() {
   try {
     isLoading.value = true;
     const [checkedItemsIDs, reqData] = await prepareDataForSave();
-
-    const imagesToUpload = [];
-    for (const item of reqData) {
-      for (const [key, value] of Object.entries(item)) {
-        if(props.meta.outputImageFields?.includes(key)) {
-          const p = uploadImage(value, item[primaryKey], key).then(result => {
-            item[key] = result;
-          });
-          imagesToUpload.push(p);
+    if (isImageGenerationError.value === false) {
+      const imagesToUpload = [];
+      for (const item of reqData) {
+        for (const [key, value] of Object.entries(item)) {
+          if(props.meta.outputImageFields?.includes(key)) {
+            if (!value) {
+              continue;
+            }
+            const p = uploadImage(value, item[primaryKey], key).then(result => {
+              item[key] = result;
+            });
+            imagesToUpload.push(p);
+          }
         }
       }
+      await Promise.all(imagesToUpload);
     }
-    await Promise.all(imagesToUpload);
 
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/update_fields`,
@@ -463,6 +466,7 @@ async function saveData() {
       body: {
         selectedIds: checkedItemsIDs,
         fields: reqData,
+        saveImages: !isImageGenerationError.value
       },
     });
 
@@ -508,7 +512,7 @@ async function generateImages() {
   } catch (e) {
     console.error('Error generating images:', e);
     isError.value = true;
-    isCriticalError.value = true;
+    isImageGenerationError.value = true;
     errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
   isAiResponseReceivedImage.value = props.checkboxes.map(() => true);
@@ -519,7 +523,7 @@ async function generateImages() {
   if (!res) {
     error = 'Error generating images, something went wrong';
     isError.value = true;
-    isCriticalError.value = true;
+    isImageGenerationError.value = true;
     errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
 
@@ -528,9 +532,9 @@ async function generateImages() {
       message: error,
       variant: 'danger',
       timeout: 'unlimited',
-    });;
+    });
     isError.value = true;
-    isCriticalError.value = true;
+    isImageGenerationError.value = true;
     errorMessage.value = error;
   } else {
     res.result.forEach((item, idx) => {

package/dist/custom/visionTable.vue

@@ -78,7 +78,7 @@
           </div>
         </div>
 
-        <div v-else-if="isAiResponseReceivedImage[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])]">
+        <div v-if="isAiResponseReceivedImage[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])]">
           <div v-if="isInColumnImage(n)">
             <div class="mt-2 flex items-center justify-center gap-2">
               <img 
@@ -102,11 +102,11 @@
           </div>
         </div>
 
-        <div v-else-if="isInColumnImage(n)">
+        <div v-if="!isAiResponseReceivedImage[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])] && isInColumnImage(n)">
             <Skeleton type="image" class="w-20 h-20" />
         </div>
 
-        <div v-else>
+        <div v-if="!isAiResponseReceivedAnalize[tableColumnsIndexes.findIndex(el => el[primaryKey] === item[primaryKey])] && !isInColumnImage(n)">
           <Skeleton class="w-full h-6" />
         </div>
       </template>

package/dist/index.js

@@ -211,26 +211,29 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                     const record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(primaryKeyColumn.name, ID)]);
                     //recieve image URLs to analyze
                     const attachmentFiles = yield this.options.attachFiles({ record: record });
-                    //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'}. 
-          Do NOT return array of objects. Do NOT include any Markdown, code blocks, explanations, or extra text. Only return valid JSON. 
-          Each object must contain the following fields: ${JSON.stringify(compiledOutputFields)} Use the exact field names. If it's number field - return only number.
-          Image URLs:`;
-                    //send prompt to OpenAI and get response
-                    const chatResponse = yield this.options.visionAdapter.generate({ prompt, inputFileUrls: attachmentFiles });
-                    const resp = chatResponse.response;
-                    const topLevelError = chatResponse.error;
-                    if (topLevelError || (resp === null || resp === void 0 ? void 0 : resp.error)) {
-                        throw new Error(`ERROR: ${JSON.stringify(topLevelError || (resp === null || resp === void 0 ? void 0 : resp.error))}`);
-                    }
-                    const textOutput = (_f = (_e = (_d = (_c = (_b = (_a = resp === null || resp === void 0 ? void 0 : resp.output) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.text) !== null && _e !== void 0 ? _e : resp === null || resp === void 0 ? void 0 : resp.output_text) !== null && _f !== void 0 ? _f : (_j = (_h = (_g = resp === null || resp === void 0 ? void 0 : resp.choices) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.message) === null || _j === void 0 ? void 0 : _j.content;
-                    if (!textOutput || typeof textOutput !== 'string') {
-                        throw new Error('Unexpected AI response format');
+                    if (attachmentFiles.length !== 0) {
+                        //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'}. 
+            Do NOT return array of objects. Do NOT include any Markdown, code blocks, explanations, or extra text. Only return valid JSON. 
+            Each object must contain the following fields: ${JSON.stringify(compiledOutputFields)} Use the exact field names. If it's number field - return only number.
+            Image URLs:`;
+                        //send prompt to OpenAI and get response
+                        const chatResponse = yield this.options.visionAdapter.generate({ prompt, inputFileUrls: attachmentFiles });
+                        const resp = chatResponse.response;
+                        const topLevelError = chatResponse.error;
+                        if (topLevelError || (resp === null || resp === void 0 ? void 0 : resp.error)) {
+                            throw new Error(`ERROR: ${JSON.stringify(topLevelError || (resp === null || resp === void 0 ? void 0 : resp.error))}`);
+                        }
+                        const textOutput = (_f = (_e = (_d = (_c = (_b = (_a = resp === null || resp === void 0 ? void 0 : resp.output) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.text) !== null && _e !== void 0 ? _e : resp === null || resp === void 0 ? void 0 : resp.output_text) !== null && _f !== void 0 ? _f : (_j = (_h = (_g = resp === null || resp === void 0 ? void 0 : resp.choices) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.message) === null || _j === void 0 ? void 0 : _j.content;
+                        if (!textOutput || typeof textOutput !== 'string') {
+                            throw new Error('Unexpected AI response format');
+                        }
+                        //parse response and update record
+                        const resData = JSON.parse(textOutput);
+                        return resData;
                     }
-                    //parse response and update record
-                    const resData = JSON.parse(textOutput);
-                    return resData;
+                    ;
                 }));
                 const result = yield Promise.all(tasks);
                 return { result };
@@ -315,6 +318,7 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                 if (isAllowedToSave.ok !== false) {
                     const selectedIds = body.selectedIds || [];
                     const fieldsToUpdate = body.fields || {};
+                    const saveImages = body.saveImages;
                     const outputImageFields = [];
                     if (this.options.generateImages) {
                         for (const [key, value] of Object.entries(this.options.generateImages)) {
@@ -327,7 +331,7 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                         for (const [key, value] of Object.entries(outputImageFields)) {
                             const columnPlugin = this.adminforth.activatedPlugins.find(p => p.resourceConfig.resourceId === this.resourceConfig.resourceId &&
                                 p.pluginOptions.pathColumnName === value);
-                            if (columnPlugin) {
+                            if (columnPlugin && saveImages) {
                                 if (columnPlugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
                                     if (oldRecord[value]) {
                                         // put tag to delete old file
@@ -339,7 +343,7 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                                             console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
                                         }
                                     }
-                                    if (fieldsToUpdate[idx][key] !== null) {
+                                    if (fieldsToUpdate[idx][key] && fieldsToUpdate[idx][key] !== 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]);
@@ -429,28 +433,33 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                     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];
                         let images;
-                        if (STUB_MODE) {
-                            yield new Promise((resolve) => setTimeout(resolve, 2000));
-                            images = `https://picsum.photos/200/300?random=${Math.floor(Math.random() * 1000)}`;
+                        if (this.options.attachFiles && attachmentFiles.length === 0) {
+                            return { key, images: [] };
                         }
                         else {
-                            let generationAdapter;
-                            if (this.options.generateImages[key].adapter) {
-                                generationAdapter = this.options.generateImages[key].adapter;
+                            if (STUB_MODE) {
+                                yield new Promise((resolve) => setTimeout(resolve, 2000));
+                                images = `https://picsum.photos/200/300?random=${Math.floor(Math.random() * 1000)}`;
                             }
                             else {
-                                generationAdapter = this.options.imageGenerationAdapter;
-                                ``;
+                                let generationAdapter;
+                                if (this.options.generateImages[key].adapter) {
+                                    generationAdapter = this.options.generateImages[key].adapter;
+                                }
+                                else {
+                                    generationAdapter = this.options.imageGenerationAdapter;
+                                    ``;
+                                }
+                                const resp = yield generationAdapter.generate({
+                                    prompt,
+                                    inputFiles: attachmentFiles,
+                                    n: 1,
+                                    size: this.options.generateImages[key].outputSize,
+                                });
+                                images = resp.imageURLs[0];
                             }
-                            const resp = yield generationAdapter.generate({
-                                prompt,
-                                inputFiles: attachmentFiles,
-                                n: 1,
-                                size: this.options.generateImages[key].outputSize,
-                            });
-                            images = resp.imageURLs[0];
+                            return { key, images };
                         }
-                        return { key, images };
                     }));
                     const fieldResults = yield Promise.all(fieldTasks);
                     const recordResult = {};

package/index.ts

@@ -237,31 +237,33 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
 
         //recieve image URLs to analyze
         const attachmentFiles = await this.options.attachFiles({ record: record });
-        //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'}. 
-          Do NOT return array of objects. Do NOT include any Markdown, code blocks, explanations, or extra text. Only return valid JSON. 
-          Each object must contain the following fields: ${JSON.stringify(compiledOutputFields)} Use the exact field names. If it's number field - return only number.
-          Image URLs:`;
-          
-        //send prompt to OpenAI and get response
-        const chatResponse = await this.options.visionAdapter.generate({ prompt, inputFileUrls: attachmentFiles });
-
-        const resp: any = (chatResponse as any).response;
-        const topLevelError = (chatResponse as any).error;
-        if (topLevelError || resp?.error) {
-          throw new Error(`ERROR: ${JSON.stringify(topLevelError || resp?.error)}`);
-        }
+        if (attachmentFiles.length !== 0) {
+          //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'}. 
+            Do NOT return array of objects. Do NOT include any Markdown, code blocks, explanations, or extra text. Only return valid JSON. 
+            Each object must contain the following fields: ${JSON.stringify(compiledOutputFields)} Use the exact field names. If it's number field - return only number.
+            Image URLs:`;
+            
+          //send prompt to OpenAI and get response
+          const chatResponse = await this.options.visionAdapter.generate({ prompt, inputFileUrls: attachmentFiles });
+
+          const resp: any = (chatResponse as any).response;
+          const topLevelError = (chatResponse as any).error;
+          if (topLevelError || resp?.error) {
+            throw new Error(`ERROR: ${JSON.stringify(topLevelError || resp?.error)}`);
+          }
 
-        const textOutput = resp?.output?.[0]?.content?.[0]?.text ?? resp?.output_text ?? resp?.choices?.[0]?.message?.content;
-        if (!textOutput || typeof textOutput !== 'string') {
-          throw new Error('Unexpected AI response format');
-        }
+          const textOutput = resp?.output?.[0]?.content?.[0]?.text ?? resp?.output_text ?? resp?.choices?.[0]?.message?.content;
+          if (!textOutput || typeof textOutput !== 'string') {
+            throw new Error('Unexpected AI response format');
+          }
 
-        //parse response and update record
-        const resData = JSON.parse(textOutput);
+          //parse response and update record
+          const resData = JSON.parse(textOutput);
 
-        return resData;
+          return resData;
+        };
       });
 
       const result = await Promise.all(tasks);
@@ -360,6 +362,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
         if (isAllowedToSave.ok !== false) {
           const selectedIds = body.selectedIds || [];
           const fieldsToUpdate = body.fields || {};
+          const saveImages = body.saveImages;
           const outputImageFields = [];
           if (this.options.generateImages) {
             for (const [key, value] of Object.entries(this.options.generateImages)) {
@@ -374,7 +377,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
                 p.resourceConfig!.resourceId === this.resourceConfig.resourceId &&
                 p.pluginOptions.pathColumnName === value
               );
-              if (columnPlugin) {
+              if (columnPlugin && saveImages) {
                 if(columnPlugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
                   if (oldRecord[value]) {
                     // put tag to delete old file
@@ -385,7 +388,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
                       console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
                     }
                   }
-                  if (fieldsToUpdate[idx][key] !== null) {
+                  if (fieldsToUpdate[idx][key] && fieldsToUpdate[idx][key] !== 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]);
@@ -478,27 +481,31 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
           const fieldTasks = Object.keys(this.options?.generateImages || {}).map(async (key) => {
             const prompt = this.compileGenerationFieldTemplates(record)[key];
             let images;
-              if (STUB_MODE) {
-                await new Promise((resolve) => setTimeout(resolve, 2000));
-                images = `https://picsum.photos/200/300?random=${Math.floor(Math.random() * 1000)}`;
+              if (this.options.attachFiles && attachmentFiles.length === 0) {
+                return { key, images: [] };
               } else {
-                let generationAdapter;
-                if (this.options.generateImages[key].adapter) {
-                  generationAdapter = this.options.generateImages[key].adapter;
+                if (STUB_MODE) {
+                  await new Promise((resolve) => setTimeout(resolve, 2000));
+                  images = `https://picsum.photos/200/300?random=${Math.floor(Math.random() * 1000)}`;
                 } else {
-                  generationAdapter = this.options.imageGenerationAdapter;``
-                }
-                const resp = await generationAdapter.generate(
-                  {
-                    prompt,
-                    inputFiles: attachmentFiles,
-                    n: 1,
-                    size: this.options.generateImages[key].outputSize,
+                  let generationAdapter;
+                  if (this.options.generateImages[key].adapter) {
+                    generationAdapter = this.options.generateImages[key].adapter;
+                  } else {
+                    generationAdapter = this.options.imageGenerationAdapter;``
                   }
-                )
-                images = resp.imageURLs[0];
-              }
-            return { key, images };
+                  const resp = await generationAdapter.generate(
+                    {
+                      prompt,
+                      inputFiles: attachmentFiles,
+                      n: 1,
+                      size: this.options.generateImages[key].outputSize,
+                    }
+                  )
+                  images = resp.imageURLs[0];
+                }
+              return { key, images };
+            }
           });
 
           const fieldResults = await Promise.all(fieldTasks);

package/package.json

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