Update app.py

app.py

@@ -18,19 +18,7 @@ current_outputs = []
 current_page = 0
 page_size = 10
 
-# Default generation settings
-DEFAULT_SETTINGS = {
-    "model_id": "048b4ea3-5586-47ed-900f-f4341c96bdb2",  # SDXL 1.0
-    "width": 1024,
-    "height": 1024,
-    "num_outputs": 1,
-    "guidance_scale": 7.5,
-    "inference_steps": 30,
-    "scheduler_id": "euler",
-    "seed": None
-}
-
-# Get available models for dropdown
+# ========== MODEL AND SCHEDULER MANAGEMENT ==========
 def get_model_list():
     """Get list of models for dropdown"""
     try:
@@ -40,31 +28,39 @@ def get_model_list():
             models = response.json().get('models', [])
             # Sort: default first, then by name
             models.sort(key=lambda x: (not x.get('is_default', False), x.get('name', '')))
-            return [(m['name'], m['id']) for m in models]
-    except:
-        pass
-    return [("SDXL 1.0", "048b4ea3-5586-47ed-900f-f4341c96bdb2")]
+            return [(f"{m['name']}", m['id']) for m in models]
+    except Exception as e:
+        print(f"Error fetching models: {e}")
+    # Fallback to SDXL
+    return [("SDXL 1.0", "22b0857d-7edc-4d00-9cd9-45aa509db093")]
 
-# Get schedulers for dropdown
 def get_scheduler_list():
     """Get list of schedulers"""
     return [
-        ("Euler", "euler"),
-        ("Euler A", "euler_a"),
-        ("DDIM", "ddim"),
-        ("DPMSolver++", "dpmpp_2m"),
-        ("DPM++ 2M Karras", "dpmpp_2m_karras"),
-        ("DPM++ SDE", "dpmpp_sde"),
-        ("DPM++ SDE Karras", "dpmpp_sde_karras"),
-        ("Heun", "heun"),
-        ("LMS", "lms"),
-        ("LMS Karras", "lms_karras")
+        ("Euler", "b7224e56-1440-43b9-ac86-66d66f9e8c91"),
+        ("Euler A", "6fb13a76-990d-49df-a2ab-7d9d22c33e3d"),
+        ("DDIM", "c5a0bad3-bd9d-4c5c-96e3-9d8e8c0c7a6b"),
+        ("DPMSolver++", "e9c3a7b3-2b5c-4a5d-8e2d-7b1c9a3d4e5f"),
+        ("DPM++ 2M Karras", "f1c3a7b3-2b5c-4a5d-8e2d-7b1c9a3d4e5f"),
+        ("DPM++ SDE", "a1c3a7b3-2b5c-4a5d-8e2d-7b1c9a3d4e5f"),
+        ("DPM++ SDE Karras", "b1c3a7b3-2b5c-4a5d-8e2d-7b1c9a3d4e5f"),
+        ("Heun", "c1c3a7b3-2b5c-4a5d-8e2d-7b1c9a3d4e5f"),
+        ("LMS", "d1c3a7b3-2b5c-4a5d-8e2d-7b1c9a3d4e5f"),
+        ("LMS Karras", "e1c3a7b3-2b5c-4a5d-8e2d-7b1c9a3d4e5f")
     ]
 
 # Initialize model and scheduler lists
 MODELS = get_model_list()
 SCHEDULERS = get_scheduler_list()
 
+# Create mapping dictionaries
+MODEL_MAP = {name: id for name, id in MODELS}
+SCHEDULER_MAP = {name: id for name, id in SCHEDULERS}
+
+# Default values
+DEFAULT_MODEL = MODELS[0][0] if MODELS else "SDXL 1.0"
+DEFAULT_SCHEDULER = SCHEDULERS[0][0] if SCHEDULERS else "Euler"
+
 # ========== MODELS TAB ==========
 def get_models():
     """Fetch and display available models"""
@@ -102,13 +98,17 @@ def get_models():
         return f"❌ Error: {str(e)}", "No data"
 
 # ========== GENERATE TAB ==========
-def generate_image(prompt, negative_prompt, model_id, width, height, 
+def generate_image(prompt, negative_prompt, model_name, width, height, 
                    num_outputs, guidance_scale, inference_steps, 
-                   scheduler_id, seed, init_image_url, prompt_strength):
+                   scheduler_name, seed, init_image_url, prompt_strength):
     """Generate images using StableCog API"""
     try:
         url = f'{API_HOST}/v1/image/generation/create'
         
