@adminforth/bulk-ai-flow 1.1.0 → 1.1.2

package/build.log

@@ -10,5 +10,5 @@ custom/tsconfig.json
 custom/visionAction.vue
 custom/visionTable.vue
 
-sent 24,032 bytes  received 115 bytes  48,294.00 bytes/sec
-total size is 23,613  speedup is 0.98
+sent 24,084 bytes  received 115 bytes  48,398.00 bytes/sec
+total size is 23,659  speedup is 0.98

package/custom/visionAction.vue

@@ -84,9 +84,9 @@ const openDialog = async () => {
   analyzeFields();
 }
  
-watch(selected, (val) => {
-  console.log('Selected changed:', val);
-}, { deep: true });
+// watch(selected, (val) => {
+//   console.log('Selected changed:', val);
+// }, { deep: true });
 
 const closeDialog = () => {
   confirmDialog.value.close();
@@ -194,12 +194,12 @@ function prepareDataForSave() {
   const checkedItems = selected.value
     .filter(item => item.isChecked === true)
     .map(item => {
-      const { isChecked, id, ...itemWithoutIsCheckedAndId } = item;
+      const { isChecked, primaryKey, ...itemWithoutIsCheckedAndId } = item;
       return itemWithoutIsCheckedAndId;
     });
   const checkedItemsIDs = selected.value
     .filter(item => item.isChecked === true)
-    .map(item => item.id);
+    .map(item => item[primaryKey]);
   return [checkedItemsIDs, checkedItems];
 }
 
@@ -222,7 +222,7 @@ async function analyzeFields() {
     ...res.result.map((item, idx) => ({
       ...item,
       isChecked: true,
-      id: selected.value[idx]?.id,
+      [primaryKey]: selected.value[idx]?.[primaryKey],
     }))
   )
 }

package/dist/custom/visionAction.vue

@@ -84,9 +84,9 @@ const openDialog = async () => {
   analyzeFields();
 }
  
-watch(selected, (val) => {
-  console.log('Selected changed:', val);
-}, { deep: true });
+// watch(selected, (val) => {
+//   console.log('Selected changed:', val);
+// }, { deep: true });
 
 const closeDialog = () => {
   confirmDialog.value.close();
@@ -194,12 +194,12 @@ function prepareDataForSave() {
   const checkedItems = selected.value
     .filter(item => item.isChecked === true)
     .map(item => {
-      const { isChecked, id, ...itemWithoutIsCheckedAndId } = item;
+      const { isChecked, primaryKey, ...itemWithoutIsCheckedAndId } = item;
       return itemWithoutIsCheckedAndId;
     });
   const checkedItemsIDs = selected.value
     .filter(item => item.isChecked === true)
-    .map(item => item.id);
+    .map(item => item[primaryKey]);
   return [checkedItemsIDs, checkedItems];
 }
 
@@ -222,7 +222,7 @@ async function analyzeFields() {
     ...res.result.map((item, idx) => ({
       ...item,
       isChecked: true,
-      id: selected.value[idx]?.id,
+      [primaryKey]: selected.value[idx]?.[primaryKey],
     }))
   )
 }

package/dist/index.js

@@ -52,8 +52,22 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                     throw new Error(`⚠️ No column found for key "${key}"`);
                 }
             }
+            if (this.options.generateImages) {
+                console.log('Generate Images options:', this.options.generateImages);
+                for (const [key, value] of Object.entries(this.options.generateImages)) {
+                    const column = columns.find(c => c.name.toLowerCase() === key.toLowerCase());
+                    if (!column) {
+                        throw new Error(`⚠️ No column found for key "${key}"`);
+                    }
+                    const plugin = adminforth.activatedPlugins.find(p => p.resourceConfig.resourceId === key &&
+                        p.pluginOptions.pathColumnName === this.resourceConfig.resourceId);
+                    // if (!plugin) {
+                    //   throw new Error(`Plugin for attachment field '${key}' not found in resource '${this.options.attachments!.attachmentResource}', please check if Upload Plugin is installed on the field ${this.options.attachments!.attachmentFieldName}`);
+                    // }
+                }
+            }
             const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
