Update app.py

app.py

@@ -1,42 +1,50 @@
 # app.py
-
+# ------------------------------------------------------------------
+# AnyCoder / Shasha AI – Gradio front‑end
+# ------------------------------------------------------------------
 """
-Main application file for SHASHA AI, a Gradio-based AI code generation tool.
-
-Provides a UI for generating code in many languages using various AI models.
-Supports text prompts, file uploads, website scraping, optional web search,
-and live previews of HTML output.
+A lightweight Gradio UI that lets users:
+
+1. Pick an AI model (OpenAI / Gemini / Groq / HF etc.).
+2. Provide context via prompt, file upload, or website URL.
+3. Choose a target language (HTML, Python, JS, …) and optionally enable
+   Tavily web‑search enrichment.
+4. Generate code, show a live HTML preview, and keep a session history.
+
+The heavy lifting (provider routing, web‑search merge, code‑post‑processing)
+lives in:
+  • models.py              – central model registry
+  • hf_client.py           – provider‑aware InferenceClient factory
+  • inference.py           – chat_completion / stream_chat_completion
+  • utils.py               – helpers (file/website extraction, history utils)
+  • deploy.py              – sandbox renderer & HF Spaces helpers
 """
 
+from __future__ import annotations
+
+from typing import Any, List, Optional, Tuple
+
 import gradio as gr
-from typing import Optional, Dict, List, Tuple, Any
-
-# --- Local module imports ---
-from constants import (
-    HTML_SYSTEM_PROMPT,
-    TRANSFORMERS_JS_SYSTEM_PROMPT,
-    AVAILABLE_MODELS,
-    DEMO_LIST,
-)
-from hf_client import get_inference_client
+
+from deploy import send_to_sandbox
+from inference import chat_completion
+from models import AVAILABLE_MODELS, ModelInfo, find_model
 from tavily_search import enhance_query_with_search
