@adminforth/bulk-ai-flow 1.5.3 → 1.5.4

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,531 bytes  received 134 bytes  365,330.00 bytes/sec
+total size is 181,996  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,20 +290,21 @@ 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];
 }
 
@@ -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,20 @@ 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)) {
+            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 +463,7 @@ async function saveData() {
       body: {
         selectedIds: checkedItemsIDs,
         fields: reqData,
+        saveImages: !isImageGenerationError.value
       },
     });
 
@@ -508,7 +509,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 +520,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 +529,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,20 +290,21 @@ 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];
 }
 
@@ -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,20 @@ 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)) {
+            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 +463,7 @@ async function saveData() {
       body: {
         selectedIds: checkedItemsIDs,
         fields: reqData,
+        saveImages: !isImageGenerationError.value
       },
     });
 
@@ -508,7 +509,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 +520,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 +529,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

@@ -315,6 +315,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 +328,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

package/index.ts

@@ -360,6 +360,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 +375,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

package/package.json

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