Update app.py

app.py

@@ -5,16 +5,7 @@ import json
 import io
 import requests
 import logging
-from typing import List, Dict, Any, Tuple, Optional, Literal, Generator
-
-import gradio as gr
-import google.generativeai as genai
-from google.generativeai import types # Import types for configuration and tools
-
-from huggingface_hub import create_repo, list_models, upload_file, constants
-from huggingface_hub.utils import build_hf_headers, get_session, hf_raise_for_status
-from requests.adapters import HTTPAdapter
-from urllib3.util.retry import Retry
+from typing import List, Dict, Any, Tuple, Optional, Literal, Generator, Union # Import Union for clarity
 
 
 # --- Configure Logging ---
@@ -297,8 +288,29 @@ STATE_COMPLETE: WorkflowState = "complete"
 
 MAX_DEBUG_ATTEMPTS = 3 # Limit the number of automatic debug attempts
 
-# Helper function to add a new assistant message to the chatbot history.
+
+# Define type aliases for workflow inputs and outputs BEFORE they are used in function signatures
+WorkflowInputs = Tuple[
+    str, List[Dict[str, str]], Optional[gr.OAuthProfile], Optional[gr.OAuthToken],
+    Optional[str], Optional[str], Optional[str], WorkflowState, str, str, str, str,
+    int, Optional[str], Optional[str], Optional[str], bool
+]
+
+WorkflowOutputs = Tuple[
+    List[Dict[str, str]], Optional[str], WorkflowState, str, str, str,
+    int, Optional[str], Optional[str], Optional[str], bool, Optional[str], Optional[str]
+]
+
+# A handler function can either return the final output tuple or yield intermediate ones before returning the final one
+# If a handler *only* returns the final tuple (no intermediate yields), its type hint should be WorkflowOutputs
+# If a handler *yields* intermediate tuples before returning the final tuple, its type hint is a Generator
+# The main generator function handles both cases.
+# WorkflowHandlerReturn = Any # Using Any is technically correct but less specific.
+# Let's be more precise where we know the return type.
+
+
 def add_bot_message(history: list[dict], bot_message: str) -> list[dict]:
+    """Helper to add a new assistant message to the chatbot history."""
     # Make a copy to avoid modifying history in place if needed later, though generator pattern usually handles this
     new_history = list(history)
     new_history.append({"role": "assistant", "content": bot_message})
