Update app.py

app.py

@@ -8,12 +8,14 @@ from PIL import Image
 # =========================
 
 GROQ_API_KEY = os.getenv("GROQ_API_KEY")
-# Ideally, use a robust check or default to None if handling locally
-if not GROQ_API_KEY:
-    print("⚠️ GROQ_API_KEY is missing! Ensure it is set in your environment or Secrets.")
 
+# Safe client initialization
 try:
-    client = Groq(api_key=GROQ_API_KEY)
+    if not GROQ_API_KEY:
+        print("⚠️ GROQ_API_KEY is missing! Check Secrets.")
+        client = None
+    else:
+        client = Groq(api_key=GROQ_API_KEY)
 except Exception as e:
     client = None
     print(f"Error initializing Groq client: {e}")
@@ -36,131 +38,102 @@ def image_to_ascii(image_path, output_width=100):
     try:
         img = Image.open(image_path).convert("L")
         w, h = img.size
-        if w == 0:
-            return "[Error: image width is zero]"
+        if w == 0: return "[Error: Width 0]"
         ratio = h / w
         new_height = max(1, int(output_width * ratio * 0.55))
         img = img.resize((output_width, new_height))
         pixels = img.getdata()
         ascii_str = "".join([ASCII_CHARS[pixel // 25] for pixel in pixels])
-        ascii_art = "\n".join(
-            ascii_str[i:i + output_width]
-            for i in range(0, len(ascii_str), output_width)
-        )
+        ascii_art = "\n".join(ascii_str[i:i + output_width] for i in range(0, len(ascii_str), output_width))
         return ascii_art
     except Exception as e:
-        return f"[Error converting image to ASCII: {e}]"
+        return f"[Error: {e}]"
 
 # =========================
-#  CHAT FUNCTION (FIXED FOR MESSAGES FORMAT)
+#  CHAT FUNCTION (ADAPTER FOR OLD GRADIO)
 # =========================
 
-def chat_fn(message, history, mode="Normal Chat", model=DEFAULT_MODEL, image=None, include_ascii=False):
+def chat_fn(message, history, mode, model, image, include_ascii):
     try:
         if not client:
-            return "⚠️ Error: Groq client not initialized. Check API Key."
+            return "⚠️ Error: Groq client not initialized."
 
         # 1. Prepare System Prompt
         system_prompt = MODE_PROMPTS.get(mode, MODE_PROMPTS["Normal Chat"])
         messages = [{"role": "system", "content": str(system_prompt).strip()}]
 
-        # 2. Add History (Now in Dictionary Format)
-        if isinstance(history, list):
-            for msg in history:
-                if isinstance(msg, dict) and "role" in msg and "content" in msg:
-                    messages.append(msg)
-
-        # 3. Handle Image / Current Message
-        safe_message_text = str(message).strip() if message else ""
+        # 2. Convert Old Gradio History (Tuples) to Groq Format (Dicts)
+        # History comes in as: [['User msg 1', 'Bot msg 1'], ['User msg 2', 'Bot msg 2']]
+        for pair in history:
+            if isinstance(pair, (list, tuple)) and len(pair) == 2:
+                user_h, bot_h = pair
+                if user_h:
+                    messages.append({"role": "user", "content": str(user_h)})
+                if bot_h:
+                    messages.append({"role": "assistant", "content": str(bot_h)})
+
+        # 3. Handle Current Message / Image
+        safe_message = str(message).strip() if message else ""
         
         if image and include_ascii:
             try:
+                # Gradio passes image path string
                 ascii_art = image_to_ascii(image)
-                final_content = f"[ASCII Art from Uploaded Image]\n{ascii_art}\n\nUser message: {safe_message_text}"
+                final_content = f"[ASCII Art from Uploaded Image]\n{ascii_art}\n\nUser message: {safe_message}"
             except Exception:
-                final_content = safe_message_text
+                final_content = safe_message
         else:
-            final_content = safe_message_text
+            final_content = safe_message
 
-        # Append current user message
-        if final_content:
-            messages.append({"role": "user", "content": final_content})
-        else:
-            return "⚠️ Error: No message content provided."
+        if not final_content:
+            return "⚠️ Error: Message is empty."
 
-        # 4. Call Groq API
+        messages.append({"role": "user", "content": final_content})
+
+        # 4. Call Groq
         response = client.chat.completions.create(
             model=model,
             messages=messages
         )
-
         return response.choices[0].message.content
 
     except Exception as e:
         return f"⚠️ Error: {str(e)}"
 
 # =========================
-#  UI (FIXED)
+#  UI (COMPATIBLE MODE)
 # =========================
 
-with gr.Blocks(title="🦙 NeoHelper — Eyad’s Groq-powered Assistant") as demo:
-    gr.Markdown("## 🦙 NeoHelper — Eyad’s Groq-powered Assistant")
-    gr.Markdown("Modes: School Helper, Shopping Assistant, Gaming Help, Normal Chat (English only).")
-
+with gr.Blocks(title="NeoHelper") as demo:
+    gr.Markdown("## 🦙 NeoHelper — Eyad’s Assistant")
+    
     with gr.Row():
-        mode_dd = gr.Dropdown(
-            choices=list(MODE_PROMPTS.keys()),
-            value="Normal Chat",
-            label="Mode"
-        )
-        model_dd = gr.Dropdown(
-            choices=[
-                "llama-3.1-8b-instant",
-                "llama-3.1-70b-versatile",
-                "mixtral-8x7b-instruct",
-                "gemma2-9b-it"
-            ],
-            value=DEFAULT_MODEL,
-            label="Model"
-        )
+        mode_dd = gr.Dropdown(list(MODE_PROMPTS.keys()), value="Normal Chat", label="Mode")
+        model_dd = gr.Dropdown([
+            "llama-3.1-8b-instant", 
+            "llama-3.1-70b-versatile", 
+            "mixtral-8x7b-instruct",
+            "gemma2-9b-it"
+        ], value=DEFAULT_MODEL, label="Model")
 
-    # FIX 1: Set type="messages" to match the data format Gradio expects
-    chatbot = gr.Chatbot(height=500, type="messages")
+    # REMOVED type="messages" to fix your error
+    chatbot = gr.Chatbot(height=500) 
 
     with gr.Row():
-        user_input = gr.Textbox(
-            placeholder="Type your message…",
-            show_label=False,
-            lines=2
-        )
+        user_input = gr.Textbox(placeholder="Message...", show_label=False, lines=2)
         send_btn = gr.Button("Send")
 
     image_input = gr.Image(type="filepath", label="Upload Image (Optional)")
     ascii_toggle = gr.Checkbox(label="Convert image to ASCII", value=False)
 
-    def on_send(msg, history, mode, model, image, include_ascii):
-        # Initialize history if empty
-        if history is None:
-            history = []
-        
-        # User message string
-        user_msg = str(msg).strip() if msg else ""
+    def on_send(msg, history, mode, model, img, ascii_on):
+        if history is None: history = []
         
         # Get response
-        reply = chat_fn(
-            user_msg,
-            history, # Pass history as is (list of dicts)
-            mode,
-            model,
-            image,
-            include_ascii
-        )
-        
-        # FIX 2: Append dictionaries {role, content} instead of lists [user, bot]
-        if user_msg:
-            history.append({"role": "user", "content": user_msg})
+        reply = chat_fn(msg, history, mode, model, img, ascii_on)
         
-        history.append({"role": "assistant", "content": str(reply)})
+        # Append as a TUPLE (List of 2 items) for older Gradio versions
+        history.append([str(msg), str(reply)])
         
         return history, ""