Update app.py

app.py

@@ -1,8 +1,10 @@
 # app.py
 
 import os
+import re
 import time
 import json
+import io
 import requests
 
 import gradio as gr
@@ -65,7 +67,7 @@ def upload_file_to_space_action(
         )
         return f"✅ Uploaded `{path_in_repo}`"
     except Exception as e:
-        return f"Error uploading file: {e}"
+        return f"Error uploading `{path_in_repo}`: {e}"
 
 def _fetch_space_logs_level(repo_id: str, level: str, token: str) -> str:
     jwt_url  = f"{constants.ENDPOINT}/api/spaces/{repo_id}/jwt"
@@ -120,15 +122,10 @@ def configure_gemini(api_key: str | None, model_name: str | None) -> str:
         return f"Error configuring Gemini: {e}"
 
 def call_gemini(prompt: str, api_key: str, model_name: str) -> str:
-    if not api_key or not model_name:
-        return "Error: Gemini API key or model not provided."
-    try:
-        genai.configure(api_key=api_key)
-        model    = genai.GenerativeModel(model_name)
-        response = model.generate_content(prompt)
-        return response.text or "Gemini returned an empty response."
-    except Exception as e:
-        return f"Error calling Gemini API with {model_name}: {e}"
+    genai.configure(api_key=api_key)
+    model    = genai.GenerativeModel(model_name)
+    response = model.generate_content(prompt)
+    return response.text or ""
 
 
 # --- AI workflow logic ---
@@ -156,106 +153,124 @@ def ai_workflow_chat(
 ]:
     history.append([message, None])
     bot_message = ""
-    new_repo_id = repo_id_state
-    new_workflow = workflow_state
+    repo_id     = repo_id_state
+    state       = workflow_state
     updated_preview = preview_html
-    updated_container = container_logs
-    updated_build = build_logs
+    updated_build   = build_logs
+    updated_run     = container_logs
 
     try:
+        # 1) Ensure login & API key
         if not hf_profile or not hf_token:
             bot_message = "Please log in to Hugging Face first."
-            new_workflow = "awaiting_login"
+            state = "awaiting_login"
         elif not gemini_api_key or not gemini_model:
             bot_message = "Please enter your API key and select a Gemini model."
-            new_workflow = "awaiting_api_key"
-        elif (new_workflow == "idle" or "create" in message.lower()) and not new_repo_id:
+            state = "awaiting_api_key"
+
+        # 2) Auto-detect “generate me ... app called NAME”
+        elif state == "idle" and re.search(r'generate (?:me )?(?:a|an) \w+ app called (\w+)', message, re.I):
+            m = re.search(r'generate (?:me )?(?:a|an) \w+ app called (\w+)', message, re.I)
+            repo_name = m.group(1)
+            bot_message = f"Creating Space `{hf_profile.username}/{repo_name}`..."
+            repo_id, iframe_html = create_space_action(repo_name, space_sdk, hf_profile, hf_token)
+            updated_preview = iframe_html
+            bot_message += "\n✅ Space created. Generating and uploading code..."
+            state = "generating_all"
+            app_desc = message
+
+        # 3) Manual start: waiting for repo name
+        elif (state in ("idle","awaiting_login","awaiting_api_key") or ("create" in message.lower())) and not repo_id:
             bot_message = "What should the Space be called? (e.g., `my-awesome-app`)"
-            new_workflow = "awaiting_repo_name"
-        elif new_workflow == "awaiting_repo_name":
+            state = "awaiting_repo_name"
+
+        elif state == "awaiting_repo_name":
             repo_name = message.strip()
-            if not repo_name:
-                bot_message = "Please provide a valid Space name."
-            else:
-                bot_message = f"Creating Space `{hf_profile.username}/{repo_name}`..."
-                new_repo_id, iframe_html = create_space_action(repo_name, space_sdk, hf_profile, hf_token)
-                updated_preview = iframe_html
-                bot_message += "\n✅ Space created."
-                new_workflow = "awaiting_app_description"
-        elif new_workflow in ("awaiting_app_description", "debugging"):
-            if new_workflow == "awaiting_app_description":
-                app_desc = message
-                bot_message = f"Generating code for a `{space_sdk}` app based on: '{app_desc}'..."
-                prompt = f"""
+            bot_message = f"Creating Space `{hf_profile.username}/{repo_name}`..."
+            repo_id, iframe_html = create_space_action(repo_name, space_sdk, hf_profile, hf_token)
+            updated_preview = iframe_html
+            bot_message += "\n✅ Space created."
+            state = "generating_all"
+            app_desc = None
+
+        # 4) Generate code + requirements + README + deploy
+        if state == "generating_all":
+            # generate app.py
+            prompt = f"""
 You are an AI assistant specializing in Hugging Face Spaces using the {space_sdk} SDK.
 Generate a full, single-file Python app based on:
