@adminforth/bulk-ai-flow 1.20.0 → 1.21.1

package/build.log

@@ -13,5 +13,5 @@ custom/package-lock.json
 custom/package.json
 custom/tsconfig.json
 
-sent 95,557 bytes  received 172 bytes  191,458.00 bytes/sec
-total size is 94,921  speedup is 0.99
+sent 96,594 bytes  received 172 bytes  193,532.00 bytes/sec
+total size is 95,949  speedup is 0.99

package/custom/VisionAction.vue

@@ -140,19 +140,19 @@
         <div class="flex items-center justify-between mb-2 w-full">
           <div class="flex items-center justify-center gap-2">
             <IconShieldSolid class="w-6 h-6 text-lightPrimary dark:text-darkPrimary" />
-            <p class="sm:text-base text-sm">{{ t('Do not overwrite existing values') }}</p>
+            <p class="sm:text-base text-sm">{{ t('Overwrite existing values') }}</p>
             <Tooltip>
                 <IconInfoCircleSolid class="w-5 h-5 me-2 text-lightPrimary dark:text-darkPrimary"/>
                 <template #tooltip>
-                  <p class="max-w-64">{{ t('When enabled, the AI will skip generating content for fields that already have data. This helps to preserve existing information and avoid overwriting valuable content.') }}</p>
+                  <p class="max-w-64">{{ t('When enabled, the AI will overwrite content for fields that already have data. When off - this helps to preserve existing information and avoid overwriting valuable content.') }}</p>
                 </template>
             </Tooltip>
           </div>
           <Toggle
-            v-model="skipFilledFieldsForGeneration"
+            v-model="overwriteExistingValues"
           />
         </div>
-        <div :class="skipFilledFieldsForGeneration === false ? 'opacity-100' : 'opacity-0'" class="flex items-center text-yellow-800 bg-yellow-100 p-2 rounded-md border border-yellow-300">
+        <div :class="overwriteExistingValues === true ? 'opacity-100' : 'opacity-0'" class="flex items-center text-yellow-800 bg-yellow-100 p-2 rounded-md border border-yellow-300">
           <IconExclamationTriangle class="w-6 h-6 me-2"/>
           <p class="sm:text-base text-sm">{{ t('Warning: Existing values will be overwritten.') }}</p>
         </div>
@@ -236,7 +236,9 @@ const generationPrompts = ref<any>({});
 const isDataSaved = ref(false);
 
 const regeneratingFieldsStatus = ref<Record<string, Record<string, boolean>>>({});
