fixed retry bug. fixed highdream

data/models.json

@@ -1,6 +1,5 @@
-[
-  { "id": "JuggernautXL", "name": "JuggernautXL", "free": true },
-  { "id": "hidream", "name": "hidream", "free": false },
+[{ "id": "JuggernautXL", "name": "JuggernautXL", "free": true },
+  { "id": "qwen-image", "name": "qwen-image", "free": false },
   { "id": "FLUX.1-dev", "name": "FLUX.1-dev", "free": false },
   { "id": "FLUX.1-schnell", "name": "FLUX.1-schnell", "free": false },
   { "id": "chroma", "name": "chroma", "free": true },

public/index.html

@@ -1052,7 +1052,7 @@
   }
 
   function genRandomSeed() {
-    return Math.floor(Math.random() * 4294967295);
+    return Math.floor(Math.random() * 100000000);
   }
 
   async function fetchModels() {
@@ -1194,6 +1194,15 @@
     return params;
   }
 
+  // Helper to get display size string (resolution for hidream, width x height for others)
+  function getDisplaySize(params) {
+    const isHidream = (params.model || '').toLowerCase() === 'hidream';
+    if (isHidream && params.resolution) {
+      return params.resolution;
+    }
+    return `${params.width}x${params.height}`;
+  }
+
   function createPlaceholderCard(i, params) {
     const wrap = document.createElement('div');
     wrap.className = 'card';
@@ -1203,7 +1212,7 @@
     wrap.appendChild(ph);
     const meta = document.createElement('div');
     meta.className = 'meta';
-    meta.innerHTML = `${params.model} | ${params.width}x${params.height}`;
+    meta.innerHTML = `${params.model} | ${getDisplaySize(params)}`;
     wrap.appendChild(meta);
     qs('#gallery').prepend(wrap);
     return wrap;
@@ -1248,7 +1257,7 @@
     const metaContent = document.createElement('div');
     metaContent.className = 'meta-content';
     metaContent.innerHTML = `
-      <div style="margin-bottom: 4px;">尺寸: ${params.width}x${params.height}</div>
+      <div style="margin-bottom: 4px;">尺寸: ${getDisplaySize(params)}</div>
       <div style="margin-bottom: 4px;">步数: ${params.num_inference_steps} | 引导: ${params.guidance_scale}</div>
       <div style="margin-bottom: 8px; font-size: 12px; line-height: 1.3; word-break: break-all;">${params.prompt}</div>
     `;
@@ -2033,7 +2042,7 @@ function isViewerOpen() {
     
     modalImg.src = imageUrl;
     if (params) {
-      modalInfo.textContent = `${params.width}×${params.height} | ${params.model}`;
+      modalInfo.textContent = `${getDisplaySize(params)} | ${params.model}`;
     } else {
       modalInfo.textContent = '';
     }

server.js

@@ -456,23 +456,16 @@ app.post('/api/generate', async (req, res) => {
     };
     const variantA = {
       model: targetModel,
-      input_args: isHidream
-        ? { ...inputExtras, ...commonArgs }
-        : { ...inputExtras, ...commonArgs, width: flat.width, height: flat.height }
+      input_args: { ...inputExtras, ...commonArgs, width: flat.width, height: flat.height }
     };
 
-    const variantB = isHidream
-      ? {
-          model: targetModel,
-          input_args: { ...inputExtras, ...commonArgs }
-        }
-      : {
-          model: targetModel,
-          ...topLevelExtras,
-          ...commonArgs,
-          width: flat.width,
-          height: flat.height
-        };
+    const variantB = {
+      model: targetModel,
+      ...topLevelExtras,
+      ...commonArgs,
+      width: flat.width,
+      height: flat.height
+    };
 
     // Hidream-specific flat payload expected by chutes-hidream endpoint (no input_args)
     const variantHidreamFlat = isHidream ? {
@@ -621,70 +614,70 @@ app.post('/api/generate', async (req, res) => {
     }
 
     let result;
-
-    // If the model prefers minimal payload, choose ordering per model.
-    // For hunyuan-image-3: nested-minimal (input_args with size) FIRST to ensure size is honored.
-    // For Z-Image-Turbo: use dedicated nested payload FIRST
-    if (preferMinimal) {
-      const isHunyuan =
-        (typeof flat.model === 'string' && flat.model.toLowerCase() === 'hunyuan-image-3') ||
-        /hunyuan-image-3/i.test(generateUrl) ||
-        /hunyuan-image-3/i.test(String(targetModel || ''));
-      
-      if (isZImageTurbo) {
-        // Z-Image-Turbo: try minimal payload first (as shown in curl example)
-        try {
-          result = await tryCall(variantZImageMinimal, 'z-image-turbo-minimal', generateUrl);
-        } catch (e0) {}
-      } else if (isHunyuan) {
-        try {
-          result = await tryCall(variantFlatMinimal, 'flat-minimal', generateUrl);
-        } catch (e0) {}
-      } else {
+    let lastError = null;
+    
+    const isHunyuan =
+      (typeof flat.model === 'string' && flat.model.toLowerCase() === 'hunyuan-image-3') ||
+      /hunyuan-image-3/i.test(generateUrl) ||
+      /hunyuan-image-3/i.test(String(targetModel || ''));
+
+    // Model-specific payloads FIRST - try the correct format before generic fallbacks
+    if (isHidream) {
+      // HiDream: uses resolution instead of width/height
+      try {
+        result = await tryCall(variantHidreamFlat, 'hidream-flat', generateUrl);
+      } catch (eH) { lastError = eH; }
+    } else if (isZImageTurbo) {
+      // Z-Image-Turbo: try minimal payload first (as shown in curl example)
+      try {
+        result = await tryCall(variantZImageMinimal, 'z-image-turbo-minimal', generateUrl);
+      } catch (e0) { lastError = e0; }
+      // Fallback to nested payload
+      if (!result && variantZImageNested) {
         try {
-          result = await tryCall(variantFlatMinimal, 'flat-minimal', generateUrl);
-        } catch (e0) {}
-        if (!result) {
-          try {
-            result = await tryCall(variantCMinimal, 'nested-minimal', generateUrl);
-          } catch (e1) {}
-        }
+          result = await tryCall(variantZImageNested, 'z-image-turbo-nested', generateUrl);
+        } catch (eZ) { lastError = eZ; }
       }
-    }
-
-    // Only try full payload if minimal didn't succeed
-    if (!result) {
-      let lastError = null;
-
+    } else if (isQwenEdit) {
+      // Qwen-image-edit: try official flat payload first
+      try {
+        result = await tryCall(variantQwenFlat, 'qwen-flat', generateUrl);
+      } catch (eQ) { lastError = eQ; }
+    } else if (isHunyuan) {
+      // Hunyuan: uses size instead of width/height
+      try {
+        result = await tryCall(variantFlatMinimal, 'flat-minimal', generateUrl);
+      } catch (e0) { lastError = e0; }
       if (!result) {
-        try { result = await tryCall(variantA, 'nested', generateUrl); }
-        catch (e1) { lastError = e1; }
+        try {
+          result = await tryCall(variantCMinimal, 'nested-minimal', generateUrl);
+        } catch (e1) { lastError = e1; }
       }
-
+    } else if (preferMinimal) {
+      // Other models with minimal preference
+      try {
+        result = await tryCall(variantFlatMinimal, 'flat-minimal', generateUrl);
+      } catch (e0) { lastError = e0; }
       if (!result) {
-        try { result = await tryCall(variantB, 'flat', generateUrl); }
-        catch (e2) { lastError = e2; }
-      }
-
-      // qwen-image-edit official flat payload (no model)
-      if (!result && isQwenEdit && variantQwenFlat) {
-        try { result = await tryCall(variantQwenFlat, 'qwen-flat', generateUrl); }
-        catch (eQ) { lastError = eQ; }
+        try {
+          result = await tryCall(variantCMinimal, 'nested-minimal', generateUrl);
+        } catch (e1) { lastError = e1; }
       }
+    }
 
-      // hidream official flat payload (no model)
-      if (!result && isHidream && variantHidreamFlat) {
-        try { result = await tryCall(variantHidreamFlat, 'hidream-flat', generateUrl); }
-        catch (eH) { lastError = eH; }
-      }
+    // Generic fallback payloads - only try if model-specific didn't succeed
+    if (!result) {
+      try { result = await tryCall(variantA, 'nested', generateUrl); }
+      catch (e1) { lastError = e1; }
+    }
 
-      // Z-Image-Turbo nested payload - fallback if not tried in minimal mode
-      if (!result && isZImageTurbo && variantZImageNested && !preferMinimal) {
-        try { result = await tryCall(variantZImageNested, 'z-image-turbo-nested', generateUrl); }
-        catch (eZ) { lastError = eZ; }
-      }
+    if (!result) {
+      try { result = await tryCall(variantB, 'flat', generateUrl); }
+      catch (e2) { lastError = e2; }
+    }
 
-      if (!result) {
+    // Final fallback logic
+    if (!result) {
         // Auto fallback to another model when capacity/infrastructure errors (disabled when NO_FALLBACK=true)
         const capacityCodes = ['UPSTREAM_CAPACITY_EXHAUSTED','UPSTREAM_NO_INSTANCES','UPSTREAM_INFRASTRUCTURE','UPSTREAM_BAD_GATEWAY'];
         if (AUTO_FALLBACK && !NO_FALLBACK && lastError && capacityCodes.includes(lastError.code || '')) {
@@ -739,14 +732,13 @@ app.post('/api/generate', async (req, res) => {
           }
         }
 
-        const status = (lastError && lastError.status) || 502;
-        return res.status(status).json({
-          ok: false,
-          error: (lastError && (lastError.hint || lastError.message)) || 'Upstream error',
-          code: (lastError && lastError.code) || 'UPSTREAM_ERROR',
-          upstream_model: targetModel
-        });
-      }
+      const status = (lastError && lastError.status) || 502;
+      return res.status(status).json({
+        ok: false,
+        error: (lastError && (lastError.hint || lastError.message)) || 'Upstream error',
+        code: (lastError && lastError.code) || 'UPSTREAM_ERROR',
+        upstream_model: targetModel
+      });
     }
 
     return res.json({