@adminforth/bulk-ai-flow 1.4.0 → 1.4.2

package/build.log

@@ -11,5 +11,5 @@ custom/tsconfig.json
 custom/visionAction.vue
 custom/visionTable.vue
 
-sent 56,553 bytes  received 134 bytes  113,374.00 bytes/sec
-total size is 56,046  speedup is 0.99
+sent 57,708 bytes  received 134 bytes  115,684.00 bytes/sec
+total size is 57,208  speedup is 0.99

package/custom/visionAction.vue

@@ -73,6 +73,7 @@ import adminforth from '@/adminforth';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { AdminUser, type AdminForthResourceCommon } from '@/types';
+import { RateLimiter } from "adminforth";
 
 const route = useRoute();
 const { t } = useI18n();
@@ -143,7 +144,7 @@ const openDialog = async () => {
 }
  
 watch(selected, (val) => {
-  console.log('Selected changed:', val);
+  //console.log('Selected changed:', val);
   checkedCount.value = val.filter(item => item.isChecked === true).length;
 }, { deep: true });
 
@@ -158,6 +159,7 @@ const closeDialog = () => {
   tableColumns.value = [];
   tableColumnsIndexes.value = [];
   isError.value = false;
+  isCriticalError.value = false;
   errorMessage.value = '';
 }
 
@@ -340,22 +342,42 @@ async function analyzeFields() {
 
     isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
 
-    res.result.forEach((item, idx) => {
-      const pk = selected.value[idx]?.[primaryKey]
+    if (res?.error) {
+      adminforth.alert({
+        message: res.error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
 
-      if (pk) {
-        selected.value[idx] = {
-          ...selected.value[idx],
-          ...item,
-          isChecked: true,
-          [primaryKey]: pk
+      console.error('Failed to analyze image(s):', res.error);
+      isError.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) => {
+        const pk = selected.value[idx]?.[primaryKey]
+
+        if (pk) {
+          selected.value[idx] = {
+            ...selected.value[idx],
+            ...item,
+            isChecked: true,
+            [primaryKey]: pk
+          }
         }
-      }
-    })
+      })
+    }
   } catch (error) {
+    adminforth.alert({
+      message: error,
+      variant: 'danger',
+      timeout: 'unlimited',
+    });
+
     console.error('Failed to analyze image(s):', error);
     isError.value = true;
-    errorMessage.value = `Failed to fetch analyze image(s). Please, try to re-run the action.`;
+    isCriticalError.value = true;
+    errorMessage.value = res.error;
   }
 }
 
