Merge branch 'main' of https://github.com/devforth/adminforth-bulk-ai-flow

Author: yaroslav8765

custom/VisionAction.vue

@@ -12,10 +12,8 @@
     :class="popupMode === 'generation' ? 'lg:w-auto !lg:max-w-[1600px]' 
       : popupMode === 'settings' ? 'lg:w-[1000px] !lg:max-w-[1000px]' 
         : 'lg:w-[500px] !lg:max-w-[500px]'"
-    :beforeCloseFunction="closeDialog"
+    :beforeCloseFunction="handleBeforeClose"
     :closable="false"
-    :askForCloseConfirmation="popupMode === 'generation' ? true : false"
-    :closeConfirmationText="t('Are you sure you want to close without saving?')"
     :buttons="popupMode === 'generation' ? generationModeButtons : popupMode === 'settings' ? [
           {
             label: t('Save settings'),
@@ -185,6 +183,7 @@ import { useFiltersStore } from '@/stores/filters';
 
 const coreStore = useCoreStore();
 const filtersStore = useFiltersStore();
+const showCloseConfirmModal = ref(false);
 
 const { t } = useI18n();
 const props = defineProps<{
@@ -197,6 +196,7 @@ const props = defineProps<{
 }>();
 
 type RecordStatus = 'pending' | 'processing' | 'completed' | 'failed';
+type GenerationAction = 'analyze' | 'analyze_no_images' | 'generate_images';
 
 type RecordState = {
   id: string | number;
@@ -256,6 +256,11 @@ const startedRecordCount = ref(0);
 const isCheckingRateLimits = ref(false);
 let startGate = Promise.resolve();
 const tableRef = ref<any>(null);
+const generationFailureGroups = new Map<string, {
+  actionType: GenerationAction;
+  error: string;
+  recordIds: Set<string>;
+}>();
 const processedCount = computed(() => {
   recordsVersion.value;
   return Array.from(recordsById.values()).filter(record => record.status === 'completed' || record.status === 'failed').length;
@@ -313,7 +318,7 @@ const generationModeButtons = computed(() => {
       options: {
         class: 'bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200 dark:!border-gray-600'
       }, 
-      onclick: (dialog) => confirmDialog.value.tryToHideModal() 
+      onclick: async (dialog) => { await handleBeforeClose(dialog); } 
     },
   ]
 
@@ -330,6 +335,28 @@ const generationModeButtons = computed(() => {
   return arrayToReturn;
 });
 
+const handleBeforeClose = async (dialog?: any) => {
+  if (popupMode.value === 'generation') {
+    const confirmed = await adminforth.confirm({
+      title: t('Close without saving?'),
+      message: t('Are you sure you want to close without saving?'),
+      yes: t('Yes'),
+      no: t('Cancel'),
+    });
+
+  if (confirmed) {
+    closeDialog();
+      
+    if (confirmDialog.value && typeof confirmDialog.value.hide === 'function') {
+      confirmDialog.value.hide();
+    } else if (dialog && typeof dialog.hide === 'function') {
+      dialog.hide();
+    }
+    return true; 
+  }
+    return false;
+  }
+}
 
 const isSavingCurrent = ref(false);
 function checkIfDialogOpen() {
@@ -398,12 +425,14 @@ async function runAiActions() {
   isActiveGeneration.value = true;
   completedRecordIds.value = new Set();
   startedRecordCount.value = 0;
+  generationFailureGroups.clear();
   await nextTick();
   tableRef.value?.refresh();
   const limit = pLimit(props.meta.concurrencyLimit || 10);
   const tasks = recordIds.value
     .map(id => limit(() => processOneRecord(String(id))));
   await Promise.all(tasks);
+  showGenerationFailureSummary();
   isActiveGeneration.value = false;
 }
 
@@ -431,6 +460,47 @@ function resetGlobalState() {
   recordIds.value = [];
   recordsById.clear();
   uncheckedRecordIds.clear();
+  generationFailureGroups.clear();
+}
+
+function getActionLabel(actionType: GenerationAction) {
+  return actionType.replace('_', ' ');
+}
+
+function getGenerationFailureGroupKey(actionType: GenerationAction, error: string) {
+  const normalizedError = error
+    .replace(/Please retry in [\d.]+s\.?/g, 'Please retry later.')
+    .replace(/\b\d+\.\d+s\b/g, '<duration>')
+    .replace(/\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi, '<uuid>');
+  return `${actionType}:${normalizedError}`;
+}
+
+function registerGenerationFailure(record: RecordState, actionType: GenerationAction, error: string) {
+  const key = getGenerationFailureGroupKey(actionType, error);
+  let group = generationFailureGroups.get(key);
+  if (!group) {
+    group = {
+      actionType,
+      error,
+      recordIds: new Set(),
+    };
+    generationFailureGroups.set(key, group);
+  }
+  group.recordIds.add(String(record.id));
+}
+
+function showGenerationFailureSummary() {
+  for (const group of generationFailureGroups.values()) {
+    const failedCount = group.recordIds.size;
+    const firstRecordId = Array.from(group.recordIds)[0];
+    adminforth.alert({
+      message: t(
+        `Generation action "${getActionLabel(group.actionType)}" failed for ${failedCount} record(s). First failed record: ${firstRecordId}. Error: ${group.error}`,
+      ),
+      variant: 'danger',
+      timeout: 'unlimited',
+    });
+  }
 }
 
 function getOrCreateRecord(recordId: string | number): RecordState {
@@ -622,7 +692,7 @@ async function processOneRecord(recordId: string) {
     }
   }
 
-  const actions: Array<'generate_images' | 'analyze' | 'analyze_no_images'> = [];
+  const actions: GenerationAction[] = [];
   if (props.meta.isImageGeneration) {
     actions.push('generate_images');
   }
@@ -645,7 +715,7 @@ async function processOneRecord(recordId: string) {
 
 async function checkRateLimits() {
   isCheckingRateLimits.value = true;
-  const actionsToCheck: Array<'generate_images' | 'analyze' | 'analyze_no_images'> = [];
+  const actionsToCheck: GenerationAction[] = [];
   if (props.meta.isImageGeneration) {
     actionsToCheck.push('generate_images');
   }
@@ -664,15 +734,15 @@ async function checkRateLimits() {
       });
       if (rateLimitRes?.error || rateLimitRes?.ok === false) {
         adminforth.alert({
-          message: t(`Rate limit exceeded for "${actionType.replace('_', ' ')}" action. Please try again later.`),
+          message: t(`Rate limit exceeded for "${getActionLabel(actionType)}" action. Please try again later.`),
           variant: 'danger',
           timeout: 'unlimited',
         });
         return false;
       }
     } catch (e) {
       adminforth.alert({
-        message: t(`Error checking rate limit for "${actionType.replace('_', ' ')}" action.`),
+        message: t(`Error checking rate limit for "${getActionLabel(actionType)}" action.`),
         variant: 'danger',
         timeout: 'unlimited',
       });
@@ -684,7 +754,7 @@ async function checkRateLimits() {
   return true;
 }
 
-async function runActionForRecord(record: RecordState, actionType: 'analyze' | 'analyze_no_images' | 'generate_images') {
+async function runActionForRecord(record: RecordState, actionType: GenerationAction) {
   if (!checkIfDialogOpen()) {
     return;
   }
@@ -722,6 +792,7 @@ async function runActionForRecord(record: RecordState, actionType: 'analyze' | '
     });
   } catch (e) {
     record.aiStatus[responseFlag] = true;
+    registerGenerationFailure(record, actionType, e instanceof Error ? e.message : String(e));
     throw e;
   }
 
@@ -731,11 +802,7 @@ async function runActionForRecord(record: RecordState, actionType: 'analyze' | '
 
   if (createJobResponse?.error || !createJobResponse?.jobId) {
     record.aiStatus[responseFlag] = true;
-    adminforth.alert({
-      message: t(`Failed to ${actionType.replace('_', ' ')}. Please, try to re-run the action.`),
-      variant: 'danger',
-      timeout: 'unlimited',
-    });
+    registerGenerationFailure(record, actionType, createJobResponse?.error || `Failed to ${getActionLabel(actionType)}. Please, try to re-run the action.`);
     throw new Error(createJobResponse?.error || 'Failed to create job');
   }
 
@@ -745,7 +812,7 @@ async function runActionForRecord(record: RecordState, actionType: 'analyze' | '
 async function pollJob(
   record: RecordState,
   jobId: string,
-  actionType: 'analyze' | 'analyze_no_images' | 'generate_images',
+  actionType: GenerationAction,
   responseFlag: keyof RecordState['aiStatus']
 ) {
   let isInProgress = true;
@@ -762,6 +829,7 @@ async function pollJob(
     }
     if (jobResponse?.error) {
       record.aiStatus[responseFlag] = true;
+      registerGenerationFailure(record, actionType, jobResponse.error);
       throw new Error(jobResponse.error);
     }
     const jobStatus = jobResponse?.job?.status;
@@ -783,7 +851,7 @@ async function pollJob(
   }
 }
 
-function applyJobResult(record: RecordState, job: any, actionType: 'analyze' | 'analyze_no_images' | 'generate_images') {
+function applyJobResult(record: RecordState, job: any, actionType: GenerationAction) {
   if (actionType === 'generate_images') {
     for (const fieldName of props.meta.outputImageFields || []) {
       const resultValue = job?.result?.[fieldName];
@@ -805,12 +873,8 @@ function applyJobResult(record: RecordState, job: any, actionType: 'analyze' | '
   touchRecords();
 }
 
-function applyJobFailure(record: RecordState, job: any, actionType: 'analyze' | 'analyze_no_images' | 'generate_images') {
-  adminforth.alert({
-    message: t(`Generation action "${actionType.replace('_', ' ')}" failed for record: ${record.id}. Error: ${job?.error || 'Unknown error'}`),
-    variant: 'danger',
-    timeout: 'unlimited',
-  });
+function applyJobFailure(record: RecordState, job: any, actionType: GenerationAction) {
+  registerGenerationFailure(record, actionType, job?.error || 'Unknown error');
   if (actionType === 'generate_images') {
     record.imageGenerationFailed = true;
     record.imageGenerationErrorMessage = job?.error || 'Unknown error';
@@ -826,7 +890,7 @@ function applyJobFailure(record: RecordState, job: any, actionType: 'analyze' |
   touchRecords();
 }
 
-async function waitForRefresh(actionType: 'analyze' | 'analyze_no_images' | 'generate_images') {
+async function waitForRefresh(actionType: GenerationAction) {
   if (actionType === 'generate_images') {
     await new Promise(resolve => setTimeout(resolve, props.meta.refreshRates?.generateImages));
   } else if (actionType === 'analyze') {
@@ -1532,4 +1596,4 @@ async function saveCurrentGenerated() {
   props.updateList();
 }
 
-</script>
+</script>

index.ts

@@ -1017,16 +1017,37 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get-job-status`,
-      handler: async ({ body, adminUser, headers }) => {
+      handler: async ({ body, adminUser, headers, response }) => {
         const jobId = body.jobId;
         if (!jobId) {
-          return { error: "Can't find job id" };
+          response.setStatus(400);
+
+          return {
+            ok: false,
+            error: "Can't find job id",
+          };
         }
         const job = jobs.get(jobId);
         if (!job) {
-          return { error: "Job not found" };
+          response.setStatus(404);
+
+          return {
+            ok: false,
+            error: "Job not found",
+          };
         }
-        return { ok: true, job };
+        if (job.status === 'failed') {
+          response.setStatus(500);
+
+          return {
+            ok: false,
+            error: job.error
+          };
+        }
+        return {
+          ok: true,
+          job,
+        };
       }
     });
 

package.json

@@ -25,7 +25,7 @@
   "description": "Bulk AI workflow plugin for AdminForth for batch field generation and image processing",
   "devDependencies": {
     "@types/node": "latest",
-    "adminforth": "^2.50.0",
+    "adminforth": "^2.70.0",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"