-from utils import (
+from utils import (  # high‑level utils
+    apply_search_replace_changes,
     extract_text_from_file,
     extract_website_content,
-    apply_search_replace_changes,
-    history_to_messages,
+    format_transformers_js_output,
     history_to_chatbot_messages,
-    remove_code_block,
+    history_to_messages,
     parse_transformers_js_output,
-    format_transformers_js_output,
+    remove_code_block,
 )
-from deploy import send_to_sandbox
 
-# --- Type aliases ---
-History = List[Tuple[str, str]]
-Model = Dict[str, Any]
+# ------------------------------------------------------------------
+# Configuration
+# ------------------------------------------------------------------
 
-# --- Supported languages for dropdown ---
 SUPPORTED_LANGUAGES = [
     "python", "c", "cpp", "markdown", "latex", "json", "html", "css",
     "javascript", "jinja2", "typescript", "yaml", "dockerfile", "shell",
@@ -45,157 +53,158 @@ SUPPORTED_LANGUAGES = [
     "sql-gpSQL", "sql-sparkSQL", "sql-esper"
 ]
 
-def get_model_details(name: str) -> Optional[Model]:
-    for m in AVAILABLE_MODELS:
-        if m["name"] == name:
-            return m
-    return None
+
+SYSTEM_PROMPTS = {
+    "html": (
+        "ONLY USE HTML, CSS AND JAVASCRIPT. Create a modern, responsive UI. "
+        "Return <strong>ONE</strong> HTML file wrapped in ```html ...```."
+    ),
+    "transformers.js": (
+        "You are an expert web developer.  Generate THREE separate files "
+        "(index.html / index.js / style.css) returned as three fenced blocks."
+    ),
+}
+
+
+# ------------------------------------------------------------------
+# Core generation callback
+# ------------------------------------------------------------------
+History = List[Tuple[str, str]]
+
 
 def generation_code(
-    query: Optional[str],
-    file: Optional[str],
-    website_url: Optional[str],
-    current_model: Model,
+    prompt: str | None,
+    file_path: str | None,
+    website_url: str | None,
+    model_name: str,
     enable_search: bool,
     language: str,
-    history: Optional[History],
-) -> Tuple[str, History, str, List[Dict[str, str]]]:
-    query = query or ""
-    history = history or []
+    state_history: History | None,
+) -> Tuple[str, History, str, List[dict[str, str]]]:
+    """Backend function wired to the ✨ Generate button."""
+    prompt = (prompt or "").strip()
+    history = state_history or []
+
+    # ------------------------------------------------------------------
+    # Compose system prompt + context
+    # ------------------------------------------------------------------
+    sys_prompt = SYSTEM_PROMPTS.get(language, f"You are an expert {language} developer.")
+    messages = history_to_messages(history, sys_prompt)
+
+    # --- append file / website context --------------------------------
+    context_parts: list[str] = [prompt]
+
+    if file_path:
+        context_parts.append("[Reference file]")
+        context_parts.append(extract_text_from_file(file_path)[:5000])
+
+    if website_url:
+        website_html = extract_website_content(website_url)
+        if not website_html.startswith("Error"):
+            context_parts.append("[Website content]")
+            context_parts.append(website_html[:8000])
+
+    user_query = "\n\n".join(filter(None, context_parts))
+    user_query = enhance_query_with_search(user_query, enable_search)
+    messages.append({"role": "user", "content": user_query})
+
+    # ------------------------------------------------------------------
+    # Call model via inference.py – provider routing handled inside
+    # ------------------------------------------------------------------
+    model: ModelInfo = find_model(model_name) or AVAILABLE_MODELS[0]
     try:
-        # Choose system prompt based on language
-        if language == "html":
-            system_prompt = HTML_SYSTEM_PROMPT
-        elif language == "transformers.js":
-            system_prompt = TRANSFORMERS_JS_SYSTEM_PROMPT
-        else:
-            # Generic fallback prompt
-            system_prompt = (
-                f"You are an expert {language} developer. "
-                f"Write clean, idiomatic {language} code based on the user's request."
-            )
-
-        model_id = current_model["id"]
-        # Determine provider
-        if model_id.startswith("openai/") or model_id in {"gpt-4", "gpt-3.5-turbo"}:
-            provider = "openai"
-        elif model_id.startswith("gemini/") or model_id.startswith("google/"):
-            provider = "gemini"
-        elif model_id.startswith("fireworks-ai/"):
-            provider = "fireworks-ai"
-        else:
-            provider = "auto"
-
-        # Build message history
-        msgs = history_to_messages(history, system_prompt)
-        context = query
-        if file:
-            ftext = extract_text_from_file(file)
-            context += f"\n\n[Attached file]\n{ftext[:5000]}"
-        if website_url:
-            wtext = extract_website_content(website_url)
-            if not wtext.startswith("Error"):
-                context += f"\n\n[Website content]\n{wtext[:8000]}"
-        final_q = enhance_query_with_search(context, enable_search)
-        msgs.append({"role": "user", "content": final_q})
-
-        # Call the model
-        client = get_inference_client(model_id, provider)
-        resp = client.chat.completions.create(
-            model=model_id,
-            messages=msgs,
-            max_tokens=16000,
-            temperature=0.1
-        )
-        content = resp.choices[0].message.content
-
-    except Exception as e:
-        err = f"❌ **Error:**\n```\n{e}\n```"
-        history.append((query, err))
-        return "", history, "", history_to_chatbot_messages(history)
-
-    # Process model output
+        assistant_reply = chat_completion(model.id, messages)
+    except Exception as exc:  # pragma: no cover
+        err_msg = f"❌ **Generation error**\n```{exc}```"
+        new_history = history + [(prompt, err_msg)]
+        return "", new_history, "", history_to_chatbot_messages(new_history)
+
+    # ------------------------------------------------------------------
+    # Post‑process output
+    # ------------------------------------------------------------------
     if language == "transformers.js":
-        files = parse_transformers_js_output(content)
-        code = format_transformers_js_output(files)
-        preview = send_to_sandbox(files.get("index.html", ""))
+        files = parse_transformers_js_output(assistant_reply)
+        code_out = format_transformers_js_output(files)
+        preview_html = send_to_sandbox(files.get("index.html", ""))
     else:
-        cleaned = remove_code_block(content)
-        if history and history[-1][1] and not history[-1][1].startswith("❌"):
-            code = apply_search_replace_changes(history[-1][1], cleaned)
-        else:
-            code = cleaned
-        preview = send_to_sandbox(code) if language == "html" else ""
-
-    new_hist = history + [(query, code)]
-    chat = history_to_chatbot_messages(new_hist)
-    return code, new_hist, preview, chat
-
-# --- Custom CSS ---
-CUSTOM_CSS = """
-body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }
-#main_title { text-align: center; font-size: 2.5rem; margin-top: 1.5rem; }
-#subtitle { text-align: center; color: #4a5568; margin-bottom: 2.5rem; }
-.gradio-container { background-color: #f7fafc; }
-#gen_btn { box-shadow: 0 4px 6px rgba(0,0,0,0.1); }
-"""
+        cleaned = remove_code_block(assistant_reply)
+        # search/replace patching for iterative edits
+        if history and not history[-1][1].startswith("❌"):
+            cleaned = apply_search_replace_changes(history[-1][1], cleaned)
+        code_out = cleaned
+        preview_html = send_to_sandbox(cleaned) if language == "html" else ""
 
-with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue"), css=CUSTOM_CSS, title="Shasha AI") as demo:
-    history_state = gr.State([])
-    initial_model = AVAILABLE_MODELS[0]
-    model_state = gr.State(initial_model)
+    new_history = history + [(prompt, code_out)]
+    chat_history = history_to_chatbot_messages(new_history)
+    return code_out, new_history, preview_html, chat_history
 
-    gr.Markdown("# 🚀 Shasha AI", elem_id="main_title")
-    gr.Markdown("Your AI partner for generating, modifying, and understanding code.", elem_id="subtitle")
 
+# ------------------------------------------------------------------
+# Gradio UI
+# ------------------------------------------------------------------
+THEME = gr.themes.Soft(primary_hue="blue")
+
+with gr.Blocks(theme=THEME, title="AnyCoder / Shasha AI") as demo:
+    state_history = gr.State([])
+
+    # -------------------- sidebar (inputs) ---------------------------
     with gr.Row():
         with gr.Column(scale=1):
-            gr.Markdown("### 1. Select Model")
+            gr.Markdown("### 1 · Model")
             model_dd = gr.Dropdown(
-                choices=[m["name"] for m in AVAILABLE_MODELS],
-                value=initial_model["name"],
-                label="AI Model"
+                choices=[m.name for m in AVAILABLE_MODELS],
+                value=AVAILABLE_MODELS[0].name,
+                label="AI Model",
             )
 
-            gr.Markdown("### 2. Provide Context")
+            gr.Markdown("### 2 · Context")
             with gr.Tabs():
-                with gr.Tab("📝 Prompt"):
-                    prompt_in = gr.Textbox(lines=7, placeholder="Describe your request...", show_label=False)
-                with gr.Tab("📄 File"):
-                    file_in = gr.File(type="filepath")
-                with gr.Tab("🌐 Website"):
-                    url_in = gr.Textbox(placeholder="https://example.com")
+                with gr.Tab("Prompt"):
+                    prompt_box = gr.Textbox(lines=6, placeholder="Describe what you need...")
+                with gr.Tab("File"):
+                    file_box = gr.File(type="filepath")
+                with gr.Tab("Website"):
+                    url_box = gr.Textbox(placeholder="https://example.com")
 
-            gr.Markdown("### 3. Configure Output")
-            lang_dd = gr.Dropdown(SUPPORTED_LANGUAGES, value="html", label="Target Language")
-            search_chk = gr.Checkbox(label="Enable Web Search")
+            gr.Markdown("### 3 · Output")
+            lang_dd = gr.Dropdown(SUPPORTED_LANGUAGES, value="html", label="Language")
+            search_chk = gr.Checkbox(label="Enable Tavily Web Search")
 
             with gr.Row():
-                clr_btn = gr.Button("Clear Session", variant="secondary")
-                gen_btn = gr.Button("Generate Code", variant="primary", elem_id="gen_btn")
+                clear_btn = gr.Button("Clear", variant="secondary")
+                gen_btn = gr.Button("Generate ✨", variant="primary")
 
+        # -------------------- main panel (outputs) --------------------
         with gr.Column(scale=2):
             with gr.Tabs():
-                with gr.Tab("💻 Code"):
-                    code_out = gr.Code(language="html", interactive=True)
-                with gr.Tab("👁️ Live Preview"):
+                with gr.Tab("Code"):
+                    code_out = gr.Code(interactive=True)
+                with gr.Tab("Preview"):
                     preview_out = gr.HTML()
-                with gr.Tab("📜 History"):
+                with gr.Tab("History"):
                     chat_out = gr.Chatbot(type="messages")
 
-    model_dd.change(lambda n: get_model_details(n) or initial_model, inputs=[model_dd], outputs=[model_state])
-
+    # -------------------- callbacks ----------------------------------
     gen_btn.click(
-        fn=generation_code,
-        inputs=[prompt_in, file_in, url_in, model_state, search_chk, lang_dd, history_state],
-        outputs=[code_out, history_state, preview_out, chat_out],
+        generation_code,
+        inputs=[
+            prompt_box,
+            file_box,
+            url_box,
+            model_dd,
+            search_chk,
+            lang_dd,
+            state_history,
+        ],
+        outputs=[code_out, state_history, preview_out, chat_out],
     )
 
-    clr_btn.click(
+    clear_btn.click(
         lambda: ("", None, "", [], "", "", []),
-        outputs=[prompt_in, file_in, url_in, history_state, code_out, preview_out, chat_out],
+        outputs=[prompt_box, file_box, url_box, state_history, code_out, preview_out, chat_out],
         queue=False,
     )
 
+# ------------------------------------------------------------------
 if __name__ == "__main__":
     demo.queue().launch()