@adminforth/bulk-ai-flow 1.27.0 → 1.27.2

package/build.log

@@ -14,5 +14,5 @@ custom/package.json
 custom/pnpm-lock.yaml
 custom/tsconfig.json
 
-sent 130,464 bytes  received 191 bytes  261,310.00 bytes/sec
+sent 130,454 bytes  received 191 bytes  261,290.00 bytes/sec
 total size is 129,741  speedup is 0.99

package/dist/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AdminForthFilterOperators, AdminForthPlugin, parseBody, Filters } from "adminforth";
+import { AdminForthFilterOperators, AdminForthPlugin, Filters } from "adminforth";
 import { suggestIfTypo, filtersTools } from "adminforth";
 import Handlebars from 'handlebars';
 import { RateLimiter } from "adminforth";
@@ -33,7 +33,7 @@ const getImageGenerationPromptsBodySchema = z.object({
 }).strict();
 const createJobBodySchema = z.object({
     actionType: z.string().nullish(),
-    recordId: z.any().optional(),
+    recordId: z.union([z.string(), z.number()]).nullish(),
     customPrompt: z.string().nullish(),
     filterFilledFields: z.boolean().nullish(),
     sessionIds: z.array(z.string()).nullish(),
@@ -811,38 +811,12 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         return `${this.pluginOptions.actionName}`;
     }
     setupEndpoints(server) {
-        server.endpoint({
-            method: 'POST',
-            path: `/plugin/${this.pluginInstanceId}/get_records`,
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response }) {
-                const parsed = parseBody(getRecordsBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
-                if (!Array.isArray(data.record)) {
-                    return { records: [] };
-                }
-                let records = [];
-                const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
-                records = yield this.adminforth.resource(this.resourceConfig.resourceId).list([Filters.IN(primaryKeyColumn.name, data.record)]);
-                for (const [index, record] of records.entries()) {
-                    records[index]._label = this.resourceConfig.recordLabel(records[index]);
-                }
-                const order = Object.fromEntries(data.record.map((id, i) => [id, i]));
-                const sortedRecords = records.sort((a, b) => order[a.id] - order[b.id]);
-                return {
-                    records: sortedRecords,
-                };
-            })
-        });
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get_old_data`,
+            request_schema: getOldDataBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response }) {
-                const parsed = parseBody(getOldDataBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 const recordId = data.recordId;
                 if (recordId === undefined || recordId === null) {
                     return { ok: false, error: "Missing recordId" };
@@ -860,11 +834,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get_images`,
+            request_schema: getImagesBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response }) {
-                const parsed = parseBody(getImagesBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 let images = [];
                 if (data.record) {
                     for (const record of data.record) {
@@ -881,11 +853,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/update_fields`,
+            request_schema: updateFieldsBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, response }) {
-                const parsed = parseBody(updateFieldsBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 let isAllowedToSave = { ok: true, error: '' };
                 if (this.options.isAllowedToSave) {
                     isAllowedToSave = yield this.options.isAllowedToSave({ record: {}, adminUser: adminUser, resource: this.resourceConfig });
@@ -986,12 +956,10 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get_image_generation_prompts`,
+            request_schema: getImageGenerationPromptsBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, headers, response }) {
                 var _b;
-                const parsed = parseBody(getImageGenerationPromptsBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 const Id = data.recordId || [];
                 const customPrompt = data.customPrompt || null;
                 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)]);
@@ -1013,11 +981,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/create-job`,
+            request_schema: createJobBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, response }) {
-                const parsed = parseBody(createJobBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 const { actionType, recordId, customPrompt, filterFilledFields, sessionIds } = data;
                 if (this.options.rateLimits) {
                     if (sessionIds && sessionIds.length > 0) {
@@ -1076,11 +1042,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get-job-status`,
+            request_schema: jobStatusBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, response }) {
-                const parsed = parseBody(jobStatusBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 const jobId = data.jobId;
                 if (!jobId) {
                     response.setStatus(400);
@@ -1113,12 +1077,10 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/update-rate-limits`,
+            request_schema: updateRateLimitsBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, response }) {
                 var _b, _c, _d;
-                const parsed = parseBody(updateRateLimitsBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 const actionType = data.actionType;
                 const sessionId = randomUUID();
                 this.sessionIds.add(sessionId);
@@ -1144,12 +1106,10 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/compile_old_image_link`,
+            request_schema: compileOldImageLinkBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, response }) {
                 var _b, _c;
-                const parsed = parseBody(compileOldImageLinkBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
+                const data = body;
                 const image = data.image;
                 const columnName = data.columnName;
                 if (!image) {
@@ -1177,12 +1137,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get_filtered_ids`,
+            request_schema: getFilteredIdsBodySchema,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, query, cookies, requestUrl, response }) {
                 var _b, _c;
-                const parsed = parseBody(getFilteredIdsBodySchema, body, response);
-                if ('error' in parsed)
-                    return parsed.error;
-                const data = parsed.data;
                 const resource = this.resourceConfig;
                 for (const hook of ((_c = (_b = resource.hooks) === null || _b === void 0 ? void 0 : _b.list) === null || _c === void 0 ? void 0 : _c.beforeDatasourceRequest) || []) {
                     const filterTools = filtersTools.get(body);

package/index.ts

@@ -1,4 +1,4 @@
-import { AdminForthFilterOperators, AdminForthPlugin, parseBody, Filters } from "adminforth";
+import { AdminForthFilterOperators, AdminForthPlugin, Filters } from "adminforth";
 import type { IAdminForth, IHttpServer, AdminForthComponentDeclaration, AdminForthResource } from "adminforth";
 import { suggestIfTypo, filtersTools } from "adminforth";
 import type { PluginOptions } from './types.js';
@@ -32,7 +32,7 @@ const getImageGenerationPromptsBodySchema = z.object({
 
 const createJobBodySchema = z.object({
   actionType: z.string().nullish(),
-  recordId: z.any().optional(),
+  recordId: z.union([z.string(), z.number()]).nullish(),
   customPrompt: z.string().nullish(),
   filterFilledFields: z.boolean().nullish(),
   sessionIds: z.array(z.string()).nullish(),
@@ -163,7 +163,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     return prompt;
   }
 
-  private async analyze_image(jobId: string, recordId: string, adminUser: any, headers: Record<string, string | string[] | undefined>, customPrompt? : string, filterFilledFields: boolean = true) {
+  private async analyze_image(jobId: string, recordId: string | number, adminUser: any, headers: Record<string, string | string[] | undefined>, customPrompt? : string, filterFilledFields: boolean = true) {
     // TODO: need to do correct check of rate limit
     // if (this.options.rateLimits && this.options.rateLimits.fillFieldsFromImages && await this.checkRateLimit("fillFieldsFromImages" ,this.options.rateLimits.fillFieldsFromImages, headers)) {
     //   jobs.set(jobId, { status: 'failed', error: "Rate limit exceeded" });
@@ -248,7 +248,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
 
   }
 
-  private async analyzeNoImages(jobId: string, recordId: string, adminUser: any, headers: Record<string, string | string[] | undefined>, customPrompt? : string, filterFilledFields: boolean = true) {
+  private async analyzeNoImages(jobId: string, recordId: string | number, adminUser: any, headers: Record<string, string | string[] | undefined>, customPrompt? : string, filterFilledFields: boolean = true) {
     // TODO: need to do correct check of rate limit
     // if (this.options.rateLimits && this.options.rateLimits.fillPlainFields && await this.checkRateLimit("fillPlainFields" ,this.options.rateLimits.fillPlainFields, headers)) {
     //   jobs.set(jobId, { status: 'failed', error: "Rate limit exceeded" });
@@ -312,7 +312,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     }
   }
 
-  private async initialImageGenerate(jobId: string, recordId: string, adminUser: any, headers: Record<string, string | string[] | undefined>, customPrompt? : string, filterFilledFields: boolean = true) {
+  private async initialImageGenerate(jobId: string, recordId: string | number, adminUser: any, headers: Record<string, string | string[] | undefined>, customPrompt? : string, filterFilledFields: boolean = true) {
     // TODO: need to do correct check of rate limit
     // if (this.options.rateLimits && this.options.rateLimits.generateImages && await this.checkRateLimit("generateImages" ,this.options.rateLimits.generateImages, headers)) {
     //   jobs.set(jobId, { status: 'failed', error: "Rate limit exceeded" });
@@ -424,7 +424,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     }
   }
    
-  private async regenerateImage(jobId: string, recordId: string, fieldName: string, prompt: string, adminUser: any, headers: Record<string, string | string[] | undefined>) {
+  private async regenerateImage(jobId: string, recordId: string | number, fieldName: string, prompt: string, adminUser: any, headers: Record<string, string | string[] | undefined>) {
     const Id = recordId;
     let isError = false;
     // TODO: need to do correct check of rate limit
@@ -829,41 +829,12 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
   }
 
   setupEndpoints(server: IHttpServer) {
-    server.endpoint({
-      method: 'POST',
-      path: `/plugin/${this.pluginInstanceId}/get_records`,
-      handler: async ({ body, response }) => {
-        const parsed = parseBody(getRecordsBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
-        if (!Array.isArray(data.record)) {
-          return { records: [] };
-        }
-        let records = [];
-        const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
-        records = await this.adminforth.resource(this.resourceConfig.resourceId).list([Filters.IN(primaryKeyColumn.name, data.record)]);
-        for( const [index, record] of records.entries() ) {
-          records[index]._label = this.resourceConfig.recordLabel(records[index]);
-        }
-        const order = Object.fromEntries(data.record.map((id, i) => [id, i]));
-
-        const sortedRecords = records.sort(
-          (a, b) => order[a.id] - order[b.id]
-        );
-        return {
-          records: sortedRecords,
-        };
-      }
-    });
-
-
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get_old_data`,
+      request_schema: getOldDataBodySchema,
       handler: async ({ body, response }) => {
-        const parsed = parseBody(getOldDataBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof getOldDataBodySchema>;
         const recordId = data.recordId;
         if (recordId === undefined || recordId === null) {
           return { ok: false, error: "Missing recordId" };
@@ -883,10 +854,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get_images`,
+      request_schema: getImagesBodySchema,
       handler: async ({ body, response }) => {
-        const parsed = parseBody(getImagesBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof getImagesBodySchema>;
         let images = [];
         if(data.record){
           for( const record of data.record ) {
@@ -905,10 +875,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/update_fields`,
+      request_schema: updateFieldsBodySchema,
       handler: async ({ body, adminUser, headers, response }) => {
-        const parsed = parseBody(updateFieldsBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof updateFieldsBodySchema>;
         let isAllowedToSave: any = { ok: true, error: '' };
         if(this.options.isAllowedToSave) {
           isAllowedToSave = await this.options.isAllowedToSave({ record: {}, adminUser: adminUser, resource: this.resourceConfig });
@@ -1015,10 +984,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get_image_generation_prompts`,
+      request_schema: getImageGenerationPromptsBodySchema,
       handler: async ({ body, headers, response }) => {
-        const parsed = parseBody(getImageGenerationPromptsBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof getImageGenerationPromptsBodySchema>;
         const Id = data.recordId || [];
         const customPrompt = data.customPrompt || null;
         const record = await this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(this.resourceConfig.columns.find(c => c.primaryKey)?.name, Id)]);
@@ -1044,10 +1012,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/create-job`,
+      request_schema: createJobBodySchema,
       handler: async ({ body, adminUser, headers, response }) => {
-        const parsed = parseBody(createJobBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof createJobBodySchema>;
         const { actionType, recordId, customPrompt, filterFilledFields, sessionIds } = data;
         if (this.options.rateLimits) {
           if (sessionIds && sessionIds.length > 0) {
@@ -1106,10 +1073,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get-job-status`,
+      request_schema: jobStatusBodySchema,
       handler: async ({ body, adminUser, headers, response }) => {
-        const parsed = parseBody(jobStatusBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof jobStatusBodySchema>;
         const jobId = data.jobId;
         if (!jobId) {
           response.setStatus(400);
@@ -1147,10 +1113,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/update-rate-limits`,
+      request_schema: updateRateLimitsBodySchema,
       handler: async ({ body, adminUser, headers, response }) => {
-        const parsed = parseBody(updateRateLimitsBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof updateRateLimitsBodySchema>;
         const actionType = data.actionType;
         const sessionId = randomUUID();
         this.sessionIds.add(sessionId);
@@ -1178,10 +1143,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/compile_old_image_link`,
+      request_schema: compileOldImageLinkBodySchema,
       handler: async ({ body, adminUser, headers, response }) => {
-        const parsed = parseBody(compileOldImageLinkBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
+        const data = body as z.infer<typeof compileOldImageLinkBodySchema>;
         const image = data.image;
         const columnName = data.columnName;
         if (!image) {
@@ -1211,10 +1175,8 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get_filtered_ids`,
+      request_schema: getFilteredIdsBodySchema,
       handler: async ({ body, adminUser, headers, query, cookies, requestUrl, response }) => {
-        const parsed = parseBody(getFilteredIdsBodySchema, body, response);
-        if ('error' in parsed) return parsed.error;
-        const data = parsed.data;
         const resource = this.resourceConfig;
 
         for (const hook of resource.hooks?.list?.beforeDatasourceRequest || []) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/bulk-ai-flow",
-  "version": "1.27.0",
+  "version": "1.27.2",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
   "description": "Bulk AI workflow plugin for AdminForth for batch field generation and image processing",
   "devDependencies": {
     "@types/node": "latest",
-    "adminforth": "^3.7.1",
+    "adminforth": "^3.8.2",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"
@@ -36,7 +36,7 @@
     "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "adminforth": "^3.7.1"
+    "adminforth": "^3.8.2"
   },
   "release": {
     "plugins": [