@adminforth/upload 1.0.18 → 1.0.20

package/custom/imageGenerator.vue

@@ -103,7 +103,7 @@
 
 <script setup lang="ts">
 
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, nextTick } from 'vue'
 import { Carousel } from 'flowbite';
 import { callAdminForthApi } from '@/utils';
 
@@ -184,6 +184,7 @@ async function generateImages() {
       variant: 'danger',
       timeout: 15,
     });
+    loading.value = false;
     return;
   }
 
@@ -196,7 +197,7 @@ async function generateImages() {
   //   'https://via.placeholder.com/600x400?text=Image+1',
   //   'https://via.placeholder.com/600x400?text=Image+2',
   // ];
-  await new Promise(resolve => setTimeout(resolve, 0));
+  await nextTick();
 
   caurosel.value = new Carousel(
     document.getElementById('gallery'), 
@@ -212,7 +213,7 @@ async function generateImages() {
       override: true,
     }
   );
-  await new Promise(resolve => setTimeout(resolve, 0));
+  await nextTick();
   loading.value = false;
 }
 

package/dist/custom/imageGenerator.vue

@@ -103,7 +103,7 @@
 
 <script setup lang="ts">
 
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, nextTick } from 'vue'
 import { Carousel } from 'flowbite';
 import { callAdminForthApi } from '@/utils';
 
@@ -184,6 +184,7 @@ async function generateImages() {
       variant: 'danger',
       timeout: 15,
     });
+    loading.value = false;
     return;
   }
 
@@ -196,7 +197,7 @@ async function generateImages() {
   //   'https://via.placeholder.com/600x400?text=Image+1',
   //   'https://via.placeholder.com/600x400?text=Image+2',
   // ];
-  await new Promise(resolve => setTimeout(resolve, 0));
+  await nextTick();
 
   caurosel.value = new Carousel(
     document.getElementById('gallery'), 
@@ -212,7 +213,7 @@ async function generateImages() {
       override: true,
     }
   );
-  await new Promise(resolve => setTimeout(resolve, 0));
+  await nextTick();
   loading.value = false;
 }
 

package/dist/index.js

@@ -11,6 +11,7 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { ExpirationStatus, GetObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
 import { AdminForthPlugin, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
+import { RateLimiter, getClientIp } from "adminforth";
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 export default class UploadPlugin extends AdminForthPlugin {
     constructor(options) {
@@ -409,11 +410,19 @@ export default class UploadPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/generate_images`,
-            handler: (_c) => __awaiter(this, [_c], void 0, function* ({ body }) {
+            handler: (_c) => __awaiter(this, [_c], void 0, function* ({ body, headers }) {
+                var _d, _e;
                 const { prompt } = body;
                 if (this.options.generation.provider !== 'openai-dall-e') {
                     throw new Error(`Provider ${this.options.generation.provider} is not supported`);
                 }
+                if ((_d = this.options.generation.rateLimit) === null || _d === void 0 ? void 0 : _d.limit) {
+                    // rate limit
+                    const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, (_e = this.options.generation.rateLimit) === null || _e === void 0 ? void 0 : _e.limit, getClientIp(headers));
+                    if (error) {
+                        return { error: this.options.generation.rateLimit.errorMessage };
+                    }
+                }
                 const { model, size, apiKey } = this.options.generation.openAiOptions;
                 const url = 'https://api.openai.com/v1/images/generations';
                 let error = null;
@@ -445,7 +454,7 @@ export default class UploadPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'GET',
             path: `/plugin/${this.pluginInstanceId}/cors-proxy`,
-            handler: (_d) => __awaiter(this, [_d], void 0, function* ({ query, response }) {
+            handler: (_f) => __awaiter(this, [_f], void 0, function* ({ query, response }) {
                 const { url } = query;
                 const resp = yield fetch(url);
                 response.setHeader('Content-Type', resp.headers.get('Content-Type'));

package/index.ts

@@ -4,6 +4,7 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { ExpirationStatus, GetObjectCommand, ObjectCannedACL, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
 import { AdminForthPlugin, AdminForthResourceColumn, AdminForthResourcePages, IAdminForth, IHttpServer, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
+import { RateLimiter, getClientIp } from "adminforth";
 
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 
@@ -451,13 +452,25 @@ export default class UploadPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/generate_images`,
-      handler: async ({ body }) => {
+      handler: async ({ body, headers }) => {
         const { prompt } = body;
 
         if (this.options.generation.provider !== 'openai-dall-e') {
           throw new Error(`Provider ${this.options.generation.provider} is not supported`);
         }
 
+        if (this.options.generation.rateLimit?.limit) {
+          // rate limit
+          const { error } = RateLimiter.checkRateLimit(
+            this.pluginInstanceId, 
+            this.options.generation.rateLimit?.limit,
+            getClientIp(headers),
+          );
+          if (error) {
+            return { error: this.options.generation.rateLimit.errorMessage };
+          }
+        }
+
         const { model, size, apiKey } = this.options.generation.openAiOptions;
         const url = 'https://api.openai.com/v1/images/generations';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/types.ts

@@ -128,6 +128,25 @@ export type PluginOptions = {
      * where plugin is used.
      */
     fieldsForContext? : string[],
+
+    
+    /**
+     * Since AI generation can be expensive, we can limit the number of requests per IP.
+     */
+    rateLimit?: {
+
+      /**
+       * E.g. 5/1d - 5 requests per day
+       * 3/1h - 3 requests per hour
+       */ 
+      limit: string,
+
+      /**
+       * !Not used now
+       * Message shown to user when rate limit is reached
+       */
+      errorMessage: string,
+    },
   }
 
 }