This commit is contained in:
Desktop
2025-11-12 05:13:56 +05:00
parent 84111f5ad6
commit b0e2888b09
4 changed files with 131 additions and 45 deletions

View File

@@ -28,6 +28,8 @@ interface ImageQueueModalProps {
queue: ImageQueueItem[];
totalImages: number;
taskId?: string | null;
model?: string;
provider?: string;
onUpdateQueue?: (queue: ImageQueueItem[]) => void;
onLog?: (log: {
timestamp: string;
@@ -45,6 +47,8 @@ export default function ImageQueueModal({
queue,
totalImages,
taskId,
model,
provider,
onUpdateQueue,
onLog,
}: ImageQueueModalProps) {
@@ -306,6 +310,11 @@ export default function ImageQueueModal({
<p className="text-sm text-gray-500 dark:text-gray-400 mt-1">
Total: {totalImages} image{totalImages !== 1 ? 's' : ''} in queue
</p>
{model && (
<p className="text-xs text-gray-400 dark:text-gray-500 mt-1">
Model: {provider === 'openai' ? 'OpenAI' : provider === 'runware' ? 'Runware' : provider || 'Unknown'} {model === 'dall-e-2' ? 'DALL·E 2' : model === 'dall-e-3' ? 'DALL·E 3' : model}
</p>
)}
</div>
</div>
</div>

View File

@@ -73,6 +73,8 @@ export default function Images() {
const [imageQueue, setImageQueue] = useState<ImageQueueItem[]>([]);
const [currentContentId, setCurrentContentId] = useState<number | null>(null);
const [taskId, setTaskId] = useState<string | null>(null);
const [imageModel, setImageModel] = useState<string | null>(null);
const [imageProvider, setImageProvider] = useState<string | null>(null);
// Load images - wrapped in useCallback
const loadImages = useCallback(async () => {
@@ -231,17 +233,25 @@ export default function Images() {
return;
}
// Fetch image generation settings to get max_in_article_images
// Fetch image generation settings to get max_in_article_images, model, and provider
let maxInArticleImages = 2; // Default
let model = null;
let provider = null;
try {
const settings = await fetchImageGenerationSettings();
if (settings.success && settings.config) {
maxInArticleImages = settings.config.max_in_article_images || 2;
model = settings.config.model || null;
provider = settings.config.provider || null;
}
} catch (error) {
console.warn('Failed to fetch image settings, using default:', error);
}
// Store model and provider for modal display
setImageModel(model);
setImageProvider(provider);
// Build image queue
const queue = buildImageQueue(contentId, maxInArticleImages);
@@ -394,12 +404,16 @@ export default function Images() {
setImageQueue([]);
setCurrentContentId(null);
setTaskId(null);
setImageModel(null);
setImageProvider(null);
// Reload images after closing if generation completed
loadImages();
}}
queue={imageQueue}
totalImages={imageQueue.length}
taskId={taskId}
model={imageModel || undefined}
provider={imageProvider || undefined}
onUpdateQueue={setImageQueue}
onLog={addAiLog}
/>