@adminforth/bulk-ai-flow 1.4.2 → 1.5.1

package/dist/custom/package.json

@@ -13,4 +13,4 @@
     "@iconify-prerendered/vue-mdi": "^0.25.1718880438",
     "medium-zoom": "^1.1.0"
   }
-}
+}

package/dist/custom/visionAction.vue

@@ -66,14 +66,13 @@
 
 <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';
 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();

package/dist/index.js

@@ -58,39 +58,15 @@ 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" };
             }
         }
     }
-    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 }
@@ -222,8 +198,10 @@ 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" };
+                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;
@@ -262,8 +240,10 @@ 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" };
+                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
@@ -383,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) {
@@ -426,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.checkRateLimitForBulkGenerationRateLimit("generateImages", 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,32 +75,6 @@ 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);
@@ -251,8 +225,10 @@ private checkRateLimitForBulkGenerationRateLimit(source_api: string, headers: Re
       path: `/plugin/${this.pluginInstanceId}/analyze`,
       handler: async ({ body, adminUser, headers }) => {
       const selectedIds = body.selectedIds || [];
-      if (this.checkRateLimitForBulkGenerationRateLimit("fillFieldsFromImages",headers)) {
-        return { error: "Rate limit exceeded" };
+      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
@@ -299,8 +275,10 @@ private checkRateLimitForBulkGenerationRateLimit(source_api: string, headers: Re
       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" };
+      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
@@ -433,11 +411,11 @@ private checkRateLimitForBulkGenerationRateLimit(source_api: string, headers: Re
         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){
@@ -482,9 +460,11 @@ private checkRateLimitForBulkGenerationRateLimit(source_api: string, headers: Re
       path: `/plugin/${this.pluginInstanceId}/initial_image_generate`,
       handler: async ({ body, headers }) => {
         const selectedIds = body.selectedIds || [];
-        const STUB_MODE = false;
-        if (this.checkRateLimitForBulkGenerationRateLimit("generateImages",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.2",
+  "version": "1.5.1",
   "publishConfig": {
     "access": "public"
   },
@@ -20,8 +20,7 @@
   },
   "dependencies": {
     "@types/handlebars": "^4.0.40",
-    "adminforth": "^2.4.0-next.101",
-    "handlebars": "^4.7.8",
-    "medium-zoom": "^1.1.0"
+    "adminforth": "^2.4.0-next.112",
+    "handlebars": "^4.7.8"
   }
 }

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