@@ -342,12 +354,6 @@ def check_send_button_ready(
 # They take all necessary inputs from the main generator's arguments
 # and return the full tuple of outputs required by the generator's yield signature.
 
-# Using Any for handler return type simplifies type hints since some yield and some return
-# A more precise type would be Union[WorkflowOutputs, Generator[WorkflowOutputs, None, WorkflowOutputs]]
-# But Gradio's type checking for generators is often loose anyway.
-WorkflowHandlerReturn = Any
-
-
 def package_workflow_outputs(
     history: List[Dict[str, str]],
     repo_id: Optional[str],
@@ -369,6 +375,7 @@ def package_workflow_outputs(
              current_gemini_key, current_gemini_model)
 
 
+# Handlers that only RETURN a WorkflowOutputs tuple
 def handle_idle(
     message: str,
     history: List[Dict[str, str]],
@@ -389,7 +396,7 @@ def handle_idle(
     use_grounding: bool,
     *args, # Catch potential extra args
     **kwargs # Catch potential extra kwargs
-) -> WorkflowHandlerReturn:
+) -> WorkflowOutputs: # Corrected return type
     """Handles logic when in the IDLE state."""
     logging.info(f"Handling STATE_IDLE with message: {message[:50]}...")
 
@@ -419,7 +426,7 @@ def handle_idle(
         if not new_repo_name or re.search(r'[^a-zA-Z0-9_-]', new_repo_name) or len(new_repo_name) > 100:
              logging.warning(f"Invalid repo name format received: {new_repo_name}")
              history = add_bot_message(history, "Invalid name. Please provide a single word/slug for the Space name (letters, numbers, underscores, hyphens only, max 100 chars).")
-             # Stay in IDLE and yield message
+             # Stay in IDLE and return message
              return package_workflow_outputs(
                 history=history, repo_id=repo_id, state=STATE_IDLE,
                 updated_preview=preview_html, updated_run=container_logs, updated_build=build_logs,
@@ -444,7 +451,7 @@ def handle_idle(
         if not new_repo_name or re.search(r'[^a-zA-Z0-9_-]', new_repo_name) or len(new_repo_name) > 100:
              logging.warning(f"Invalid repo name format received: {new_repo_name}")
              history = add_bot_message(history, "Invalid name. Please provide a single word/slug for the Space name (letters, numbers, underscores, hyphens only, max 100 chars).")
-             # Stay in IDLE and yield message
+             # Stay in IDLE and return message
              return package_workflow_outputs(
                 history=history, repo_id=repo_id, state=STATE_IDLE,
                 updated_preview=preview_html, updated_run=container_logs, updated_build=build_logs,
@@ -504,7 +511,7 @@ def handle_awaiting_repo_name(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> WorkflowOutputs: # Corrected return type
     """Handles logic when in the AWAITING_REPO_NAME state."""
     logging.info(f"Handling STATE_AWAITING_REPO_NAME with message: {message[:50]}...")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -555,7 +562,7 @@ def handle_creating_space(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> WorkflowOutputs: # Corrected return type
     """Handles logic when in the CREATING_SPACE state."""
     logging.info(f"Handling STATE_CREATING_SPACE for repo '{repo_name}'")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -595,6 +602,7 @@ def handle_creating_space(
                 use_grounding=use_grounding, current_gemini_key=current_gemini_key, current_gemini_model=current_gemini_model
             )
 
+# Handlers that YIELD intermediate steps before returning the final tuple
 def handle_generating_code(
     message: str,
     history: List[Dict[str, str]],
@@ -615,7 +623,7 @@ def handle_generating_code(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the GENERATING_CODE state."""
     logging.info("Handling STATE_GENERATING_CODE")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -635,7 +643,6 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
         if use_grounding:
             history = add_bot_message(history, "(Using Grounding with Google Search)")
         # Yield message before API call to show immediate feedback
-        # Use package_workflow_outputs to construct the tuple
         yield package_workflow_outputs(
             history=history, repo_id=repo_id, state=state,
             updated_preview=preview_html, updated_run=container_logs, updated_build=build_logs,
@@ -697,7 +704,7 @@ def handle_uploading_app_py(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the UPLOADING_APP_PY state."""
     logging.info("Handling STATE_UPLOADING_APP_PY")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -766,7 +773,7 @@ def handle_generating_requirements(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the GENERATING_REQUIREMENTS state."""
     logging.info("Handling STATE_GENERATING_REQUIREMENTS")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -841,7 +848,7 @@ def handle_uploading_requirements(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the UPLOADING_REQUIREMENTS state."""
     logging.info("Handling STATE_UPLOADING_REQUIREMENTS")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -910,7 +917,7 @@ def handle_generating_readme(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the GENERATING_README state."""
     logging.info("Handling STATE_GENERATING_README")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -976,7 +983,7 @@ def handle_uploading_readme(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the UPLOADING_README state."""
     logging.info("Handling STATE_UPLOADING_README")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -1045,7 +1052,7 @@ def handle_checking_logs_build(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the CHECKING_LOGS_BUILD state."""
     logging.info(f"Handling STATE_CHECKING_LOGS_BUILD for repo '{repo_id}'")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -1112,7 +1119,7 @@ def handle_checking_logs_run(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the CHECKING_LOGS_RUN state."""
     logging.info(f"Handling STATE_CHECKING_LOGS_RUN for repo '{repo_id}'")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -1195,7 +1202,7 @@ def handle_debugging_code(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the DEBUGGING_CODE state."""
     logging.info(f"Handling STATE_DEBUGGING_CODE (attempt #{debug_attempts}) for repo '{repo_id}'")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -1282,7 +1289,7 @@ def handle_uploading_fixed_app_py(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Correct return type for generator
     """Handles logic when in the UPLOADING_FIXED_APP_PY state."""
     logging.info(f"Handling STATE_UPLOADING_FIXED_APP_PY for repo '{repo_id}'")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -1353,7 +1360,7 @@ def handle_complete(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowHandlerReturn:
+) -> WorkflowOutputs: # Corrected return type
     """Handles logic when in the COMPLETE state."""
     logging.info("Handling STATE_COMPLETE")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -1471,7 +1478,6 @@ def ai_workflow_chat(
         if handler:
             logging.debug(f"Invoking handler for state: {state}")
             # Call the state handler function, passing all necessary data
-            # Need to pass *all* inputs to the handler function
             # Note: The inputs passed here are the *current* values received by the generator,
             # which are the values of the UI components and State variables
             # at the moment the button was clicked, plus any previous yielded state.