-'{app_desc}'
-Return **only** the code block (```python ...```).
+'{app_desc or 'a Gradio image-blur test app with upload and slider controls'}'
+Return **only** the python code block for app.py.
 """
-            else:
-                debug_instr = message
-                logs = get_container_logs_action(new_repo_id, hf_profile, hf_token)
-                bot_message = f"Analyzing logs and applying fixes: '{debug_instr}'..."
-                prompt = f"""
+            code = call_gemini(prompt, gemini_api_key, gemini_model)
+            code = code.strip().strip("```python").strip("```")
+            # upload app.py
+            upload_file_to_space_action(io.StringIO(code), "app.py", repo_id, hf_profile, hf_token)
+            # generate requirements.txt
+            reqs = "\n".join([
+                "gradio",
+                "google-generativeai",
+                "huggingface_hub",
+                "requests"
+            ]) + "\n"
+            upload_file_to_space_action(io.StringIO(reqs), "requirements.txt", repo_id, hf_profile, hf_token)
+            # generate README.md
+            readme = f"# {repo_id.split('/')[-1]}\n\n" \
+                     "This Hugging Face Space was generated by an AI.\n\n" \
+                     "## Usage\n\n" \
+                     "Upload an image and use the slider to control blur intensity.\n"
+            upload_file_to_space_action(io.StringIO(readme), "README.md", repo_id, hf_profile, hf_token)
+
+            bot_message += "\n✅ All files uploaded. Building and checking logs..."
+            state = "checking_logs"
+
+        # 5) Fetch logs and auto-debug loop
+        if state == "checking_logs":
+            updated_build = get_build_logs_action(repo_id, hf_profile, hf_token)
+            updated_run   = get_container_logs_action(repo_id, hf_profile, hf_token)
+            # if errors detected, auto-debug up to 3 attempts
+            attempts = 0
+            while attempts < 3 and ( "Error" in updated_run or "Exception" in updated_run ):
+                attempts += 1
+                bot_message += f"\n🔧 Debug attempt #{attempts}"
+                debug_prompt = f"""
 You are debugging a {space_sdk} Space.
-Logs:
-{logs}
-User instructions:
-'{debug_instr}'
-Generate a fixed, single-file Python app. Return only the ```python``` code block.
+Here are the container logs:
+{updated_run}
+
+Generate a fixed version of app.py only. Return the python code block.
 """
-            new_workflow = "generating_code"
-            resp = call_gemini(prompt, gemini_api_key, gemini_model)
-            start = resp.find("```python")
-            end   = resp.rfind("```")
-            if start != -1 and end != -1 and end > start:
-                code = resp[start + len("```python"):end].strip()
-                bot_message += "\n✅ Code generated. Uploading..."
-                new_workflow = "uploading_code"
-                upload_log = upload_file_to_space_action(code, "app.py", new_repo_id, hf_profile, hf_token)
-                bot_message += "\n" + upload_log
-                if "✅ Uploaded" in upload_log:
-                    bot_message += "\nThe Space is now rebuilding. Say 'check logs' to fetch them."
-                    new_workflow = "awaiting_log_check"
-                    updated_preview = f'<iframe src="https://huggingface.co/spaces/{new_repo_id}" width="100%" height="500px"></iframe>'
-                else:
-                    new_workflow = "idle"
-            else:
-                bot_message += f"\n⚠️ Could not parse code from Gemini.\nResponse:\n{resp}"
-                new_workflow = "awaiting_app_description"
-        elif new_workflow == "awaiting_log_check" and "check logs" in message.lower():
-            bot_message = "Fetching logs..."
-            updated_container = get_container_logs_action(new_repo_id, hf_profile, hf_token)
-            updated_build     = get_build_logs_action(new_repo_id, hf_profile, hf_token)
-            bot_message += "\n✅ Logs updated. Describe any errors or say 'generate fix'."
-            new_workflow = "reviewing_logs"
-        elif new_workflow == "reviewing_logs" and "generate fix" in message.lower():
-            latest = get_container_logs_action(new_repo_id, hf_profile, hf_token)
-            if "Error" not in latest and "Exception" not in latest:
-                bot_message = "No clear error found. What should I fix?"
-                new_workflow = "reviewing_logs"
+                fix_code = call_gemini(debug_prompt, gemini_api_key, gemini_model)
+                fix_code = fix_code.strip().strip("```python").strip("```")
+                upload_file_to_space_action(io.StringIO(fix_code), "app.py", repo_id, hf_profile, hf_token)
+                time.sleep(5)  # wait for rebuild
+                updated_run = get_container_logs_action(repo_id, hf_profile, hf_token)
+            if "Error" not in updated_run and "Exception" not in updated_run:
+                bot_message += "\n✅ Application deployed successfully!"
             else:
