dup remocal
This commit is contained in:
@@ -73,15 +73,8 @@ const getSuccessMessage = (functionId?: string, title?: string, stepLogs?: any[]
|
||||
}
|
||||
return 'Article drafted successfully.';
|
||||
}
|
||||
// Check for image generation from prompts FIRST (more specific)
|
||||
if (funcName.includes('image') && funcName.includes('from')) {
|
||||
// Image generation from prompts
|
||||
const imageCount = extractCount(/(\d+)\s+image/i, stepLogs || []);
|
||||
if (imageCount) {
|
||||
return `${imageCount} image${imageCount !== '1' ? 's' : ''} generated successfully`;
|
||||
}
|
||||
return 'Images generated successfully';
|
||||
} else if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
// Image prompt generation (generate_image_prompts)
|
||||
if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
// Image prompt generation
|
||||
// Try to extract from SAVE step message first (most reliable)
|
||||
const saveStepLog = stepLogs?.find(log => log.stepName === 'SAVE');
|
||||
@@ -166,17 +159,8 @@ const getStepsForFunction = (functionId?: string, title?: string): Array<{phase:
|
||||
];
|
||||
}
|
||||
|
||||
// Check for image generation from prompts FIRST (more specific)
|
||||
if (funcName.includes('image') && funcName.includes('from')) {
|
||||
// Image generation from prompts
|
||||
return [
|
||||
{ phase: 'INIT', label: 'Validating image prompts' },
|
||||
{ phase: 'PREP', label: 'Preparing image generation queue' },
|
||||
{ phase: 'AI_CALL', label: 'Generating images with AI' },
|
||||
{ phase: 'PARSE', label: 'Processing image URLs' },
|
||||
{ phase: 'SAVE', label: 'Saving image URLs' },
|
||||
];
|
||||
} else if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
// Image prompt generation (generate_image_prompts)
|
||||
if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
// Image prompt generation
|
||||
return [
|
||||
{ phase: 'INIT', label: 'Checking content and image slots' },
|
||||
@@ -392,55 +376,6 @@ export default function ProgressModal({
|
||||
return `${articleCount} article${articleCount !== '1' ? 's' : ''} created`;
|
||||
}
|
||||
}
|
||||
} else if (funcName.includes('image') && funcName.includes('from')) {
|
||||
// Image generation from prompts
|
||||
if (stepPhase === 'PREP') {
|
||||
// Extract image count from PREP step message
|
||||
const imageCount = extractCount(/(\d+)\s+image/i);
|
||||
if (imageCount) {
|
||||
return `Preparing to generate ${imageCount} image${imageCount !== '1' ? 's' : ''}`;
|
||||
}
|
||||
if (stepLog?.message) {
|
||||
const match = stepLog.message.match(/Preparing to generate (\d+)\s+image/i);
|
||||
if (match && match[1]) {
|
||||
return `Preparing to generate ${match[1]} image${match[1] !== '1' ? 's' : ''}`;
|
||||
}
|
||||
}
|
||||
return 'Preparing image generation queue';
|
||||
} else if (stepPhase === 'AI_CALL') {
|
||||
// Extract current image number from message
|
||||
const match = stepLog?.message?.match(/Generating.*image (\d+)/i);
|
||||
if (match && match[1]) {
|
||||
return `Generating image ${match[1]} with AI`;
|
||||
}
|
||||
return 'Generating images with AI';
|
||||
} else if (stepPhase === 'PARSE') {
|
||||
// Extract image count from PARSE step
|
||||
const imageCount = extractCount(/(\d+)\s+image/i);
|
||||
if (imageCount) {
|
||||
return `${imageCount} image${imageCount !== '1' ? 's' : ''} generated successfully`;
|
||||
}
|
||||
if (stepLog?.message) {
|
||||
const match = stepLog.message.match(/(\d+)\s+image.*generated/i);
|
||||
if (match && match[1]) {
|
||||
return `${match[1]} image${match[1] !== '1' ? 's' : ''} generated successfully`;
|
||||
}
|
||||
}
|
||||
return 'Processing image URLs';
|
||||
} else if (stepPhase === 'SAVE') {
|
||||
// Extract image count from SAVE step
|
||||
const imageCount = extractCount(/(\d+)\s+image/i);
|
||||
if (imageCount) {
|
||||
return `Saving ${imageCount} image${imageCount !== '1' ? 's' : ''}`;
|
||||
}
|
||||
if (stepLog?.message) {
|
||||
const match = stepLog.message.match(/Saved image (\d+)/i);
|
||||
if (match && match[1]) {
|
||||
return `Saving image ${match[1]}`;
|
||||
}
|
||||
}
|
||||
return 'Saving image URLs';
|
||||
}
|
||||
} else if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
// Image prompt generation
|
||||
if (stepPhase === 'PREP') {
|
||||
@@ -658,30 +593,17 @@ export default function ProgressModal({
|
||||
} else if (funcName.includes('idea')) {
|
||||
// For idea generation, use fixed heading
|
||||
return 'Generating Content Ideas & Outline';
|
||||
} else if (funcName.includes('image') && funcName.includes('from')) {
|
||||
// For image generation from prompts
|
||||
return 'Generate Images';
|
||||
} else if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
// For image prompt generation
|
||||
return 'Smart Image Prompts';
|
||||
} else if (funcName.includes('image')) {
|
||||
// Fallback for other image functions
|
||||
return 'Generate Images';
|
||||
}
|
||||
return title;
|
||||
})()}
|
||||
</h3>
|
||||
{/* Subtitle for image functions */}
|
||||
{/* Subtitle for image prompt generation */}
|
||||
{(() => {
|
||||
const funcName = (functionId || title || '').toLowerCase();
|
||||
if (funcName.includes('image') && funcName.includes('from')) {
|
||||
// Image generation from prompts
|
||||
return (
|
||||
<p className="text-sm text-gray-500 dark:text-gray-400 text-center mt-1">
|
||||
Generating images from prompts using AI
|
||||
</p>
|
||||
);
|
||||
} else if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
if (funcName.includes('image') && (funcName.includes('prompt') || funcName.includes('extract'))) {
|
||||
// Image prompt generation
|
||||
return (
|
||||
<p className="text-sm text-gray-500 dark:text-gray-400 text-center mt-1">
|
||||
@@ -693,22 +615,7 @@ export default function ProgressModal({
|
||||
})()}
|
||||
{!showSuccess && status !== 'completed' && (
|
||||
<p className="text-sm text-gray-600 dark:text-gray-400 text-center">
|
||||
{(() => {
|
||||
const funcName = (functionId || title || '').toLowerCase();
|
||||
// For image generation, show a more specific message
|
||||
if (funcName.includes('image') && funcName.includes('from')) {
|
||||
// Get current step message from step logs
|
||||
const currentStepLog = stepLogs.find(log => log.stepName === currentPhase);
|
||||
if (currentStepLog?.message) {
|
||||
return currentStepLog.message;
|
||||
}
|
||||
// Fallback to step label
|
||||
const currentStep = steps.find(s => s.phase === currentPhase);
|
||||
return currentStep?.label || 'Generating images...';
|
||||
}
|
||||
// For other functions, use the message prop
|
||||
return message;
|
||||
})()}
|
||||
{message}
|
||||
</p>
|
||||
)}
|
||||
{status === 'completed' && !allStepsVisuallyCompleted && (
|
||||
|
||||
Reference in New Issue
Block a user