@adminforth/bulk-ai-flow 1.4.1 → 1.5.0

package/dist/custom/package.json

@@ -11,6 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "@iconify-prerendered/vue-mdi": "^0.25.1718880438",
+    "adminforth": "^2.4.0-next.112",
     "medium-zoom": "^1.1.0"
   }
-}
+}

package/dist/custom/visionAction.vue

@@ -66,7 +66,7 @@
 
 <script lang="ts" setup>
 import { callAdminForthApi } from '@/utils';
-import { handleError, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { Dialog, Button } from '@/afcl';
 import VisionTable from './visionTable.vue'
 import adminforth from '@/adminforth';
@@ -143,7 +143,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 +158,7 @@ const closeDialog = () => {
   tableColumns.value = [];
   tableColumnsIndexes.value = [];
   isError.value = false;
+  isCriticalError.value = false;
   errorMessage.value = '';
 }
 
@@ -340,22 +341,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 +395,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 +528,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

@@ -58,10 +58,10 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         }
         return compiled;
     }
-    checkRateLimit(fieldNameRateLimit, headers) {
+    checkRateLimit(field, fieldNameRateLimit, headers) {
         if (fieldNameRateLimit) {
             // rate limit
-            const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, fieldNameRateLimit, this.adminforth.auth.getClientIp(headers));
+            const { error } = RateLimiter.checkRateLimit(field, fieldNameRateLimit, this.adminforth.auth.getClientIp(headers));
             if (error) {
                 return { error: "Rate limit exceeded" };
             }
@@ -198,6 +198,11 @@ 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 (typeof (this.options.rateLimits.fillFieldsFromImages) === 'string') {
+                    if (this.checkRateLimit("fillFieldsFromImages", this.options.rateLimits.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
@@ -235,6 +240,11 @@ 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 (typeof (this.options.rateLimits.fillPlainFields) === 'string') {
+                    if (this.checkRateLimit("fillPlainFields", this.options.rateLimits.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);
@@ -353,11 +363,11 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                 const Id = body.recordId || [];
                 const prompt = body.prompt || '';
                 const fieldName = body.fieldName || '';
-                if (this.checkRateLimit(this.options.generateImages[fieldName].rateLimit, headers)) {
+                if (this.checkRateLimit(fieldName, this.options.generateImages[fieldName].rateLimit, headers)) {
                     return { error: "Rate limit exceeded" };
                 }
                 const start = +new Date();
-                const STUB_MODE = false;
+                const STUB_MODE = true;
                 const record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ((_b = this.resourceConfig.columns.find(c => c.primaryKey)) === null || _b === void 0 ? void 0 : _b.name, Id)]);
                 let attachmentFiles;
                 if (!this.options.attachFiles) {
@@ -396,9 +406,11 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             path: `/plugin/${this.pluginInstanceId}/initial_image_generate`,
             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)) {
-                    return { error: "Rate limit exceeded" };
+                const STUB_MODE = true;
+                if (typeof (this.options.rateLimits.generateImages) === 'string') {
+                    if (this.checkRateLimit("generateImages", this.options.rateLimits.generateImages, headers)) {
+                        return { error: "Rate limit exceeded" };
+                    }
                 }
                 const start = +new Date();
                 const tasks = selectedIds.map((ID) => __awaiter(this, void 0, void 0, function* () {

package/index.ts

@@ -61,11 +61,11 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     return compiled;
   }
 
-  private checkRateLimit(fieldNameRateLimit: string | undefined, headers: Record<string, string | string[] | undefined>): { error?: string } | void {
+  private checkRateLimit(field: string,fieldNameRateLimit: string | undefined, headers: Record<string, string | string[] | undefined>): { error?: string } | void {
     if (fieldNameRateLimit) {
       // rate limit
       const { error } = RateLimiter.checkRateLimit(
-        this.pluginInstanceId,
+        field,
         fieldNameRateLimit,
         this.adminforth.auth.getClientIp(headers),
       );
@@ -75,6 +75,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     }
   }
 
+
   async modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     super.modifyResourceConfig(adminforth, resourceConfig);
 
@@ -224,6 +225,11 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       path: `/plugin/${this.pluginInstanceId}/analyze`,
       handler: async ({ body, adminUser, headers }) => {
       const selectedIds = body.selectedIds || [];
+      if (typeof(this.options.rateLimits.fillFieldsFromImages) === 'string'){
+        if (this.checkRateLimit("fillFieldsFromImages" ,this.options.rateLimits.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);
@@ -269,6 +275,11 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       path: `/plugin/${this.pluginInstanceId}/analyze_no_images`,
       handler: async ({ body, adminUser, headers }) => {
       const selectedIds = body.selectedIds || [];
+      if (typeof(this.options.rateLimits.fillPlainFields) === 'string'){
+        if (this.checkRateLimit("fillPlainFields", this.options.rateLimits.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);
@@ -400,11 +411,11 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
         const Id = body.recordId || [];
         const prompt = body.prompt || '';
         const fieldName = body.fieldName || '';
-        if (this.checkRateLimit(this.options.generateImages[fieldName].rateLimit, headers)) {
+        if (this.checkRateLimit(fieldName, this.options.generateImages[fieldName].rateLimit, headers)) {
           return { error: "Rate limit exceeded" };
         }
         const start = +new Date();
-        const STUB_MODE = false;
+        const STUB_MODE = true;
         const record = await this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(this.resourceConfig.columns.find(c => c.primaryKey)?.name, Id)]);
         let attachmentFiles
           if(!this.options.attachFiles){
@@ -449,10 +460,11 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       path: `/plugin/${this.pluginInstanceId}/initial_image_generate`,
       handler: async ({ body, headers }) => {
         const selectedIds = body.selectedIds || [];
-        const STUB_MODE = false;
-
-        if (this.checkRateLimit(this.options.bulkGenerationRateLimit, headers)) {
-          return { error: "Rate limit exceeded" };
+        const STUB_MODE = true;
+        if (typeof(this.options.rateLimits.generateImages) === 'string'){
+          if (this.checkRateLimit("generateImages", this.options.rateLimits.generateImages, headers)) {
+            return { error: "Rate limit exceeded" };
+          }
         }
         const start = +new Date();
         const tasks = selectedIds.map(async (ID) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/bulk-ai-flow",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "publishConfig": {
     "access": "public"
   },
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@types/handlebars": "^4.0.40",
-    "adminforth": "^2.4.0-next.101",
+    "adminforth": "^2.4.0-next.112",
     "handlebars": "^4.7.8",
     "medium-zoom": "^1.1.0"
   }

package/types.ts

@@ -43,10 +43,12 @@ export interface PluginOptions {
        */
       countToGenerate: number,
     }>,
-    /** 
-     * As rateLimit on generateImages, but applied to bulk generations  
-     **/
-    bulkGenerationRateLimit?: string, 
+    rateLimits?: {
+      fillFieldsFromImages?: string, // e.g. 5/1d - 5 requests per day
+      fillPlainFields?: string,
+      generateImages?: string,
+    },
+
 
     /**
      * Whether the user is allowed to save the generated images