-const skipFilledFieldsForGeneration = ref<boolean>(true);
+const overwriteExistingValues = ref<boolean>(false);
+
+const listOfImageThatWasNotGeneratedPerRecord = ref<Record<string, string[]>>({});
 
 const openDialog = async () => {
   window.addEventListener('beforeunload', beforeUnloadHandler);
@@ -544,6 +546,14 @@ async function saveData() {
             if (!value) {
               continue;
             }
+            if (!overwriteExistingValues.value) {
+              const imageURL = selected.value.find(rec => rec[primaryKey] === item[primaryKey])[key];
+              const originalImageUrl = listOfImageThatWasNotGeneratedPerRecord.value[item[primaryKey]][key].originalImage;
+              if (originalImageUrl === imageURL) {
+                reqData.find(rec => rec[primaryKey] === item[primaryKey])[key] = undefined;
+                continue;
+              }
+            }
             const p = uploadImage(value, item[primaryKey], key).then(result => {
               item[key] = result;
             });
@@ -553,7 +563,6 @@ async function saveData() {
       }
       await Promise.all(imagesToUpload);
     }
-
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/update_fields`,
       method: 'POST',
@@ -668,7 +677,7 @@ async function runAiAction({
           actionType: actionType,
           recordId: checkbox,
           ...(customPrompt !== undefined ? { customPrompt: JSON.stringify(customPrompt) } : {}),
-          filterFilledFields: skipFilledFieldsForGeneration.value,
+          filterFilledFields: !overwriteExistingValues.value,
         },
         silentError: true,
       });
@@ -729,7 +738,14 @@ async function runAiAction({
           for (const [key, value] of Object.entries(carouselSaveImages.value[index])) {
             if (props.meta.outputImageFields?.includes(key)) {
               carouselSaveImages.value[index][key] = [jobResponse.job.result[key]];
-            }
+              if (jobResponse.job.recordMeta?.[`${key}_meta`]) {
+                carouselSaveImages.value[index][key] = [jobResponse.job.recordMeta[`${key}_meta`].originalImage];
+                if (!listOfImageThatWasNotGeneratedPerRecord.value[recordId]) {
+                  listOfImageThatWasNotGeneratedPerRecord.value[recordId] = [];
+                }
+                listOfImageThatWasNotGeneratedPerRecord.value[recordId][key] = jobResponse.job.recordMeta[`${key}_meta`];
+              }
+            } 
           }
         }
         //marking that we received response for this record

package/dist/custom/VisionAction.vue

@@ -140,19 +140,19 @@
         <div class="flex items-center justify-between mb-2 w-full">
           <div class="flex items-center justify-center gap-2">
             <IconShieldSolid class="w-6 h-6 text-lightPrimary dark:text-darkPrimary" />
-            <p class="sm:text-base text-sm">{{ t('Do not overwrite existing values') }}</p>
+            <p class="sm:text-base text-sm">{{ t('Overwrite existing values') }}</p>
             <Tooltip>
                 <IconInfoCircleSolid class="w-5 h-5 me-2 text-lightPrimary dark:text-darkPrimary"/>
                 <template #tooltip>
-                  <p class="max-w-64">{{ t('When enabled, the AI will skip generating content for fields that already have data. This helps to preserve existing information and avoid overwriting valuable content.') }}</p>
+                  <p class="max-w-64">{{ t('When enabled, the AI will overwrite content for fields that already have data. When off - this helps to preserve existing information and avoid overwriting valuable content.') }}</p>
                 </template>
             </Tooltip>
           </div>
           <Toggle
-            v-model="skipFilledFieldsForGeneration"
+            v-model="overwriteExistingValues"
           />
         </div>
-        <div :class="skipFilledFieldsForGeneration === false ? 'opacity-100' : 'opacity-0'" class="flex items-center text-yellow-800 bg-yellow-100 p-2 rounded-md border border-yellow-300">
+        <div :class="overwriteExistingValues === true ? 'opacity-100' : 'opacity-0'" class="flex items-center text-yellow-800 bg-yellow-100 p-2 rounded-md border border-yellow-300">
           <IconExclamationTriangle class="w-6 h-6 me-2"/>
           <p class="sm:text-base text-sm">{{ t('Warning: Existing values will be overwritten.') }}</p>
         </div>
@@ -236,7 +236,9 @@ const generationPrompts = ref<any>({});
 const isDataSaved = ref(false);
 
 const regeneratingFieldsStatus = ref<Record<string, Record<string, boolean>>>({});
-const skipFilledFieldsForGeneration = ref<boolean>(true);
+const overwriteExistingValues = ref<boolean>(false);
+
+const listOfImageThatWasNotGeneratedPerRecord = ref<Record<string, string[]>>({});
 
 const openDialog = async () => {
   window.addEventListener('beforeunload', beforeUnloadHandler);
@@ -544,6 +546,14 @@ async function saveData() {
             if (!value) {
               continue;
             }
+            if (!overwriteExistingValues.value) {
+              const imageURL = selected.value.find(rec => rec[primaryKey] === item[primaryKey])[key];
+              const originalImageUrl = listOfImageThatWasNotGeneratedPerRecord.value[item[primaryKey]][key].originalImage;
+              if (originalImageUrl === imageURL) {
+                reqData.find(rec => rec[primaryKey] === item[primaryKey])[key] = undefined;
+                continue;
+              }
+            }
             const p = uploadImage(value, item[primaryKey], key).then(result => {
               item[key] = result;
             });
@@ -553,7 +563,6 @@ async function saveData() {
       }
       await Promise.all(imagesToUpload);
     }
-
     const res = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/update_fields`,
       method: 'POST',
@@ -668,7 +677,7 @@ async function runAiAction({
           actionType: actionType,
           recordId: checkbox,
           ...(customPrompt !== undefined ? { customPrompt: JSON.stringify(customPrompt) } : {}),
-          filterFilledFields: skipFilledFieldsForGeneration.value,
+          filterFilledFields: !overwriteExistingValues.value,
         },
         silentError: true,
       });
