Expand CSV loading overlay to cover download button

app.py

@@ -202,19 +202,38 @@ GITHUB_CONTENT_CACHE: Dict[str, List[Dict[str, Any]]] = {}
 
 
 APP_CSS = """
+#available-files-section {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+    border-radius: 0.75rem;
+}
+
+#available-files-grid {
+    position: static;
+    overflow: visible;
+}
+
+#available-files-grid .form {
+    position: static;
+    min-height: 16rem;
+}
+
+#available-files-section:has(.gradio-loading) {
+    isolation: isolate;
+}
+
 #available-files-grid .wrap {
     display: grid;
     grid-template-columns: repeat(4, minmax(0, 1fr));
     gap: 0.5rem;
     max-height: 24rem;
+    min-height: 16rem;
     overflow-y: auto;
     padding-right: 0.25rem;
 }
 
-#available-files-grid {
-    position: relative;
-}
-
 #available-files-grid .wrap > div {
     min-width: 0;
 }
@@ -245,12 +264,37 @@ APP_CSS = """
 #available-files-grid .gradio-loading {
     position: absolute;
     inset: 0;
+    width: auto;
+    height: auto;
+    min-height: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
     background: rgba(10, 14, 23, 0.72);
     border-radius: 0.75rem;
     z-index: 10;
+    padding: 1.5rem;
+    pointer-events: auto;
+}
+
+#available-files-grid .gradio-loading > * {
+    width: 100%;
+}
+
+#available-files-grid .gradio-loading progress,
+#available-files-grid .gradio-loading .progress-bar,
+#available-files-grid .gradio-loading .loading-progress,
+#available-files-grid .gradio-loading [role="progressbar"],
+#available-files-grid .gradio-loading .wrap,
+#available-files-grid .gradio-loading .inner {
+    width: 100% !important;
+    max-width: none !important;
+}
+
+#available-files-grid .gradio-loading .status,
+#available-files-grid .gradio-loading .message,
+#available-files-grid .gradio-loading .label {
+    text-align: center;
 }
 
 #date-browser-row {