+        # Get actual IDs from maps
+        model_id = MODEL_MAP.get(model_name, MODELS[0][1] if MODELS else "22b0857d-7edc-4d00-9cd9-45aa509db093")
+        scheduler_id = SCHEDULER_MAP.get(scheduler_name, "b7224e56-1440-43b9-ac86-66d66f9e8c91")
+        
         # Prepare request data
         data = {
             "prompt": prompt,
@@ -136,14 +136,20 @@ def generate_image(prompt, negative_prompt, model_id, width, height,
             if prompt_strength is not None:
                 data["prompt_strength"] = float(prompt_strength)
         
+        # Debug: Print the data being sent
+        print(f"Sending data: {json.dumps(data, indent=2)}")
+        
         # Make API request
         response = requests.post(
             url, 
-            data=json.dumps(data), 
+            json=data,  # Use json parameter instead of data=json.dumps()
             headers=headers,
             timeout=30  # Longer timeout for generation
         )
         
+        print(f"Response status: {response.status_code}")
+        print(f"Response text: {response.text[:200]}...")
+        
         if response.status_code == 200:
             result = response.json()
             outputs = result.get('outputs', [])
@@ -178,33 +184,22 @@ def generate_image(prompt, negative_prompt, model_id, width, height,
             for key, value in settings.items():
                 display_text += f"   {key}: {value}\n"
             
-            return display_text, gallery_html, str(result), None
+            return display_text, gallery_html, str(result)
             
         else:
             error_msg = f"❌ Generation failed: {response.status_code}"
-            return error_msg, "", f"Error: {response.text}", None
+            try:
+                error_detail = response.json()
+                error_msg += f"\nDetails: {json.dumps(error_detail, indent=2)}"
+            except:
+                error_msg += f"\nResponse: {response.text}"
+            return error_msg, "", error_msg
             
     except Exception as e:
         error_msg = f"❌ Error: {str(e)}"
-        return error_msg, "", "No data", None
+        return error_msg, "", error_msg
 
 # ========== OUTPUTS TAB ==========
-def fetch_outputs():
-    """Fetch outputs from API"""
-    global current_outputs
-    try:
-        url = f'{API_HOST}/v1/image/generation/outputs'
-        response = requests.get(url, headers=headers, timeout=10)
-        
-        if response.status_code == 200:
-            data = response.json()
-            current_outputs = data.get('outputs', [])
-            return data
-        else:
-            return None
-    except:
-        return None
-
 def create_gallery_html(image_urls, title="Gallery"):
     """Create HTML gallery with lightbox"""
     html = f"""
@@ -335,6 +330,22 @@ def create_gallery_html(image_urls, title="Gallery"):
     html += "</div>"
     return html
 
+def fetch_outputs():
+    """Fetch outputs from API"""
+    global current_outputs
+    try:
+        url = f'{API_HOST}/v1/image/generation/outputs'
+        response = requests.get(url, headers=headers, timeout=10)
+        
+        if response.status_code == 200:
+            data = response.json()
+            current_outputs = data.get('outputs', [])
+            return data
+        else:
+            return None
+    except:
+        return None
+
 def update_outputs_display():
     """Update outputs display with current page"""
     global current_outputs, current_page, page_size
@@ -517,27 +528,25 @@ with gr.Blocks(title="StableCog Dashboard", theme=gr.themes.Soft()) as demo:
                         gr.Markdown("### ⚙️ Generation Settings")
                         
                         with gr.Row():
-                            model_id = gr.Dropdown(
+                            model_dropdown = gr.Dropdown(
                                 label="Model",
                                 choices=[m[0] for m in MODELS],
-                                value=MODELS[0][0] if MODELS else "SDXL 1.0"
+                                value=DEFAULT_MODEL
                             )
-                            # Store actual model IDs
-                            model_map = {m[0]: m[1] for m in MODELS}
-                            
+                        
                         with gr.Row():
                             width = gr.Slider(
                                 label="Width",
                                 minimum=256,
                                 maximum=1024,
-                                value=1024,
+                                value=768,
                                 step=8
                             )
                             height = gr.Slider(
                                 label="Height",
                                 minimum=256,
                                 maximum=1024,
-                                value=1024,
+                                value=768,
                                 step=8
                             )
                         
@@ -553,7 +562,7 @@ with gr.Blocks(title="StableCog Dashboard", theme=gr.themes.Soft()) as demo:
                             label="Guidance Scale",
                             minimum=1.0,
                             maximum=20.0,
-                            value=7.5,
+                            value=7.0,
                             step=0.5
                         )
                         
@@ -566,13 +575,11 @@ with gr.Blocks(title="StableCog Dashboard", theme=gr.themes.Soft()) as demo:
                         )
                         
                         with gr.Row():
-                            scheduler_id = gr.Dropdown(
+                            scheduler_dropdown = gr.Dropdown(
                                 label="Scheduler",
                                 choices=[s[0] for s in SCHEDULERS],
-                                value="Euler"
+                                value=DEFAULT_SCHEDULER
                             )
-                            # Store actual scheduler IDs
-                            scheduler_map = {s[0]: s[1] for s in SCHEDULERS}
                         
                         seed = gr.Textbox(
                             label="Seed (Optional)",
@@ -607,25 +614,12 @@ with gr.Blocks(title="StableCog Dashboard", theme=gr.themes.Soft()) as demo:
                         )
             
             # Connect generate button
-            def on_generate(prompt, negative_prompt, model_name, width, height,
-                          num_outputs, guidance_scale, inference_steps,
-                          scheduler_name, seed, init_image_url, prompt_strength):
-                # Get actual IDs from maps
-                actual_model_id = model_map.get(model_name, MODELS[0][1] if MODELS else DEFAULT_SETTINGS["model_id"])
-                actual_scheduler_id = scheduler_map.get(scheduler_name, "euler")
-                
-                return generate_image(
-                    prompt, negative_prompt, actual_model_id, width, height,
-                    num_outputs, guidance_scale, inference_steps,
-                    actual_scheduler_id, seed, init_image_url, prompt_strength
-                )
-            
             generate_btn.click(
-                on_generate,
+                generate_image,
                 inputs=[
-                    prompt, negative_prompt, model_id, width, height,
+                    prompt, negative_prompt, model_dropdown, width, height,
                     num_outputs, guidance_scale, inference_steps,
-                    scheduler_id, seed, init_image_url, prompt_strength
+                    scheduler_dropdown, seed, init_image_url, prompt_strength
                 ],
                 outputs=[generate_output, generate_gallery, generate_raw]
             )