Update app.py

app.py

@@ -319,7 +319,7 @@ def check_send_button_ready(
     gemini_key: str | None,
     gemini_model: str | None,
     workflow_state: WorkflowState # Also depend on workflow state
-) -> gr.Button.update: # Use specific component update
+) -> gr.update: # Correct type hint for a Gradio update object
     """Checks if HF login and Gemini configuration are complete and returns update for button interactivity."""
     # Button should NOT be interactive when workflow is running
     if workflow_state != STATE_IDLE and workflow_state != STATE_AWAITING_REPO_NAME:
@@ -342,16 +342,11 @@ 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.
 
-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
-]
+# 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
 
-WorkflowOutputs = Tuple[
-    List[Dict[str, str]], Optional[str], WorkflowState, str, str, str,
-    int, Optional[str], Optional[str], Optional[str], bool, Optional[str], Optional[str]
-]
 
 def package_workflow_outputs(
     history: List[Dict[str, str]],
@@ -394,7 +389,7 @@ def handle_idle(
     use_grounding: bool,
     *args, # Catch potential extra args
     **kwargs # Catch potential extra kwargs
-) -> WorkflowOutputs:
+) -> WorkflowHandlerReturn:
     """Handles logic when in the IDLE state."""
     logging.info(f"Handling STATE_IDLE with message: {message[:50]}...")
 
@@ -509,7 +504,7 @@ def handle_awaiting_repo_name(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowOutputs:
+) -> WorkflowHandlerReturn:
     """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
@@ -560,7 +555,7 @@ def handle_creating_space(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowOutputs:
+) -> WorkflowHandlerReturn:
     """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
@@ -620,7 +615,7 @@ def handle_generating_code(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -702,7 +697,7 @@ def handle_uploading_app_py(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -771,7 +766,7 @@ def handle_generating_requirements(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -846,7 +841,7 @@ def handle_uploading_requirements(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -915,7 +910,7 @@ def handle_generating_readme(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -981,7 +976,7 @@ def handle_uploading_readme(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -1050,7 +1045,7 @@ def handle_checking_logs_build(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -1117,7 +1112,7 @@ def handle_checking_logs_run(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -1200,7 +1195,7 @@ def handle_debugging_code(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -1287,7 +1282,7 @@ def handle_uploading_fixed_app_py(
     use_grounding: bool,
     *args,
     **kwargs
-) -> Generator[WorkflowOutputs, None, WorkflowOutputs]: # Specify return type as Generator
+) -> WorkflowHandlerReturn:
     """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
@@ -1358,7 +1353,7 @@ def handle_complete(
     use_grounding: bool,
     *args,
     **kwargs
-) -> WorkflowOutputs:
+) -> WorkflowHandlerReturn:
     """Handles logic when in the COMPLETE state."""
     logging.info("Handling STATE_COMPLETE")
     current_gemini_key = gemini_api_key # Use the input vars directly
@@ -1477,6 +1472,9 @@ def ai_workflow_chat(
             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.
             handler_output = handler(
                 message=message, history=history,
                 hf_profile=hf_profile, hf_token=hf_token,
@@ -1604,12 +1602,13 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
     # Use the pattern suggested in the feedback: wire each dependency change to the same handler
     for state_comp in prerequisite_states_for_button:
+        # Create a lambda that captures the list of states at the time it's defined
+        # This lambda will be called by Gradio and receives the new value of the changed component first,
+        # followed by the values of the components in 'inputs'.
+        # We pass ALL prerequisite states (including the one that changed) to the lambda's inputs.
+        # The lambda then passes the *explicitly listed* input values from the 'states' list closure
+        # to the target function, check_send_button_ready.
         state_comp.change(
-            # Lambda function receives the new value of the changed component first,
-            # followed by the values of the components in 'inputs'.
-            # We pass ALL prerequisite states (including the one that changed) to the lambda's inputs.
-            # The lambda then passes the *explicitly listed* input values to the target function, check_send_button_ready.
-            # This avoids relying on the order of implicit args.
             lambda *args, states=prerequisite_states_for_button: check_send_button_ready(
                 states[0], states[1], states[2], states[3], states[4] # Pass values from the 'states' list closure
             ),