-                bot_message = "Generating a fix based on logs..."
-                new_workflow = "debugging"
-        elif "reset" in message.lower():
+                bot_message += "\n❌ Could not fully debug after 3 attempts. Please check logs."
+
+            state = "idle"
+
+        # 6) Reset workflow
+        if "reset" in message.lower():
             bot_message = "Workflow reset."
-            new_repo_id = None
+            repo_id = None
             updated_preview = "<p>No Space created yet.</p>"
-            updated_container = ""
+            updated_run = ""
             updated_build = ""
-            new_workflow = "idle"
-        else:
-            bot_message = "Command not recognized. Try 'create', 'check logs', 'generate fix', or 'reset'."
+            state = "idle"
+
+        # Catch-all
+        if not bot_message:
+            bot_message = "Command not recognized. Try 'generate me a gradio app called myapp', or 'reset'."
+
     except Exception as e:
         bot_message = f"Unexpected error: {e}"
-        new_workflow = "idle"
+        state = "idle"
 
-    if history and history[-1][1] is None:
-        history[-1][1] = bot_message
-    else:
-        history.append([None, bot_message])
-
-    return history, new_repo_id, new_workflow, updated_preview, updated_container, updated_build
+    history[-1][1] = bot_message
+    return history, repo_id, state, updated_preview, updated_run, updated_build
 
 
 # --- Build the Gradio UI ---
@@ -264,7 +279,7 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     hf_profile   = gr.State(None)
     hf_token     = gr.State(None)
     gemini_key   = gr.State(None)
-    gemini_model = gr.State("gemini-2.5-pro-preview-03-25")
+    gemini_model = gr.State("gemini-2.5-flash-preview-04-17")
     repo_id      = gr.State(None)
     workflow     = gr.State("idle")
     sdk_state    = gr.State("gradio")
@@ -275,7 +290,6 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             gr.Markdown("## Hugging Face Login")
             login_status = gr.Markdown("*Not logged in.*")
             login_btn    = gr.LoginButton(variant="huggingface")
-
             ai_builder_tab.load(show_profile, outputs=login_status)
             login_btn.click(show_profile, outputs=login_status)
             login_btn.click(lambda p, t: (p, t), outputs=[hf_profile, hf_token])
@@ -289,14 +303,16 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             model_selector = gr.Radio(
                 choices=[
                     ("Gemini 2.5 Flash Preview 04-17", "gemini-2.5-flash-preview-04-17"),
-                    ("Gemini 2.5 Pro Preview 03-25",   "gemini-2.5-pro-preview-03-25")
+                    ("Gemini 2.5 Pro Preview 03-25",   "gemini-2.5-pro-preview-03-25"),
+                    ("Gemini 2.0 Flash",               "gemini-2.0-flash"),
+                    ("Gemini 2.0 Flash‑Lite",          "gemini-2.0-flash-lite"),
+                    ("Gemini 1.5 Flash",               "gemini-1.5-flash"),
                 ],
-                value="gemini-2.5-pro-preview-03-25",
+                value="gemini-2.5-flash-preview-04-17",
                 label="Select model"
             )
             model_selector.change(lambda m: m, inputs=model_selector, outputs=gemini_model)
 
-            # configure Gemini on key or model change
             ai_builder_tab.load(
                 configure_gemini,
                 inputs=[gemini_key, gemini_model],
@@ -370,99 +386,5 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
                 ]
             )
 
