Update app.py

app.py

@@ -7,22 +7,19 @@ from concurrent.futures import ThreadPoolExecutor
 gemini_key = os.getenv("GEMINI_API_KEY")
 samba_key = os.getenv("SAMBANOVA_API_KEY") 
 github_key = os.getenv("GITHUB_TOKEN")
-hf_token = os.getenv("ONCHI_AI_V3_2") # For Qwen, Media, Video
+hf_token = os.getenv("ONCHI_AI_V3_2")
 
-# --- 2. THE FULL 2025 ARSENAL (12 Models) ---
+# --- 2. THE 2025 GOD SQUAD (12 Models) ---
 GENERALS = [
-    # --- THE BIG THREE ---
+    # verified: Llama 4 Maverick (SambaNova)
+    ("🚀 Llama 4 Maverick", "samba", "Llama-4-Maverick-17B-128E-Instruct"),
+    ("🦙 Llama 3.3 70B", "samba", "Meta-Llama-3.3-70B-Instruct"),
     ("💎 Gemini 3.0 Pro", "google", "gemini-3.0-pro"),
     ("🦁 GPT-5", "github", "gpt-5"),
-    ("🚀 Llama 4 Maverick", "samba", "Llama-4-Maverick-17B-128E-Instruct"),
-    
-    # --- THE SPECIALISTS ---
     ("🌪️ Mistral 5 Le Grande", "github", "Mistral-5-LeGrande"),
     ("🧠 Phi-4 Genius", "github", "Phi-4-Genius"),
     ("⌘ Cohere Command X", "github", "Cohere-command-x"),
     ("🐍 Jamba 2 Hybrid", "github", "AI21-Jamba-2-Hybrid"),
-    
-    # --- THE VISIONARIES ---
     ("👁️ Llama Vision", "samba", "Llama-3.2-90B-Vision-Instruct"),
     ("🔭 Llama Scout", "samba", "Llama-Scout-Verified"),
     ("🐉 Qwen 3 Max", "hf", "Qwen/Qwen3-Max-Instruct"), 
@@ -46,17 +43,15 @@ def generate_media(prompt, media_type):
         resp = requests.post(api_url, headers=headers, json={"inputs": prompt}, timeout=40)
         if resp.status_code != 200: return f"Media Error: {resp.text}"
         
-        # Save file to disk so Gradio can show it
         filename = f"output.{'mp3' if media_type == 'audio' else 'mp4' if media_type == 'video' else 'jpg'}"
         with open(filename, "wb") as f:
             f.write(resp.content)
         return filename
     except Exception as e: return f"Error: {str(e)}"
 
-# --- 4. TEXT ENGINE (Routing to 4 Different Clouds) ---
+# --- 4. TEXT ENGINE ---
 def call_text_model(prompt, model_type, model_id):
     try:
-        # GOOGLE (Gemini 3)
         if model_type == "google":
             if not gemini_key: return "Error: No Key"
             url = f"https://generativelanguage.googleapis.com/v1beta/models/{model_id}:generateContent?key={gemini_key}"
@@ -64,7 +59,6 @@ def call_text_model(prompt, model_type, model_id):
             if resp.status_code != 200: return f"Error {resp.status_code}"
             return resp.json()['candidates'][0]['content']['parts'][0]['text']
 
-        # SAMBANOVA (Llama 4, Scout, Vision)
         elif model_type == "samba":
             if not samba_key: return "Error: No Key"
             resp = requests.post(
@@ -75,7 +69,6 @@ def call_text_model(prompt, model_type, model_id):
             if resp.status_code != 200: return f"Error {resp.status_code}"
             return resp.json()['choices'][0]['message']['content']
 
-        # GITHUB MODELS (GPT-5, Mistral 5, Phi 4, Cohere, Jamba)
         elif model_type == "github":
             if not github_key: return "Error: No Key"
             resp = requests.post(
@@ -83,10 +76,10 @@ def call_text_model(prompt, model_type, model_id):
                 headers={"Authorization": f"Bearer {github_key}", "Content-Type": "application/json"},
                 json={"model": model_id, "messages": [{"role": "user", "content": prompt}], "max_tokens": 1000}, timeout=25
             )
-            if resp.status_code != 200: return f"Error {resp.status_code}"
+            # Fallback for experimental IDs
+            if resp.status_code != 200: return " [Waitlist/Error] "
             return resp.json()['choices'][0]['message']['content']
 
-        # HUGGING FACE (Qwen 3 Max)
         elif model_type == "hf":
             if not hf_token: return "Error: No Key"
             resp = requests.post(
@@ -111,32 +104,21 @@ def call_boss(prompt, reports):
         return "🚀 **Llama 4 Maverick Synthesis:**\n\n" + resp.json()['choices'][0]['message']['content']
     except Exception as e: return f"Synthesis Error: {str(e)}"
 
-# --- 6. ORCHESTRATOR ---
+# --- 6. ORCHESTRATOR (GRADIO 4 COMPATIBLE) ---
 def run_swarm(prompt, history):
-    if history is None: history = []
-    
-    # 1. Detect Media Requests
-    lower_prompt = prompt.lower()
-    if "image" in lower_prompt or "draw" in lower_prompt:
-        history.append([prompt, "🎨 Generating Image (Flux)..."])
-        yield history, None, None, None
-        img_path = generate_media(prompt, "image")
-        history[-1][1] = "🎨 Image Generated Below"
-        yield history, img_path, None, None
-        return
-        
-    if "music" in lower_prompt or "song" in lower_prompt:
-        history.append([prompt, "🎵 Generating Audio (MusicGen)..."])
-        yield history, None, None, None
-        aud_path = generate_media(prompt, "audio")
-        history[-1][1] = "🎵 Audio Generated Below"
-        yield history, None, aud_path, None
-        return
-
-    # 2. Run Text Swarm
-    history.append([prompt, "⚡ Deploying FULL 2025 SWARM (12 Models)..."])
+    # Gradio 4 Format: List of Dictionaries
+    history.append({"role": "user", "content": prompt})
+    history.append({"role": "assistant", "content": "⚡ Deploying 2025 GOD SQUAD..."})
     yield history, None, None, None 
 
+    # Check Media
+    lower = prompt.lower()
+    if "draw" in lower or "image" in lower:
+        img = generate_media(prompt, "image")
+        history[-1]['content'] = "🎨 Image Generated!"
+        yield history, img, None, None
+        return
+
     reports = ""
     successful = 0
     
@@ -148,31 +130,29 @@ def run_swarm(prompt, history):
                 res = future.result()
                 if "Error" not in res: successful += 1
                 reports += f"\n=== {name} ===\n{res}\n"
-                history[-1][1] = f"✅ {successful}/10 Models Reported...\nWaiting for Maverick..."
+                history[-1]['content'] = f"✅ {successful}/10 Models Reported...\nWaiting for Maverick..."
                 yield history, None, None, None
             except: pass
 
     final = call_boss(prompt, reports)
-    history[-1][1] = final
+    history[-1]['content'] = final
     yield history, None, None, None
 
-# --- 7. UI ---
+# --- 7. UI (MODERN) ---
 with gr.Blocks(title="ONCHI AI GOD MODE") as demo:
     gr.Markdown("# ⚡ ONCHI AI GOD MODE (2025)")
-    gr.Markdown("Gemini 3.0 • GPT-5 • Llama 4 • Qwen 3 • Mistral 5 • Phi 4 • Vision • Audio • Video")
     
-    chatbot = gr.Chatbot(height=500)
+    # CRITICAL: type="messages" matches the Dictionary format used above
+    chatbot = gr.Chatbot(height=500, type="messages")
     
-    # MEDIA OUTPUTS
     with gr.Row():
-        img_out = gr.Image(label="Generated Image")
-        aud_out = gr.Audio(label="Generated Audio")
-        vid_out = gr.Video(label="Generated Video")
+        img_out = gr.Image(label="Image")
+        aud_out = gr.Audio(label="Audio")
+        vid_out = gr.Video(label="Video")
     
     msg = gr.Textbox(label="Command the Swarm")
     btn = gr.Button("IGNITE")
 
-    # Connect everything
     msg.submit(run_swarm, [msg, chatbot], [chatbot, img_out, aud_out, vid_out])
     btn.click(run_swarm, [msg, chatbot], [chatbot, img_out, aud_out, vid_out])