@@ -282,6 +326,8 @@ APP_CSS = """
 
 #download-selected-button {
     width: 100%;
+    position: relative;
+    z-index: 0;
 }
 
 #download-selected-button .gradio-button {
@@ -929,6 +975,71 @@ def resolve_output_path(
     return (base / fallback).resolve()
 
 
+ARTIFACT_FILE_EXTENSIONS: Tuple[str, ...] = (
+    ".keras",
+    ".h5",
+    ".joblib",
+    ".pkl",
+    ".json",
+    ".onnx",
+    ".zip",
+    ".txt",
+)
+
+
+def gather_directory_choices(current: Optional[str]) -> Tuple[List[str], str]:
+    base = normalise_output_directory(current or str(MODEL_OUTPUT_DIR))
+    candidates = {str(base)}
+    try:
+        for candidate in base.parent.iterdir():
+            if candidate.is_dir():
+                candidates.add(str(candidate.resolve()))
+    except Exception:
+        pass
+    return sorted(candidates), str(base)
+
+
+def gather_artifact_choices(
+    directory: Optional[str], selection: Optional[str] = None
+) -> Tuple[List[Tuple[str, str]], Optional[str]]:
+    base = normalise_output_directory(directory)
+    choices: List[Tuple[str, str]] = []
+    selected_value: Optional[str] = None
+    if base.exists():
+        try:
+            artifacts = sorted(
+                [
+                    path
+                    for path in base.iterdir()
+                    if path.is_file()
+                    and (
+                        not ARTIFACT_FILE_EXTENSIONS
+                        or path.suffix.lower() in ARTIFACT_FILE_EXTENSIONS
+                    )
+                ],
+                key=lambda path: path.name.lower(),
+            )
+            choices = [(artifact.name, str(artifact)) for artifact in artifacts]
+        except Exception:
+            choices = []
+
+    if selection and any(value == selection for _, value in choices):
+        selected_value = selection
+    elif choices:
+        selected_value = choices[0][1]
+
+    return choices, selected_value
+
+
+def download_button_state(path: Optional[Union[str, Path]]):
+    if not path:
+        return gr.update(value=None, visible=False)
+    candidate = Path(path)
+    if candidate.exists():
+        return gr.update(value=str(candidate), visible=True)
+    return gr.update(value=None, visible=False)
+
+
 def clear_training_files():
     default_label = LABEL_COLUMN or "Fault"
     for cached_file in TRAINING_UPLOAD_DIR.glob("*"):
@@ -1503,17 +1614,18 @@ def build_interface() -> gr.Blocks:
                             day_download_button = gr.Button(
                                 "⬇️ Download day CSVs", variant="secondary"
                             )
-                    available_files = gr.CheckboxGroup(
-                        label="Available CSV files",
-                        choices=[],
-                        value=[],
-                        elem_id="available-files-grid",
-                    )
-                    download_button = gr.Button(
-                        "⬇️ Download selected CSVs",
-                        variant="secondary",
-                        elem_id="download-selected-button",
-                    )
+                    with gr.Column(elem_id="available-files-section"):
+                        available_files = gr.CheckboxGroup(
+                            label="Available CSV files",
+                            choices=[],
+                            value=[],
+                            elem_id="available-files-grid",
+                        )
+                        download_button = gr.Button(
+                            "⬇️ Download selected CSVs",
+                            variant="secondary",
+                            elem_id="download-selected-button",
+                        )
                     repo_status = gr.Markdown(
                         "Click 'Reload dataset from database' to fetch the directory tree."
                     )
@@ -1576,10 +1688,19 @@ def build_interface() -> gr.Blocks:
                         label="Epochs",
                     )
 
+                directory_choices, directory_default = gather_directory_choices(
+                    str(MODEL_OUTPUT_DIR)
+                )
+                artifact_choices, default_artifact = gather_artifact_choices(
+                    directory_default
+                )
+
                 with gr.Row():
-                    output_directory = gr.Textbox(
-                        value=str(MODEL_OUTPUT_DIR),
+                    output_directory = gr.Dropdown(
+                        value=directory_default,
                         label="Output directory",
+                        choices=directory_choices,
+                        allow_custom_value=True,
                     )
                     model_name = gr.Textbox(
                         value=model_default,
@@ -1594,6 +1715,47 @@ def build_interface() -> gr.Blocks:
                         label="Metadata output filename",
                     )
 
+                with gr.Row():
+                    artifact_browser = gr.Dropdown(
+                        label="Saved artifacts in directory",
+                        choices=artifact_choices,
+                        value=default_artifact,
+                    )
+                    artifact_download_button = gr.DownloadButton(
+                        "⬇️ Download selected artifact",
+                        value=default_artifact,
+                        visible=bool(default_artifact),
+                        variant="secondary",
+                    )
+
+                def on_output_directory_change(selected_dir, current_selection):
+                    choices, normalised = gather_directory_choices(selected_dir)
+                    artifact_options, selected = gather_artifact_choices(
+                        normalised, current_selection
+                    )
+                    return (
+                        gr.update(choices=choices, value=normalised),
+                        gr.update(choices=artifact_options, value=selected),
+                        download_button_state(selected),
+                    )
+
+                def on_artifact_change(selected_path):
+                    return download_button_state(selected_path)
+
+                output_directory.change(
+                    on_output_directory_change,
+                    inputs=[output_directory, artifact_browser],
+                    outputs=[output_directory, artifact_browser, artifact_download_button],
+                    concurrency_limit=EVENT_CONCURRENCY_LIMIT,
+                )
+
+                artifact_browser.change(
+                    on_artifact_change,
+                    inputs=[artifact_browser],
+                    outputs=[artifact_download_button],
+                    concurrency_limit=EVENT_CONCURRENCY_LIMIT,
+                )
+
                 with gr.Row(elem_id="artifact-download-row"):
                     model_download_button = gr.DownloadButton(
                         "⬇️ Download model file",
@@ -1688,16 +1850,8 @@ def build_interface() -> gr.Blocks:
                     metadata_filename,
                     enable_tensorboard,
                 ):
-                    def _download_state(path: Optional[Union[str, Path]]):
-                        if not path:
-                            return gr.update(value=None, visible=False)
-                        candidate = Path(path)
-                        if candidate.exists():
-                            return gr.update(value=str(candidate), visible=True)
-                        return gr.update(value=None, visible=False)
-
+                    base_dir = normalise_output_directory(output_dir)
                     try:
-                        base_dir = normalise_output_directory(output_dir)
                         base_dir.mkdir(parents=True, exist_ok=True)
 
                         model_path = resolve_output_path(
@@ -1820,28 +1974,39 @@ def build_interface() -> gr.Blocks:
                             skipped = ", ".join(missing_paths)
                             status = f"⚠️ Skipped missing files: {skipped}\n" + status
 
+                        artifact_choices, selected_artifact = gather_artifact_choices(
+                            str(base_dir), result["model_path"]
+                        )
+
                         return (
                             status,
                             report_df,
                             result["history"],
                             confusion_df,
-                            _download_state(result["model_path"]),
-                            _download_state(result["scaler_path"]),
-                            _download_state(result["metadata_path"]),
-                            _download_state(tensorboard_zip),
+                            download_button_state(result["model_path"]),
+                            download_button_state(result["scaler_path"]),
+                            download_button_state(result["metadata_path"]),
+                            download_button_state(tensorboard_zip),
                             gr.update(value=result.get("label_column", label_column)),
+                            gr.update(choices=artifact_choices, value=selected_artifact),
+                            download_button_state(selected_artifact),
                         )
                     except Exception as exc:
+                        artifact_choices, selected_artifact = gather_artifact_choices(
+                            str(base_dir)
+                        )
                         return (
                             f"Training failed: {exc}",
                             pd.DataFrame(),
                             {},
                             pd.DataFrame(),
-                            _download_state(None),
-                            _download_state(None),
-                            _download_state(None),
-                            _download_state(None),
+                            download_button_state(None),
+                            download_button_state(None),
+                            download_button_state(None),
+                            download_button_state(None),
                             gr.update(),
+                            gr.update(choices=artifact_choices, value=selected_artifact),
+                            download_button_state(selected_artifact),
                         )
 
                 def _check_progress(output_dir, model_filename, current_messages):
@@ -1897,6 +2062,8 @@ def build_interface() -> gr.Blocks:
                         metadata_download_button,
                         tensorboard_download_button,
                         label_input,
+                        artifact_browser,
+                        artifact_download_button,
                     ],
                     concurrency_limit=EVENT_CONCURRENCY_LIMIT,
                 )