Update app.py

app.py

@@ -35,6 +35,7 @@ print("model_logic.py loaded successfully.")
 
 
 bbb = chr(96) * 3
+# Declare the global variable at the module level where it's initialized
 parsed_code_blocks_state_cache = []
 BOT_ROLE_NAME = "assistant"
 # Removed GROQ_API_ENDPOINT as it's now in model_logic
@@ -133,6 +134,7 @@ def _parse_chat_stream_logic(latest_bot_message_content, existing_files_state=No
     Parses a single bot message content string to find file blocks and updates the state.
     Assumes existing_files_state is the current state *before* this message.
     """
+    # This function takes state as an argument and returns new state, it doesn't need 'global'
     latest_blocks_dict = {}
     if existing_files_state:
         # Copy existing blocks, except for potential structure blocks that might be overwritten
@@ -192,6 +194,7 @@ def _parse_chat_stream_logic(latest_bot_message_content, existing_files_state=No
 
 def _export_selected_logic(selected_filenames, space_line_name_for_md, parsed_blocks_for_export):
     # This function remains largely the same, using the provided parsed_blocks_for_export
+    # It takes state as an argument and doesn't need 'global'
     results = {"output_str": "", "error_message": None, "download_filepath": None}
     # Filter out structure blocks for file listing/export content
     exportable_blocks_content = [b for b in parsed_blocks_for_export if not b.get("is_structure_block") and not b.get("is_binary") and not (b.get("code", "").startswith("[Error loading content:") or b.get("code", "").startswith("[Binary or Skipped file]"))]
@@ -276,14 +279,11 @@ def _convert_gr_history_to_api_messages(system_prompt, gr_history, current_user_
     if current_user_message: messages.append({"role": "user", "content": current_user_message})
     return messages
 
-# This function is no longer needed as we process the *latest* message content directly from the stream handler
-# def get_latest_bot_message_as_json(gr_history):
-#    ...
-
 
 def _generate_ui_outputs_from_cache(owner, space_name):
-    # This function remains largely the same, generating UI previews and the export MD
+    # Declare global at the top
     global parsed_code_blocks_state_cache
+    # This function remains largely the same, generating UI previews and the export MD
     preview_md_val = "*No files in cache to display.*"
     formatted_md_val = f"# Space: {owner}/{space_name}\n## File Structure\n{bbb}\n📁 Root\n{bbb}\n\n*No files in cache.*" if owner or space_name else "*Load or define a Space to see its Markdown structure.*"
     download_file = None
@@ -321,6 +321,7 @@ def _generate_ui_outputs_from_cache(owner, space_name):
 
 # --- Refactored Chat Submit Handler ---
 def handle_chat_submit(user_message, chat_history, api_key_input, provider_select, model_select, system_prompt, hf_owner_name, hf_repo_name, _current_formatted_markdown):
+    # Declare global at the top
     global parsed_code_blocks_state_cache
     _chat_msg_in = ""
     _chat_hist = list(chat_history)
@@ -346,7 +347,7 @@ def handle_chat_submit(user_message, chat_history, api_key_input, provider_selec
 
             for f_info in parsed_from_md.get("files", []):
                  # Only add if it has a path and isn't the structure block representation placeholder
-                 if f_info.get("path") and f_info["path"] != "File Structure (original)":
+                 if f_info.get("path") and f_info["path"] != "File Structure (original)"):
                       # Check if it's a binary representation string
                       is_binary_repr = isinstance(f_info.get("content"), str) and (f_info["content"].startswith("[Binary file") or f_info["content"].startswith("[Error loading content:") or f_info["content"].startswith("[Binary or Skipped file]"))
                       # Check if a block with this filename already exists in new_cache_state and replace it
@@ -434,14 +435,14 @@ def handle_chat_submit(user_message, chat_history, api_key_input, provider_selec
         # Generate stream from model_logic
         for chunk in generate_stream(provider_select, model_select, api_key_override, api_msgs):
              if chunk is None: continue # Skip None chunks if any
-             if chunk.startswith("Error: ") or chunk.startswith("API HTTP Error"):
+             if isinstance(chunk, str) and (chunk.startswith("Error: ") or chunk.startswith("API HTTP Error")):
                   # If an error chunk is received, treat it as the final output and stop
                   full_bot_response_content = chunk
                   error_during_stream = chunk
                   break # Stop processing stream
              else:
                   # Accumulate response and update the last message in chat_hist
-                  full_bot_response_content += chunk
+                  full_bot_response_content += str(chunk) # Ensure chunk is string
                   _chat_hist[-1] = (user_message, full_bot_response_content)
                   _status = f"Streaming from {model_select}..."
                   # Yield update immediately after receiving chunk
@@ -450,7 +451,7 @@ def handle_chat_submit(user_message, chat_history, api_key_input, provider_selec
         # After the stream finishes or breaks
         if error_during_stream:
              _status = error_during_stream # Set status to the error message
-        elif full_bot_response_content:
+        elif full_bot_response_content and not full_bot_response_content.startswith("Error: "): # Only parse if it's not an error message
             _status = f"Streaming complete. Processing files from {model_select} response..."
 
             # Pass the *current state* (updated from markdown at the start)
@@ -472,9 +473,12 @@ def handle_chat_submit(user_message, chat_history, api_key_input, provider_selec
                 _formatted_output_update, _detected_files_update, _download_btn_update = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
                 _status = "Processing complete. Previews updated."
         else:
-            # Handle cases where the stream finished but yielded no content (e.g., filter)
-            _status = "AI response complete, but returned no content."
-            # Keep existing previews/markdown if no content was generated to parse
+            # Handle cases where the stream finished but yielded no content (e.g., filter) or only an error was yielded
+            if not error_during_stream:
+                 _status = "AI response complete, but returned no content."
+            # Keep existing previews/markdown if no content was generated to parse or if it was an error message
+            _formatted_output_update, _detected_files_update, _download_btn_update = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
+
 
     except Exception as e:
         # Catch any errors that occurred *before* or *during* the stream setup/iteration
@@ -487,6 +491,8 @@ def handle_chat_submit(user_message, chat_history, api_key_input, provider_selec
              _chat_hist.append((user_message, error_msg)) # Append as a new user/bot turn if structure unexpected
         _status = error_msg
         # Previews and markdown might not be affected by a generation error, keep existing state
+        _formatted_output_update, _detected_files_update, _download_btn_update = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
+
 
     # Final yield to update UI after all processing
     yield (_chat_msg_in, _chat_hist, _status, _detected_files_update, _formatted_output_update, _download_btn_update)
@@ -499,14 +505,21 @@ def update_models_dropdown(provider_select):
         return gr.update(choices=[], value=None)
     models = get_models_for_provider(provider_select)
     default_model = get_default_model_for_provider(provider_select)
-    return gr.update(choices=models, value=default_model if default_model in models else (models[0] if models else None))
+    # Ensure default is in choices, or pick first, or None
+    if default_model and default_model in models:
+        selected_value = default_model
+    elif models:
+        selected_value = models[0]
+    else:
+        selected_value = None
 
+    return gr.update(choices=models, value=selected_value)
 
-# --- Existing handlers for Load, Build, Edit, Delete, Status (Mostly unchanged) ---
-# Ensure they correctly use hf_api_key_ui and potentially owner_name_input/space_name_input
+
+# --- Existing handlers for Load, Build, Edit, Delete, Status (Mostly unchanged, just global placement) ---
 
 def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
-    # ... (rest of this function is largely the same, but needs to update global cache)
+    # Declare global at the top
     global parsed_code_blocks_state_cache
     _formatted_md_val, _detected_preview_val, _status_val = "*Loading files...*", "*Loading files...*", f"Loading Space: {ui_owner_name}/{ui_space_name}..."
     _file_browser_update, _iframe_html_update, _download_btn_update = gr.update(visible=False, choices=[], value=None), gr.update(value=None, visible=False), gr.update(interactive=False, value=None)
@@ -621,14 +634,17 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
 
 
 def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, space_sdk_ui, formatted_markdown_content):
+    # Declare global at the top
+    global parsed_code_blocks_state_cache
     # ... (this function calls build_logic_create_space and refreshes file list)
     _build_status, _iframe_html, _file_browser_update = "Starting space build process...", gr.update(value=None, visible=False), gr.update(visible=False, choices=[], value=None)
-    yield _build_status, _iframe_html, _file_browser_update # Yield initial status
-    if not ui_space_name_part or "/" in ui_space_name_part: _build_status = f"Build Error: HF Space Name '{ui_space_name_part}' must be repo name only (no '/')."; yield _build_status, _iframe_html, _file_browser_update; return
+    # Include outputs for owner/space name textboxes in the initial yield
+    yield _build_status, _iframe_html, _file_browser_update, gr.update(value=ui_owner_name_part), gr.update(value=ui_space_name_part) # Yield initial status
+    if not ui_space_name_part or "/" in ui_space_name_part: _build_status = f"Build Error: HF Space Name '{ui_space_name_part}' must be repo name only (no '/')."; yield _build_status, _iframe_html, _file_browser_update, gr.update(), gr.update(); return
     final_owner_for_build = ui_owner_name_part
     if not final_owner_for_build:
         token_for_whoami, token_err = build_logic_get_api_token(hf_api_key_ui)
-        if token_err: _build_status = f"Build Error: {token_err}"; yield _build_status, _iframe_html, _file_browser_update; return
+        if token_err: _build_status = f"Build Error: {token_err}"; yield _build_status, _iframe_html, _file_browser_update, gr.update(), gr.update(); return
         if token_for_whoami:
             try:
                 user_info = build_logic_whoami(token=token_for_whoami)
@@ -637,19 +653,18 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
             except Exception as e: _build_status += f"\n(Warning: Could not auto-detect owner for build: {e}. Please specify.)"
         else: _build_status += "\n(Warning: Owner not specified and no token to auto-detect for build. Please specify owner or provide a token.)"
 
-    if not final_owner_for_build: _build_status = "Build Error: HF Owner Name could not be determined. Please specify it."; yield _build_status, _iframe_html, _file_browser_update; return
+    if not final_owner_for_build: _build_status = "Build Error: HF Owner Name could not be determined. Please specify it."; yield _build_status, _iframe_html, _file_browser_update, gr.update(), gr.update(); return
 
     # Before building, parse the markdown to ensure the cache reflects exactly what's being built
     # This prevents inconsistencies if the user manually edited the markdown output
     try:
         parsed_from_md_for_build = build_logic_parse_markdown(formatted_markdown_content)
         # Replace the global cache state with the state derived from the markdown being built
-        global parsed_code_blocks_state_cache
         parsed_code_blocks_state_cache = []
         if parsed_from_md_for_build.get("owner_md"): # Update UI owner/space name if present in MD
-             ui_owner_name_part = parsed_from_md_for_build["owner_md"]
+             ui_owner_name_part = parsed_from_md_for_build["owner_md"] # Use this updated value later
         if parsed_from_md_for_build.get("repo_name_md"):
-             ui_space_name_part = parsed_from_md_for_build["repo_name_md"]
+             ui_space_name_part = parsed_from_md_for_build["repo_name_md"] # Use this updated value later
 
         # Rebuild cache from parsed markdown files + structure block
         structure_block_md = next((f for f in parsed_from_md_for_build.get("files", []) if f.get("path") == "File Structure (original)"), None)
@@ -663,7 +678,7 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
              })
 
         for f_info in parsed_from_md_for_build.get("files", []):
-             if f_info.get("path") and f_info["path"] != "File Structure (original)":
+             if f_info.get("path") and f_info["path"] != "File Structure (original)"):
                   is_binary_repr = isinstance(f_info.get("content"), str) and (f_info["content"].startswith("[Binary file") or f_info["content"].startswith("[Error loading content:") or f_info["content"].startswith("[Binary or Skipped file]"))
                   parsed_code_blocks_state_cache.append({
                        "filename": f_info["path"],
@@ -676,12 +691,17 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
 
     except Exception as e:
          _build_status = f"Build Error: Failed to parse Markdown structure before building: {e}";
-         yield _build_status, _iframe_html, _file_browser_update; return # Stop build on parse error
+         # Yield error status, including keeping current owner/space name in textboxes
+         yield _build_status, _iframe_html, _file_browser_update, gr.update(value=ui_owner_name_part), gr.update(value=ui_space_name_part); return # Stop build on parse error
 
 
     result_message = build_logic_create_space(hf_api_key_ui, ui_space_name_part, final_owner_for_build, space_sdk_ui, formatted_markdown_content)
     _build_status = f"Build Process: {result_message}"
 
+    # Update UI with owner/space names extracted from markdown if present
+    owner_name_output = gr.update(value=ui_owner_name_part)
+    space_name_output = gr.update(value=ui_space_name_part)
+
     if "Successfully" in result_message:
         # Use potentially updated owner/space name from markdown parsing
         sub_owner = re.sub(r'[^a-z0-9\-]+', '-', ui_owner_name_part.lower()).strip('-') or 'owner'
@@ -695,17 +715,17 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
         if err_list: _build_status += f"\nFile list refresh error after build: {err_list}"; _file_browser_update = gr.update(visible=True, choices=sorted(file_list or []), value="Error refreshing files")
         else: _file_browser_update = gr.update(visible=True, choices=sorted(file_list or []), value=None if file_list else "No files found")
 
-    # Update UI with owner/space names extracted from markdown if present
-    owner_name_output = gr.update(value=ui_owner_name_part)
-    space_name_output = gr.update(value=ui_space_name_part)
-
-
+    # Final yield including potential updates to owner/space name textboxes
     yield _build_status, _iframe_html, _file_browser_update, owner_name_output, space_name_output
 
 
 # File editing handlers are okay, just need to ensure they update the cache properly after commit/delete
 def handle_load_file_for_editing(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, selected_file_path):
-    # ... (rest of this function is the same)
+    # Declare global at the top (even though it's not modified here, it's good practice if the function *might* interact with it in the future, or just for consistency)
+    # In this specific function, `global` isn't strictly needed as it only *reads* indirectly via _generate_ui_outputs_from_cache which handles its own global
+    # Keeping it here for consistency as per the error symptoms observed in similar functions.
+    global parsed_code_blocks_state_cache # Added global here
+
     _file_content_val, _edit_status_val, _commit_msg_val, _lang_update = "", "Error: No file selected.", gr.update(value=""), gr.update(language="python") # Reset values
     if not selected_file_path or selected_file_path in ["No files found", "Error loading files", "Error refreshing files"]:
          yield _file_content_val, "Select a file from the dropdown.", _commit_msg_val, _lang_update # Clear editor and status
@@ -745,6 +765,7 @@ def handle_load_file_for_editing(hf_api_key_ui, ui_space_name_part, ui_owner_nam
     yield _file_content_val, _edit_status_val, _commit_msg_val, _lang_update
 
 def handle_commit_file_changes(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, file_to_edit_path, edited_content, commit_message):
+    # Declare global at the top
     global parsed_code_blocks_state_cache
     _edit_status_val = "Processing commit..."
     # Initialize updates for components that might change
@@ -817,6 +838,7 @@ def handle_commit_file_changes(hf_api_key_ui, ui_space_name_part, ui_owner_name_
 
 
 def handle_delete_file(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, file_to_delete_path):
+    # Declare global at the top
     global parsed_code_blocks_state_cache
     _edit_status_val = "Processing deletion..."
     # Initialize updates for components that might change/clear
@@ -885,6 +907,8 @@ def handle_delete_file(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, fi
              _file_browser_value_update = file_to_delete_path # Keep the file selected visually
 
         # Markdown and preview are not changed if deletion failed, keep current updates as gr.update()
+        # Regenerate previews to show they are unchanged
+        _formatted_md_out, _detected_preview_out, _download_btn_out = _generate_ui_outputs_from_cache(owner_to_use, ui_space_name_part)
 
 
     yield (_edit_status_val, _file_browser_choices_update, _file_browser_value_update, _file_content_editor_update, _commit_msg_update, _lang_update, _formatted_md_out, _detected_preview_out, _download_btn_out)
@@ -892,6 +916,7 @@ def handle_delete_file(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, fi
 
 # Space status handler is okay
 def handle_refresh_space_status(hf_api_key_ui, ui_owner_name, ui_space_name):
+    # This function doesn't modify the global cache, so no global declaration needed.
     # ... (rest of this function is the same)
     yield "*Fetching space status...*" # Initial feedback
     owner_to_use = ui_owner_name
@@ -1098,5 +1123,6 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
     # Refresh status handler is okay
     refresh_status_button.click(fn=handle_refresh_space_status, inputs=[hf_api_key_input, owner_name_input, space_name_input], outputs=[space_runtime_status_display])
 
+
 if __name__ == "__main__":
     demo.launch(debug=True, share=False)