-with gr.Blocks(title="Manual Hugging Face Space Manager") as manual_control_tab:
-    manual_profile = gr.State(None)
-    manual_token   = gr.State(None)
-    manual_repo    = gr.State(None)
-
-    gr.Markdown("## Manual Sign-In & Space Management")
-    manual_login_btn = gr.LoginButton(variant="huggingface", size="lg")
-    manual_status    = gr.Markdown("*Not logged in.*")
-    manual_models    = gr.Markdown()
-
-    manual_control_tab.load(show_profile, outputs=manual_status)
-    manual_login_btn.click(show_profile, outputs=manual_status)
-    manual_control_tab.load(list_private_models, outputs=manual_models)
-    manual_login_btn.click(list_private_models, outputs=manual_models)
-    manual_login_btn.click(lambda p, t: (p, t), outputs=[manual_profile, manual_token])
-
-    manual_repo_name = gr.Textbox(label="New Space name", placeholder="my-space")
-    manual_sdk_sel   = gr.Radio(choices=["gradio","streamlit"], value="gradio", label="Template SDK")
-    manual_create_btn  = gr.Button("Create Space", interactive=False)
-    manual_create_logs = gr.Textbox(label="Create Logs", lines=3, interactive=False)
-    manual_preview     = gr.HTML("<p>No Space created yet.</p>")
-
-    manual_control_tab.load(
-        lambda p, t: gr.update(interactive=bool(p and t)),
-        inputs=[manual_profile, manual_token],
-        outputs=[manual_create_btn]
-    )
-    manual_login_btn.click(
-        lambda p, t: gr.update(interactive=bool(p and t)),
-        inputs=[manual_profile, manual_token],
-        outputs=[manual_create_btn]
-    )
-
-    manual_create_btn.click(
-        create_space_action,
-        inputs=[manual_repo_name, manual_sdk_sel, manual_profile, manual_token],
-        outputs=[manual_repo, manual_preview]
-    ).then(lambda _: "", outputs=[manual_create_logs])
-
-    manual_path = gr.Textbox(label="Path in Space", value="app.py")
-    manual_file = gr.File(label="Select file")
-    manual_up_btn = gr.Button("Upload File", interactive=False)
-    manual_up_log = gr.Textbox(label="Upload Logs", lines=2, interactive=False)
-
-    manual_control_tab.load(
-        lambda rid, p, t: gr.update(interactive=bool(rid and p and t)),
-        inputs=[manual_repo, manual_profile, manual_token],
-        outputs=[manual_up_btn]
-    )
-    manual_login_btn.click(
-        lambda rid, p, t: gr.update(interactive=bool(rid and p and t)),
-        inputs=[manual_repo, manual_profile, manual_token],
-        outputs=[manual_up_btn]
-    )
-
-    manual_up_btn.click(
-        upload_file_to_space_action,
-        inputs=[manual_file, manual_path, manual_repo, manual_profile, manual_token],
-        outputs=[manual_up_log]
-    )
-
-    manual_build_btn     = gr.Button("Fetch Build Logs", interactive=False)
-    manual_container_btn = gr.Button("Fetch Container Logs", interactive=False)
-    manual_build_txt     = gr.Textbox(label="Build Logs", lines=10, interactive=False)
-    manual_container_txt = gr.Textbox(label="Container Logs", lines=10, interactive=False)
-
-    for btn in (manual_build_btn, manual_container_btn):
-        manual_control_tab.load(
-            lambda rid, p, t: gr.update(interactive=bool(rid and p and t)),
-            inputs=[manual_repo, manual_profile, manual_token],
-            outputs=[btn]
-        )
-        manual_login_btn.click(
-            lambda rid, p, t: gr.update(interactive=bool(rid and p and t)),
-            inputs=[manual_repo, manual_profile, manual_token],
-            outputs=[btn]
-        )
-
-    manual_build_btn.click(
-        get_build_logs_action,
-        inputs=[manual_repo, manual_profile, manual_token],
-        outputs=[manual_build_txt]
-    )
-    manual_container_btn.click(
-        get_container_logs_action,
-        inputs=[manual_repo, manual_profile, manual_token],
-        outputs=[manual_container_txt]
-    )
-
-demo = gr.TabbedInterface(
-    [ai_builder_tab, manual_control_tab],
-    ["AI App Builder", "Manual Control"]
-)
-
 if __name__ == "__main__":
-    demo.launch()
+    ai_builder_tab.launch()