The default selection has been changed from URL Mode to HTML Text Mode.

app.py

@@ -156,7 +156,7 @@ def process_conversion_request(
     if not check_pandoc_available():
         error_msg = "Error: Pandoc executable not found. Please ensure Pandoc is installed or run `pip install pypandoc_binary`."
         # Yield a final state for all outputs
-        yield error_msg, None, gr.Markdown(visible=False), None
+        yield error_msg, None, None, gr.Markdown(visible=False)
         return
 
     # --- Determine Pandoc Settings based on Checkbox ---
@@ -179,7 +179,7 @@ def process_conversion_request(
             # --- 1. Validate URL and Determine Restriction Path ---
             start_url_str = start_url_str.strip()
             if not start_url_str:
-                yield "Error: Starting URL cannot be empty.", None, gr.Markdown(visible=False), None
+                yield "Error: Starting URL cannot be empty.", None, None, gr.Markdown(visible=False)
                 return
 
             try:
@@ -205,7 +205,7 @@ def process_conversion_request(
                             start_path_dir_for_restriction = None # Treat like root, don't restrict path based on this
 
             except ValueError as e:
-                yield f"Error: Invalid starting URL '{start_url_str}': {e}", None, gr.Markdown(visible=False), None
+                yield f"Error: Invalid starting URL '{start_url_str}': {e}", None, None, gr.Markdown(visible=False)
                 return
             
             # Log restriction status
@@ -225,7 +225,7 @@ def process_conversion_request(
             dequeued_count = 0
             
             log_messages = ["Process started...", restriction_msg, conversion_mode_msg]
-            yield "\n".join(log_messages), None, gr.Markdown(visible=False), None
+            yield "\n".join(log_messages), None, None, gr.Markdown(visible=False)
 
             # --- 3. Crawl and Convert Loop ---
             while not urls_to_process.empty():
@@ -322,7 +322,7 @@ def process_conversion_request(
             # --- 4. Create ZIP Archive ---
             progress(1.0, desc="Zipping files...")
             log_messages.append("\nCrawling complete. Creating ZIP file...")
-            yield "\n".join(log_messages), None, gr.Markdown(visible=False), None
+            yield "\n".join(log_messages), None, None, gr.Markdown(visible=False)
 
             with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as temp_zip:
                 output_zip_path = temp_zip.name
@@ -332,15 +332,15 @@ def process_conversion_request(
                 log_messages.append(f"Converted {converted_count} pages using {'aggressive' if use_aggressive_conversion else 'standard'} mode.")
                 if failed_urls:
                     log_messages.append(f"Failed to process {len(failed_urls)} URLs.")
-                yield "\n".join(log_messages), output_zip_path, gr.Markdown(visible=False), None
+                yield "\n".join(log_messages), output_zip_path, None, gr.Markdown(visible=False)
             else:
                 log_messages.append("\nError: Failed to create the final ZIP archive.")
-                yield "\n".join(log_messages), None, gr.Markdown(visible=False), None
+                yield "\n".join(log_messages), None, None, gr.Markdown(visible=False)
 
         except Exception as e:
             error_log = f"\nAn unexpected error occurred: {e}\n{traceback.format_exc()}"
             logging.error(error_log)
-            yield error_log, None, gr.Markdown(visible=False), None
+            yield error_log, None, None, gr.Markdown(visible=False)
         finally:
             # --- Cleanup ---
             if staging_dir and os.path.exists(staging_dir):
@@ -353,7 +353,7 @@ def process_conversion_request(
         
         if not html_text_input or not html_text_input.strip():
             log_messages.append("Error: HTML content cannot be empty.")
-            yield "\n".join(log_messages), None, gr.Markdown(visible=False), None
+            yield "\n".join(log_messages), None, None, gr.Markdown(visible=False)
             return
 
         progress(0.5, desc="Converting HTML text...")
@@ -377,14 +377,14 @@ def process_conversion_request(
             # Yield the final state: update logs, clear zip, show markdown preview, provide md file
             yield ("\n".join(log_messages), 
                    None, 
-                   gr.Markdown(value=markdown_output, visible=True), 
-                   temp_md_path)
+                   temp_md_path,
+                   gr.Markdown(value=markdown_output, visible=True), )
         else:
             # Conversion failed, show logs and hide/clear other outputs
             yield ("\n".join(log_messages), 
                    None, 
-                   gr.Markdown(visible=False), 
-                   None)
+                   None,
+                   gr.Markdown(visible=False), )
 
 css = """
 textarea[rows]:not([rows="1"]) {
@@ -408,8 +408,8 @@ with gr.Blocks(title="HTML to Markdown Converter", css=css) as demo:
         """
         # HTML to Markdown Converter (via pypandoc)
         Choose an input method:
-        1.  **Convert from URL**: Enter the starting `index.html` URL of an online documentation site. The script will crawl internal links, convert pages to Markdown, and package the results into a ZIP file.
-        2.  **Convert from HTML Text**: Paste raw HTML source code directly to convert it into a single Markdown output.
+        1.  **Convert from HTML Text**: Paste raw HTML source code directly to convert it into a single Markdown output.
+        2.  **Convert from URL**: Enter the starting `index.html` URL of an online documentation site. The script will crawl internal links, convert pages to Markdown, and package the results into a ZIP file.
         
         **This tool requires `pip install pypandoc_binary` to function correctly.**
         """
@@ -417,13 +417,21 @@ with gr.Blocks(title="HTML to Markdown Converter", css=css) as demo:
 
     # --- Input type selector ---
     input_type_radio = gr.Radio(
-        ["Convert from URL", "Convert from HTML Text"],
+        ["Convert from HTML Text", "Convert from URL", ],
         label="Input Type",
-        value="Convert from URL"
+        value="Convert from HTML Text"
     )
 
+    # --- HTML Text Mode UI ---
+    with gr.Column(visible=True) as text_mode_ui:
+        html_text_input = gr.Textbox(
+            label="Paste HTML Source Code Here",
+            lines=10, # Give it a decent initial size
+            placeholder="<html><body><h1>Title</h1><p>This is a paragraph.</p></body></html>"
+        )
+
     # --- URL Mode UI ---
-    with gr.Column(visible=True) as url_mode_ui:
+    with gr.Column(visible=False) as url_mode_ui:
         url_input = gr.Textbox(
             label="Starting Index HTML URL",
             placeholder="e.g., https://dghs-imgutils.deepghs.org/main/index.html"
@@ -433,14 +441,6 @@ with gr.Blocks(title="HTML to Markdown Converter", css=css) as demo:
             value=True # Default to restricting path
         )
 
-    # --- HTML Text Mode UI ---
-    with gr.Column(visible=False) as text_mode_ui:
-        html_text_input = gr.Textbox(
-            label="Paste HTML Source Code Here",
-            lines=10, # Give it a decent initial size
-            placeholder="<html><body><h1>Title</h1><p>This is a paragraph.</p></body></html>"
-        )
-
     # --- Common Options ---
     with gr.Row():
         aggressive_md_checkbox = gr.Checkbox(
@@ -451,26 +451,26 @@ with gr.Blocks(title="HTML to Markdown Converter", css=css) as demo:
     with gr.Row():
         start_button = gr.Button("Start Conversion", variant="primary")
 
-    # --- URL Mode Outputs ---
-    with gr.Column(visible=True) as url_mode_outputs:
-        log_output = gr.Textbox(label="Progress Logs", lines=15, interactive=False, show_copy_button=True)
-        zip_output = gr.File(label="Download Markdown Archive (ZIP)")
-
     # --- HTML Text Mode Outputs ---
-    with gr.Column(visible=False) as text_mode_outputs:
+    with gr.Column(visible=True) as text_mode_outputs:
         gr.Markdown("---")
         gr.Markdown("### Markdown Conversion Result")
-        md_output_display = gr.Markdown(label="Preview") # Preview the result
         md_output_file = gr.File(label="Download Markdown File (.md)") # Download the single file
+        md_output_display = gr.Markdown(label="Preview") # Preview the result
+
+    # --- URL Mode Outputs ---
+    with gr.Column(visible=False) as url_mode_outputs:
+        log_output = gr.Textbox(label="Progress Logs", lines=15, interactive=False, show_copy_button=True)
+        zip_output = gr.File(label="Download Markdown Archive (ZIP)")
 
     # --- UI Logic to switch between modes ---
     def update_ui_visibility(input_type):
         is_url_mode = (input_type == "Convert from URL")
         return {
-            url_mode_ui: gr.update(visible=is_url_mode),
             text_mode_ui: gr.update(visible=not is_url_mode),
-            url_mode_outputs: gr.update(visible=is_url_mode),
             text_mode_outputs: gr.update(visible=not is_url_mode),
+            url_mode_ui: gr.update(visible=is_url_mode),
+            url_mode_outputs: gr.update(visible=is_url_mode),
         }
 
     input_type_radio.change(
@@ -493,8 +493,8 @@ with gr.Blocks(title="HTML to Markdown Converter", css=css) as demo:
         outputs=[
             log_output,
             zip_output,
+            md_output_file,
             md_output_display,
-            md_output_file
         ],
         show_progress="full"
     )

requirements.txt

@@ -1,4 +1,4 @@
-gradio==5.34.2
+gradio==5.50.0
 requests
 beautifulsoup4
 lxml

webui.bat

@@ -1,21 +1,61 @@
 @echo off
 
-:: The source of the webui.bat file is stable-diffusion-webui
-:: set COMMANDLINE_ARGS=--whisper_implementation faster-whisper --input_audio_max_duration -1 --default_model_name large-v2 --auto_parallel True --output_dir output --vad_max_merge_size 90 --save_downloaded_files --autolaunch
-
+chcp 65001
+set PYTHONUTF8=1
+:: The original source of the webui.bat file is stable-diffusion-webui
+:: Modified and enhanced by Gemini with features for venv management and requirements handling.
+
+:: --------- Configuration ---------
+set COMMANDLINE_ARGS=
+
+:: Define the application directory (folder name)
+:: Leave empty if the app is in the root directory.
+set APP_DIR=
+
+:: Define the name of the Launch application
+set APPLICATION_NAME=app.py
+
+:: Define the requirements filename, default is requirements.txt
+set REQUIREMENTS_FILE=requirements.txt
+
+:: Define the name of the virtual environment directory
+set VENV_NAME=venv
+
+:: Set to 1 to always attempt to update packages from requirements.txt on every launch
+set ALWAYS_UPDATE_REQS=1
+:: ---------------------------------
+
+:: --------- Path Setup Logic ---------
+:: Logic to handle paths based on whether APP_DIR is set
+if defined APP_DIR (
+    set "TARGET_REQ=%~dp0%APP_DIR%\%REQUIREMENTS_FILE%"
+    set "TARGET_SCRIPT=%~dp0%APP_DIR%\%APPLICATION_NAME%"
+    echo Working in subdirectory: %APP_DIR%
+) else (
+    set "TARGET_REQ=%~dp0%REQUIREMENTS_FILE%"
+    set "TARGET_SCRIPT=%~dp0%APPLICATION_NAME%"
+    echo Working in root directory.
+)
+:: ------------------------------------
+
+:: Set PYTHON executable if not already defined
 if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set "VENV_DIR=%~dp0%venv")
+:: Set VENV_DIR using VENV_NAME if not already defined
+if not defined VENV_DIR (set "VENV_DIR=%~dp0%VENV_NAME%")
 
 mkdir tmp 2>NUL
 
+:: Check if Python is callable
 %PYTHON% -c "" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :check_pip
 echo Couldn't launch python
 goto :show_stdout_stderr
 
 :check_pip
+:: Check if pip is available
 %PYTHON% -mpip --help >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :start_venv
+:: If pip is not available and PIP_INSTALLER_LOCATION is set, try to install pip
 if "%PIP_INSTALLER_LOCATION%" == "" goto :show_stdout_stderr
 %PYTHON% "%PIP_INSTALLER_LOCATION%" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :start_venv
@@ -23,33 +63,107 @@ echo Couldn't install pip
 goto :show_stdout_stderr
 
 :start_venv
-if ["%VENV_DIR%"] == ["-"] goto :skip_venv
-if ["%SKIP_VENV%"] == ["1"] goto :skip_venv
+:: Skip venv creation/activation if VENV_DIR is explicitly set to "-"
+if ["%VENV_DIR%"] == ["-"] goto :skip_venv_entirely
+:: Skip venv creation/activation if SKIP_VENV is set to "1"
+if ["%SKIP_VENV%"] == ["1"] goto :skip_venv_entirely
 
+:: Check if the venv already exists by looking for Python.exe in its Scripts directory
 dir "%VENV_DIR%\Scripts\Python.exe" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :activate_venv
+if %ERRORLEVEL% == 0 goto :activate_venv_and_maybe_update
 
+:: Venv does not exist, create it
+echo Virtual environment not found in "%VENV_DIR%". Creating a new one.
 for /f "delims=" %%i in ('CALL %PYTHON% -c "import sys; print(sys.executable)"') do set PYTHON_FULLNAME="%%i"
 echo Creating venv in directory %VENV_DIR% using python %PYTHON_FULLNAME%
 %PYTHON_FULLNAME% -m venv "%VENV_DIR%" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :activate_venv
-echo Unable to create venv in directory "%VENV_DIR%"
-goto :show_stdout_stderr
-
-:activate_venv
+if %ERRORLEVEL% NEQ 0 (
+    echo Unable to create venv in directory "%VENV_DIR%"
+    goto :show_stdout_stderr
+)
+echo Venv created.
+
+:: Install requirements for the first time if venv was just created
+:: This section handles the initial installation of packages from requirements.txt
+:: immediately after a new virtual environment is created.
+echo Checking for %REQUIREMENTS_FILE% for initial setup...
+if exist "%TARGET_REQ%" (
+    echo Found %REQUIREMENTS_FILE% at "%TARGET_REQ%", attempting to install for initial setup...
+    call "%VENV_DIR%\Scripts\activate.bat"
+    echo Installing packages from %REQUIREMENTS_FILE% ^(initial setup^)...
+    "%VENV_DIR%\Scripts\python.exe" -m pip install -r "%TARGET_REQ%"
+    if %ERRORLEVEL% NEQ 0 (
+        echo Failed to install requirements during initial setup. Please check the output above.
+        pause
+        goto :show_stdout_stderr_custom_pip_initial 
+    )
+    echo Initial requirements installed successfully.
+    call "%VENV_DIR%\Scripts\deactivate.bat"
+) else (
+    echo No %REQUIREMENTS_FILE% found at "%TARGET_REQ%", skipping package installation.
+)
+goto :activate_venv_and_maybe_update
+
+
+:activate_venv_and_maybe_update
+:: This label is reached if the venv exists or was just created.
+:: Set PYTHON to point to the venv's Python interpreter.
 set PYTHON="%VENV_DIR%\Scripts\Python.exe"
-echo venv %PYTHON%
+echo Activating venv: %PYTHON%
+
+:: Always update requirements if ALWAYS_UPDATE_REQS is 1
+:: This section allows for updating packages from requirements.txt on every launch
+:: if the ALWAYS_UPDATE_REQS variable is set to 1.
+if defined ALWAYS_UPDATE_REQS (
+    if "%ALWAYS_UPDATE_REQS%"=="1" (
+        echo ALWAYS_UPDATE_REQS is enabled.
+        if exist "%TARGET_REQ%" (
+            echo Attempting to update packages from "%TARGET_REQ%"...
+            REM No need to call activate.bat here again, PYTHON is already set to the venv's python
+            %PYTHON% -m pip install -r "%TARGET_REQ%"
+            if %ERRORLEVEL% NEQ 0 (
+                echo Failed to update requirements. Please check the output above.
+                pause
+                goto :endofscript 
+            )
+            echo Requirements updated successfully.
+        ) else (
+            echo ALWAYS_UPDATE_REQS is enabled, but no %REQUIREMENTS_FILE% found. Skipping update.
+        )
+    ) else (
+        echo ALWAYS_UPDATE_REQS is not enabled or not set to 1. Skipping routine update.
+    )
+)
+
+goto :launch
 
-:skip_venv
+:skip_venv_entirely
+:: This label is reached if venv usage is explicitly skipped.
+echo Skipping venv.
 goto :launch
 
 :launch
-%PYTHON% app.py %COMMANDLINE_ARGS% %*
+:: Launch the main application
+echo Launching Web UI with arguments: %COMMANDLINE_ARGS% %*
+echo Script path: %TARGET_SCRIPT%
+%PYTHON% "%TARGET_SCRIPT%" %COMMANDLINE_ARGS% %*
+echo Launch finished.
+pause
+exit /b
+
+:show_stdout_stderr_custom_pip_initial
+:: Custom error handler for failures during the initial pip install process.
+echo.
+echo exit code ^(pip initial install^): %errorlevel%
+echo Errors during initial pip install. See output above.
+echo.
+echo Launch unsuccessful. Exiting.
 pause
 exit /b
 
-:show_stdout_stderr
 
+:show_stdout_stderr
+:: General error handler: displays stdout and stderr from the tmp directory.
 echo.
 echo exit code: %errorlevel%
 
@@ -61,13 +175,13 @@ type tmp\stdout.txt
 
 :show_stderr
 for /f %%i in ("tmp\stderr.txt") do set size=%%~zi
-if %size% equ 0 goto :show_stderr
+if %size% equ 0 goto :endofscript
 echo.
 echo stderr:
 type tmp\stderr.txt
 
 :endofscript
-
 echo.
 echo Launch unsuccessful. Exiting.
 pause
+exit /b