-            console.log('Primary Key Column:', primaryKeyColumn);
+            //console.log('Primary Key Column:', primaryKeyColumn);
             const pageInjection = {
                 file: this.componentPath('visionAction.vue'),
                 meta: {
@@ -90,7 +104,8 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                 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
-                    const record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ('id', ID)]);
+                    const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
+                    const record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(primaryKeyColumn.name, ID)]);
                     //recieve image URLs to analyze
                     const attachmentFiles = yield this.options.attachFiles({ record: record });
                     //create prompt for OpenAI
@@ -123,8 +138,9 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             path: `/plugin/${this.pluginInstanceId}/get_records`,
             handler: (body) => __awaiter(this, void 0, void 0, function* () {
                 let records = [];
+                const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
                 for (const record of body.body.record) {
-                    records.push(yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ('id', record)]));
+                    records.push(yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(primaryKeyColumn.name, record)]));
                     records[records.length - 1]._label = this.resourceConfig.recordLabel(records[records.length - 1]);
                 }
                 return {

package/index.ts

@@ -7,6 +7,7 @@ import Handlebars from 'handlebars';
 
 export default class  BulkAiFlowPlugin extends AdminForthPlugin {
   options: PluginOptions;
+  uploadPlugin: AdminForthPlugin;
 
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
@@ -48,8 +49,27 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       }
     }
 
+
+    if (this.options.generateImages) {
+      console.log('Generate Images options:', this.options.generateImages);
+      for (const [key, value] of Object.entries(this.options.generateImages)) {
+        const column = columns.find(c => c.name.toLowerCase() === key.toLowerCase());
+        if (!column) {
+          throw new Error(`⚠️ No column found for key "${key}"`);
+        }
+        const plugin = adminforth.activatedPlugins.find(p => 
+          p.resourceConfig!.resourceId === key &&
+          p.pluginOptions.pathColumnName === this.resourceConfig.resourceId
+        );
+        // if (!plugin) {
+        //   throw new Error(`Plugin for attachment field '${key}' not found in resource '${this.options.attachments!.attachmentResource}', please check if Upload Plugin is installed on the field ${this.options.attachments!.attachmentFieldName}`);
+        // }
+      }
+    }
+
+
     const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
-    console.log('Primary Key Column:', primaryKeyColumn);
+    //console.log('Primary Key Column:', primaryKeyColumn);
 
     const pageInjection = {
       file: this.componentPath('visionAction.vue'),
@@ -90,7 +110,8 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       const selectedIds = body.selectedIds || [];
       const tasks = selectedIds.map(async (ID) => {
         // Fetch the record using the provided ID
-        const record = await this.adminforth.resource(this.resourceConfig.resourceId).get( [Filters.EQ('id', ID)] );
+        const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
+        const record = await this.adminforth.resource(this.resourceConfig.resourceId).get( [Filters.EQ(primaryKeyColumn.name, ID)] );
 
         //recieve image URLs to analyze
         const attachmentFiles = await this.options.attachFiles({ record: record });
@@ -131,8 +152,9 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       path: `/plugin/${this.pluginInstanceId}/get_records`,
       handler: async ( body ) => {
         let records = [];
+        const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
         for( const record of body.body.record ) {
-          records.push(await this.adminforth.resource(this.resourceConfig.resourceId).get( [Filters.EQ('id', record)] ));
+          records.push(await this.adminforth.resource(this.resourceConfig.resourceId).get( [Filters.EQ(primaryKeyColumn.name, record)] ));
           records[records.length - 1]._label = this.resourceConfig.recordLabel(records[records.length - 1]);
         }
         return {

package/package.json

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

package/types.ts

@@ -4,7 +4,8 @@ import { ImageVisionAdapter, AdminUser, IAdminForth, StorageAdapter } from "admi
 export interface PluginOptions {
     actionName: string,
     visionAdapter: ImageVisionAdapter,
-    fillFieldsFromImages: Record<string, string>,
+    fillFieldsFromImages?: Record<string, string>, // can analyze what is on image and fill fields, typical tasks "find dominant color", "describe what is on image", "clasify to one enum item, e.g. what is on image dog/cat/plant"
+    generateImages?: Record<string, string>, // can generate from images or just from another fields, e.g. "remove text from images", "improve image quality", "turn image into ghibli style"
     attachFiles?: ({ record }: {
       record: any,
     }) => string[] | Promise<string[]>,