@@ -729,7 +738,14 @@ async function runAiAction({
           for (const [key, value] of Object.entries(carouselSaveImages.value[index])) {
             if (props.meta.outputImageFields?.includes(key)) {
               carouselSaveImages.value[index][key] = [jobResponse.job.result[key]];
-            }
+              if (jobResponse.job.recordMeta?.[`${key}_meta`]) {
+                carouselSaveImages.value[index][key] = [jobResponse.job.recordMeta[`${key}_meta`].originalImage];
+                if (!listOfImageThatWasNotGeneratedPerRecord.value[recordId]) {
+                  listOfImageThatWasNotGeneratedPerRecord.value[recordId] = [];
+                }
+                listOfImageThatWasNotGeneratedPerRecord.value[recordId][key] = jobResponse.job.recordMeta[`${key}_meta`];
+              }
+            } 
           }
         }
         //marking that we received response for this record

package/dist/index.js

@@ -265,7 +265,17 @@ 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* () {
                 if (record[key] && filterFilledFields) {
-                    return { key, images: [] };
+                    const plugin = this.adminforth.activatedPlugins.find(p => p.resourceConfig.resourceId === this.resourceConfig.resourceId &&
+                        p.pluginOptions.pathColumnName === key);
+                    const image_url = yield plugin.pluginOptions.storageAdapter.getDownloadUrl(record[key]);
+                    return {
+                        key,
+                        images: [image_url],
+                        meta: {
+                            skippedToNotOverwrite: true,
+                            originalImage: image_url,
+                        }
+                    };
                 }
                 const prompt = (yield this.compileGenerationFieldTemplates(record, customPrompt))[key];
                 let images;
@@ -320,14 +330,18 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             }));
             const fieldResults = yield Promise.all(fieldTasks);
             const recordResult = {};
-            fieldResults.forEach(({ key, images }) => {
+            const recordMeta = {};
+            fieldResults.forEach(({ key, images, meta }) => {
                 recordResult[key] = images;
+                if (meta) {
+                    recordMeta[`${key}_meta`] = meta;
+                }
             });
             const result = recordResult;
             if (!isError) {
                 this.totalCalls++;
                 this.totalDuration += (+new Date() - start) / 1000;
-                jobs.set(jobId, { status: 'completed', result });
+                jobs.set(jobId, { status: 'completed', result, recordMeta });
                 return { ok: true };
             }
             else {

package/index.ts

@@ -260,7 +260,19 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     }
     const fieldTasks = Object.keys(this.options?.generateImages || {}).map(async (key) => {
       if ( record[key] && filterFilledFields ) {
-        return { key, images: [] };
+        const plugin = this.adminforth.activatedPlugins.find(p => 
+          p.resourceConfig!.resourceId === this.resourceConfig.resourceId &&
+          p.pluginOptions.pathColumnName === key
+        );
+        const image_url = await plugin.pluginOptions.storageAdapter.getDownloadUrl(record[key]);
+        return { 
+          key,
+          images: [image_url], 
+          meta: {
+            skippedToNotOverwrite: true,
+            originalImage: image_url,
+          } 
+        };
       }
       const prompt = (await this.compileGenerationFieldTemplates(record, customPrompt))[key];
       let images;
@@ -312,10 +324,14 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     });
 
     const fieldResults = await Promise.all(fieldTasks);
-    const recordResult: Record<string, string[]> = {};
+    const recordResult: Record<string, any> = {};
+    const recordMeta: Record<string, any> = {};
 
-    fieldResults.forEach(({ key, images }) => {
+    fieldResults.forEach(({ key, images, meta }) => {
       recordResult[key] = images;
+      if (meta) {
+        recordMeta[`${key}_meta`] = meta;
+      }
     });
 
     const result = recordResult;
@@ -323,7 +339,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     if (!isError) {
       this.totalCalls++;
       this.totalDuration += (+new Date() - start) / 1000;
-      jobs.set(jobId, { status: 'completed', result });
+      jobs.set(jobId, { status: 'completed', result, recordMeta });
       return { ok: true }
     } else {
       return { ok: false, error: 'Error during image generation' };

package/package.json

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