@@ -374,23 +396,40 @@ async function analyzeFieldsNoImages() {
     if(!props.meta.isFieldsForAnalizeFromImages) {
       isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
     }
-
-    res.result.forEach((item, idx) => {
-      const pk = selected.value[idx]?.[primaryKey]
-
-      if (pk) {
-        selected.value[idx] = {
-          ...selected.value[idx],
-          ...item,
-          isChecked: true,
-          [primaryKey]: pk
+    if(res?.error) {
+      adminforth.alert({
+        message: res.error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+      console.error('Failed to analyze fields:', res.error);
+      isError.value = true;
+      isCriticalError.value = true;
+      errorMessage.value = res.error;
+    } else {
+      res.result.forEach((item, idx) => {
+        const pk = selected.value[idx]?.[primaryKey]
+
+        if (pk) {
+          selected.value[idx] = {
+            ...selected.value[idx],
+            ...item,
+            isChecked: true,
+            [primaryKey]: pk
+          }
         }
-      }
-    })
+      })
+    }
   } catch (error) {
-    console.error('Failed to analyze fields:', error);
-    isError.value = true;
-    errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
+      adminforth.alert({
+        message: error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+      console.error('Failed to analyze fields:', error);
+      isError.value = true;
+      isCriticalError.value = true;
+      errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
   }
 }
 
@@ -490,7 +529,10 @@ async function generateImages() {
       message: error,
       variant: 'danger',
       timeout: 'unlimited',
-    });
+    });;
+    isError.value = true;
+    isCriticalError.value = true;
+    errorMessage.value = error;
   } else {
     res.result.forEach((item, idx) => {
       const pk = selected.value[idx]?.[primaryKey]

package/dist/custom/visionAction.vue

@@ -73,6 +73,7 @@ import adminforth from '@/adminforth';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { AdminUser, type AdminForthResourceCommon } from '@/types';
+import { RateLimiter } from "adminforth";
 
 const route = useRoute();
 const { t } = useI18n();
@@ -143,7 +144,7 @@ const openDialog = async () => {
 }
  
 watch(selected, (val) => {
-  console.log('Selected changed:', val);
+  //console.log('Selected changed:', val);
   checkedCount.value = val.filter(item => item.isChecked === true).length;
 }, { deep: true });
 
@@ -158,6 +159,7 @@ const closeDialog = () => {
   tableColumns.value = [];
   tableColumnsIndexes.value = [];
   isError.value = false;
+  isCriticalError.value = false;
   errorMessage.value = '';
 }
 
@@ -340,22 +342,42 @@ async function analyzeFields() {
 
     isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
 
-    res.result.forEach((item, idx) => {
-      const pk = selected.value[idx]?.[primaryKey]
+    if (res?.error) {
+      adminforth.alert({
+        message: res.error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
 
-      if (pk) {
-        selected.value[idx] = {
-          ...selected.value[idx],
-          ...item,
-          isChecked: true,
-          [primaryKey]: pk
+      console.error('Failed to analyze image(s):', res.error);
+      isError.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) => {
+        const pk = selected.value[idx]?.[primaryKey]
+
+        if (pk) {
+          selected.value[idx] = {
+            ...selected.value[idx],
+            ...item,
+            isChecked: true,
+            [primaryKey]: pk
+          }
         }
-      }
-    })
+      })
+    }
   } catch (error) {
+    adminforth.alert({
+      message: error,
+      variant: 'danger',
+      timeout: 'unlimited',
+    });
+
     console.error('Failed to analyze image(s):', error);
     isError.value = true;
-    errorMessage.value = `Failed to fetch analyze image(s). Please, try to re-run the action.`;
+    isCriticalError.value = true;
+    errorMessage.value = res.error;
   }
 }
 
@@ -374,23 +396,40 @@ async function analyzeFieldsNoImages() {
     if(!props.meta.isFieldsForAnalizeFromImages) {
       isAiResponseReceivedAnalize.value = props.checkboxes.map(() => true);
     }
-
-    res.result.forEach((item, idx) => {
-      const pk = selected.value[idx]?.[primaryKey]
-
-      if (pk) {
-        selected.value[idx] = {
-          ...selected.value[idx],
-          ...item,
-          isChecked: true,
-          [primaryKey]: pk
+    if(res?.error) {
+      adminforth.alert({
+        message: res.error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+      console.error('Failed to analyze fields:', res.error);
+      isError.value = true;
+      isCriticalError.value = true;
+      errorMessage.value = res.error;
+    } else {
+      res.result.forEach((item, idx) => {
+        const pk = selected.value[idx]?.[primaryKey]
+
+        if (pk) {
+          selected.value[idx] = {
+            ...selected.value[idx],
+            ...item,
+            isChecked: true,
+            [primaryKey]: pk
+          }
         }
-      }
-    })
+      })
+    }
   } catch (error) {
-    console.error('Failed to analyze fields:', error);
-    isError.value = true;
-    errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
+      adminforth.alert({
+        message: error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+      console.error('Failed to analyze fields:', error);
+      isError.value = true;
+      isCriticalError.value = true;
+      errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
   }
 }
 
@@ -490,7 +529,10 @@ async function generateImages() {
       message: error,
       variant: 'danger',
       timeout: 'unlimited',
-    });
+    });;
+    isError.value = true;
+    isCriticalError.value = true;
+    errorMessage.value = error;
   } else {
     res.result.forEach((item, idx) => {
       const pk = selected.value[idx]?.[primaryKey]

package/dist/index.js

@@ -67,6 +67,30 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             }
         }
     }
+    checkRateLimitForBulkGenerationRateLimit(source_api, headers) {
+        if (!this.options.bulkGenerationRateLimit) {
+            return;
+        }
+        const hasGenerateImages = !!this.options.generateImages && Object.keys(this.options.generateImages).length > 0;
+        const hasFillFieldsFromImages = !!this.options.fillFieldsFromImages && Object.keys(this.options.fillFieldsFromImages).length > 0;
+        const hasFillPlainFields = !!this.options.fillPlainFields && Object.keys(this.options.fillPlainFields).length > 0;
+        let shouldCheckRateLimit = false;
+        if (hasGenerateImages && source_api === 'generateImages') {
+            shouldCheckRateLimit = true;
+        }
+        else if (hasFillFieldsFromImages && source_api === 'fillFieldsFromImages' && !hasGenerateImages) {
+            shouldCheckRateLimit = true;
+        }
+        else if (hasFillPlainFields && source_api === 'fillPlainFields' && !hasFillFieldsFromImages && !hasGenerateImages) {
+            shouldCheckRateLimit = true;
+        }
+        if (shouldCheckRateLimit) {
+            const result = this.checkRateLimit(this.options.bulkGenerationRateLimit, headers);
+            if (result) {
+                return { error: "Rate limit exceeded" };
+            }
+        }
+    }
     modifyResourceConfig(adminforth, resourceConfig) {
         const _super = Object.create(null, {
             modifyResourceConfig: { get: () => super.modifyResourceConfig }
@@ -172,13 +196,16 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                     isImageGeneration: this.options.generateImages ? Object.keys(this.options.generateImages).length > 0 : false
                 }
             };
-            if (!this.resourceConfig.options.pageInjections) {
-                this.resourceConfig.options.pageInjections = {};
+            if (!resourceConfig.options.pageInjections) {
+                resourceConfig.options.pageInjections = {};
+            }
+            if (!resourceConfig.options.pageInjections.list) {
+                resourceConfig.options.pageInjections.list = {};
             }
-            if (!this.resourceConfig.options.pageInjections.list) {
-                this.resourceConfig.options.pageInjections.list = {};
+            if (!resourceConfig.options.pageInjections.list.threeDotsDropdownItems) {
+                resourceConfig.options.pageInjections.list.threeDotsDropdownItems = [];
             }
-            this.resourceConfig.options.pageInjections.list.threeDotsDropdownItems = [pageInjection];
+            resourceConfig.options.pageInjections.list.threeDotsDropdownItems.push(pageInjection);
         });
     }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
@@ -195,6 +222,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             path: `/plugin/${this.pluginInstanceId}/analyze`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers }) {
                 const selectedIds = body.selectedIds || [];
+                if (this.checkRateLimitForBulkGenerationRateLimit("fillFieldsFromImages", headers)) {
+                    return { error: "Rate limit exceeded" };
+                }
                 const tasks = selectedIds.map((ID) => __awaiter(this, void 0, void 0, function* () {
                     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                     // Fetch the record using the provided ID
@@ -232,6 +262,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             path: `/plugin/${this.pluginInstanceId}/analyze_no_images`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers }) {
                 const selectedIds = body.selectedIds || [];
+                if (this.checkRateLimitForBulkGenerationRateLimit("fillPlainFields", headers)) {
+                    return { error: "Rate limit exceeded" };
+                }
                 const tasks = selectedIds.map((ID) => __awaiter(this, void 0, void 0, function* () {
                     // Fetch the record using the provided ID
                     const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
@@ -394,7 +427,7 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, headers }) {
                 const selectedIds = body.selectedIds || [];
                 const STUB_MODE = false;
-                if (this.checkRateLimit(this.options.bulkGenerationRateLimit, headers)) {
+                if (this.checkRateLimitForBulkGenerationRateLimit("generateImages", headers)) {
                     return { error: "Rate limit exceeded" };
                 }
                 const start = +new Date();

package/index.ts

@@ -1,5 +1,5 @@
 import { AdminForthPlugin, Filters } from "adminforth";
-import type { IAdminForth, IHttpServer, AdminForthResourcePages, AdminForthResourceColumn, AdminForthDataTypes, AdminForthResource } from "adminforth";
+import type { IAdminForth, IHttpServer, AdminForthComponentDeclaration, AdminForthResourceColumn, AdminForthDataTypes, AdminForthResource } from "adminforth";
 import type { PluginOptions } from './types.js';
 import { json } from "stream/consumers";
 import Handlebars, { compile } from 'handlebars';
@@ -75,6 +75,33 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     }
   }
 
+private checkRateLimitForBulkGenerationRateLimit(source_api: string, headers: Record<string, string | string[] | undefined>): { error?: string } | void {
+    if (!this.options.bulkGenerationRateLimit) {
+      return;
+    }
+    
+    const hasGenerateImages = !!this.options.generateImages && Object.keys(this.options.generateImages).length > 0;
+    const hasFillFieldsFromImages = !!this.options.fillFieldsFromImages && Object.keys(this.options.fillFieldsFromImages).length > 0;
+    const hasFillPlainFields = !!this.options.fillPlainFields && Object.keys(this.options.fillPlainFields).length > 0;
+
+    let shouldCheckRateLimit = false;
+    
+    if (hasGenerateImages && source_api === 'generateImages') {
+      shouldCheckRateLimit = true;
+    } else if (hasFillFieldsFromImages && source_api === 'fillFieldsFromImages' && !hasGenerateImages) {
+      shouldCheckRateLimit = true;
+    } else if (hasFillPlainFields && source_api === 'fillPlainFields' && !hasFillFieldsFromImages && !hasGenerateImages) {
+      shouldCheckRateLimit = true;
+    }
+    
+    if (shouldCheckRateLimit) {
+      const result = this.checkRateLimit(this.options.bulkGenerationRateLimit, headers);
+      if (result) {
+        return { error: "Rate limit exceeded" };
+      }
+    }
+}
+
   async modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     super.modifyResourceConfig(adminforth, resourceConfig);
 
@@ -192,15 +219,18 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
         isImageGeneration: this.options.generateImages ? Object.keys(this.options.generateImages).length > 0 : false
       }
     }
-
-    if (!this.resourceConfig.options.pageInjections) {
-      this.resourceConfig.options.pageInjections = {};
+    
+    if (!resourceConfig.options.pageInjections) {
+      resourceConfig.options.pageInjections = {};
     }
-    if (!this.resourceConfig.options.pageInjections.list) {
-      this.resourceConfig.options.pageInjections.list = {};
+    if (!resourceConfig.options.pageInjections.list) {
+      resourceConfig.options.pageInjections.list = {};
+    }
+    if (!resourceConfig.options.pageInjections.list.threeDotsDropdownItems) {
+      resourceConfig.options.pageInjections.list.threeDotsDropdownItems = [];
     }
 
-    this.resourceConfig.options.pageInjections.list.threeDotsDropdownItems = [pageInjection];
+    (resourceConfig.options.pageInjections.list.threeDotsDropdownItems as AdminForthComponentDeclaration[]).push(pageInjection);
   }
   
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
@@ -221,6 +251,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       path: `/plugin/${this.pluginInstanceId}/analyze`,
       handler: async ({ body, adminUser, headers }) => {
       const selectedIds = body.selectedIds || [];
+      if (this.checkRateLimitForBulkGenerationRateLimit("fillFieldsFromImages",headers)) {
+        return { error: "Rate limit exceeded" };
+      }
       const tasks = selectedIds.map(async (ID) => {
         // Fetch the record using the provided ID
         const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
@@ -266,6 +299,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       path: `/plugin/${this.pluginInstanceId}/analyze_no_images`,
       handler: async ({ body, adminUser, headers }) => {
       const selectedIds = body.selectedIds || [];
+      if (this.checkRateLimitForBulkGenerationRateLimit("fillPlainFields",headers)) {
+        return { error: "Rate limit exceeded" };
+      }
       const tasks = selectedIds.map(async (ID) => {
         // Fetch the record using the provided ID
         const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
@@ -447,8 +483,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       handler: async ({ body, headers }) => {
         const selectedIds = body.selectedIds || [];
         const STUB_MODE = false;
-
-        if (this.checkRateLimit(this.options.bulkGenerationRateLimit, headers)) {
+        if (this.checkRateLimitForBulkGenerationRateLimit("generateImages",headers)) {
           return { error: "Rate limit exceeded" };
         }
         const start = +new Date();

package/package.json

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