Split sessions to not have 1 session state for all users

modified: README.md
modified: ui/static/app.js
modified: ui_app.py

README.md

@@ -12,6 +12,7 @@ Set production secrets in the Hugging Face Space settings, not in committed file
 - `GROQ_API_KEY`: required for Groq model calls.
 - `APP_PASSWORD`: required to password-protect the deployed Space; set it as a Hugging Face Secret.
 - `APP_USERNAME`: optional, defaults to `mastermap` when `APP_PASSWORD` is set.
+- `APP_SECRET_KEY`: recommended for stable, isolated per-browser sessions.
 - `HF_TOKEN`: Hugging Face Space Secret only; optional, required only for the `Save Manual References` button.
 
 `Save Manual References` only enables on Hugging Face Spaces when `SPACE_ID` is present and `HF_TOKEN` is configured. It commits the current `refdata/manual_references.json` back to the Space repository.

ui/static/app.js

@@ -396,13 +396,14 @@
         output_sheet: outputSheet.value || defaultOutputSheet,
         models: models.value.trim()
       });
+      const generatedBlueprintPath = `data/uploads/Blueprint_${activeRunJobId}.xlsx`;
       const stream = new EventSource(`/run?${params.toString()}`);
       activeRunStream = stream;
       stream.onmessage = event => appendCleanLogChunk(JSON.parse(event.data));
       stream.addEventListener("done", async () => {
         stream.close();
         if (!stopRequested) {
-          applyBlueprintPath = "data/Blueprint.xlsx";
+          applyBlueprintPath = generatedBlueprintPath;
           const targetSheet = outputSheet.value || defaultOutputSheet;
           await refreshApplySheets(targetSheet);
           applyButton.disabled = !(applyWorkbookPath && applyBlueprintPath && applySheetSelect.value);
@@ -410,7 +411,7 @@
           cleanResult.classList.add("active");
           cleanResult.innerHTML = `
             <strong>Blueprint generated</strong>
-            <div class="status">Blueprint saved at data/Blueprint.xlsx</div>
+            <div class="status">Blueprint saved for this session.</div>
             <a class="download-link" href="/download-blueprint">Download Blueprint</a>
             <a class="download-link" href="/download-cleaned-workbook">Download Cleaned Workbook</a>
           `;

ui_app.py

@@ -1,9 +1,10 @@
+import os
 import secrets
 import sys
 import uuid
 from pathlib import Path
 
-from flask import Flask, Response, jsonify, render_template, request, send_file
+from flask import Flask, Response, jsonify, render_template, request, send_file, session
 
 from newest_model import PREFERRED_PRODUCTION_CHAT_MODELS, select_groq_chat_models
 from src.config import (
@@ -30,8 +31,9 @@ app = Flask(
     static_folder=str(APP_ROOT / "ui" / "static"),
 )
 app.config["MAX_CONTENT_LENGTH"] = 100 * 1024 * 1024
+app.secret_key = os.getenv("APP_SECRET_KEY", "mastermap-local-dev-secret")
 
-STATE = {
+DEFAULT_STATE = {
     "clean_path": "",
     "clean_filename": "",
     "clean_sheets": [],
@@ -47,6 +49,23 @@ STATE = {
 }
 
 
+def fresh_state():
+    return {
+        key: list(value) if isinstance(value, list) else value
+        for key, value in DEFAULT_STATE.items()
+    }
+
+
+def get_state():
+    if "ui_state" not in session:
+        session["ui_state"] = fresh_state()
+    return session["ui_state"]
+
+
+def mark_state_changed():
+    session.modified = True
+
+
 def auth_required_response() -> Response:
     return Response(
         "Authentication required",
@@ -101,14 +120,16 @@ def default_models() -> str:
 
 
 def render_page(message: str = "", error: str = ""):
-    if STATE["clean_sheets"]:
-        STATE["clean_selected_sheet"] = pick_sheet(STATE["clean_sheets"], STATE["clean_selected_sheet"])
-    if STATE["apply_sheets"]:
-        STATE["apply_selected_sheet"] = pick_sheet(STATE["apply_sheets"], STATE["apply_selected_sheet"])
+    state = get_state()
+    if state["clean_sheets"]:
+        state["clean_selected_sheet"] = pick_sheet(state["clean_sheets"], state["clean_selected_sheet"], state)
+    if state["apply_sheets"]:
+        state["apply_selected_sheet"] = pick_sheet(state["apply_sheets"], state["apply_selected_sheet"], state)
+    mark_state_changed()
 
     return render_template(
         "index.html",
-        **STATE,
+        **state,
         default_output_sheet=DEFAULT_OUTPUT_SHEET_NAME,
         default_models=default_models(),
         can_apply=can_apply_blueprint(),
@@ -118,11 +139,12 @@ def render_page(message: str = "", error: str = ""):
 
 
 def can_apply_blueprint() -> bool:
+    state = get_state()
     return bool(
-        STATE["apply_workbook_path"]
-        and STATE["apply_blueprint_path"]
-        and STATE["apply_sheets"]
-        and STATE["apply_selected_sheet"]
+        state["apply_workbook_path"]
+        and state["apply_blueprint_path"]
+        and state["apply_sheets"]
+        and state["apply_selected_sheet"]
     )
 
 
@@ -131,32 +153,36 @@ def wants_json_response() -> bool:
 
 
 def ui_state_payload(message: str = "", error: str = ""):
+    state = get_state()
     return {
         "message": message,
         "error": error,
-        "apply_workbook_path": STATE["apply_workbook_path"],
-        "apply_workbook_filename": STATE["apply_workbook_filename"],
-        "apply_sheets": STATE["apply_sheets"],
-        "apply_selected_sheet": STATE["apply_selected_sheet"],
-        "apply_blueprint_path": STATE["apply_blueprint_path"],
-        "apply_blueprint_filename": STATE["apply_blueprint_filename"],
+        "apply_workbook_path": state["apply_workbook_path"],
+        "apply_workbook_filename": state["apply_workbook_filename"],
+        "apply_sheets": state["apply_sheets"],
+        "apply_selected_sheet": state["apply_selected_sheet"],
+        "apply_blueprint_path": state["apply_blueprint_path"],
+        "apply_blueprint_filename": state["apply_blueprint_filename"],
         "can_apply": can_apply_blueprint(),
     }
 
 
-def pick_sheet(sheets, preferred_sheet=None):
+def pick_sheet(sheets, preferred_sheet=None, state=None):
+    state = state or get_state()
     if preferred_sheet and preferred_sheet in sheets:
         return preferred_sheet
-    if STATE["output_sheet"] in sheets:
-        return STATE["output_sheet"]
+    if state["output_sheet"] in sheets:
+        return state["output_sheet"]
     return sheets[0] if sheets else ""
 
 
 def update_ui_state_from_form(form):
-    STATE["clean_selected_sheet"] = form.get("clean_selected_sheet") or STATE["clean_selected_sheet"]
-    STATE["output_sheet"] = form.get("output_sheet") or STATE["output_sheet"] or DEFAULT_OUTPUT_SHEET_NAME
-    STATE["models"] = form.get("models") or STATE["models"]
-    STATE["apply_selected_sheet"] = form.get("apply_selected_sheet") or STATE["apply_selected_sheet"]
+    state = get_state()
+    state["clean_selected_sheet"] = form.get("clean_selected_sheet") or state["clean_selected_sheet"]
+    state["output_sheet"] = form.get("output_sheet") or state["output_sheet"] or DEFAULT_OUTPUT_SHEET_NAME
+    state["models"] = form.get("models") or state["models"]
+    state["apply_selected_sheet"] = form.get("apply_selected_sheet") or state["apply_selected_sheet"]
+    mark_state_changed()
 
 
 @app.route("/")
@@ -168,35 +194,39 @@ def index():
 def prepare_clean():
     try:
         update_ui_state_from_form(request.form)
+        state = get_state()
         filename, path = save_uploaded_excel(request.files.get("file"), UPLOAD_DIR)
         sheets = read_workbook_sheets(path)
     except Exception as exc:
         return render_page(error=str(exc))
 
-    STATE["clean_path"] = str(path)
-    STATE["clean_filename"] = filename
-    STATE["clean_sheets"] = sheets
-    STATE["clean_selected_sheet"] = pick_sheet(sheets, request.form.get("clean_selected_sheet"))
-    STATE["apply_workbook_path"] = str(path)
-    STATE["apply_workbook_filename"] = filename
-    STATE["apply_sheets"] = sheets
-    STATE["apply_selected_sheet"] = pick_sheet(sheets, request.form.get("apply_selected_sheet") or STATE["output_sheet"])
+    state["clean_path"] = str(path)
+    state["clean_filename"] = filename
+    state["clean_sheets"] = sheets
+    state["clean_selected_sheet"] = pick_sheet(sheets, request.form.get("clean_selected_sheet"), state)
+    state["apply_workbook_path"] = str(path)
+    state["apply_workbook_filename"] = filename
+    state["apply_sheets"] = sheets
+    state["apply_selected_sheet"] = pick_sheet(sheets, request.form.get("apply_selected_sheet") or state["output_sheet"], state)
+    mark_state_changed()
     return render_page(message=f"Loaded {filename}.")
 
 
 @app.route("/remove-clean", methods=["POST"])
 def remove_clean():
     update_ui_state_from_form(request.form)
-    old_path = STATE["clean_path"]
-    STATE["clean_path"] = ""
-    STATE["clean_filename"] = ""
-    STATE["clean_sheets"] = []
-    STATE["clean_selected_sheet"] = ""
-    if STATE["apply_workbook_path"] == old_path:
-        STATE["apply_workbook_path"] = ""
-        STATE["apply_workbook_filename"] = ""
-        STATE["apply_sheets"] = []
-        STATE["apply_selected_sheet"] = ""
+    state = get_state()
+    old_path = state["clean_path"]
+    state["clean_path"] = ""
+    state["clean_filename"] = ""
+    state["clean_sheets"] = []
+    state["clean_selected_sheet"] = ""
+    if state["apply_workbook_path"] == old_path:
+        state["apply_workbook_path"] = ""
+        state["apply_workbook_filename"] = ""
+        state["apply_sheets"] = []
+        state["apply_selected_sheet"] = ""
+    mark_state_changed()
     return render_page(message="File removed.")
 
 
@@ -204,6 +234,7 @@ def remove_clean():
 def prepare_apply_workbook():
     try:
         update_ui_state_from_form(request.form)
+        state = get_state()
         filename, path = save_uploaded_excel(request.files.get("file"), UPLOAD_DIR)
         sheets = read_workbook_sheets(path)
     except Exception as exc:
@@ -211,10 +242,11 @@ def prepare_apply_workbook():
             return jsonify(ui_state_payload(error=str(exc))), 400
         return render_page(error=str(exc))
 
-    STATE["apply_workbook_path"] = str(path)
-    STATE["apply_workbook_filename"] = filename
-    STATE["apply_sheets"] = sheets
-    STATE["apply_selected_sheet"] = pick_sheet(sheets, request.form.get("apply_selected_sheet"))
+    state["apply_workbook_path"] = str(path)
+    state["apply_workbook_filename"] = filename
+    state["apply_sheets"] = sheets
+    state["apply_selected_sheet"] = pick_sheet(sheets, request.form.get("apply_selected_sheet"), state)
+    mark_state_changed()
     if wants_json_response():
         return jsonify(ui_state_payload(message=f"Loaded apply workbook {filename}."))
     return render_page(message=f"Loaded apply workbook {filename}.")
@@ -224,17 +256,19 @@ def prepare_apply_workbook():
 def prepare_apply_blueprint():
     try:
         update_ui_state_from_form(request.form)
-        if STATE["apply_workbook_path"] and Path(STATE["apply_workbook_path"]).is_file():
-            STATE["apply_sheets"] = read_workbook_sheets(Path(STATE["apply_workbook_path"]))
-        STATE["apply_selected_sheet"] = pick_sheet(STATE["apply_sheets"], request.form.get("apply_selected_sheet"))
+        state = get_state()
+        if state["apply_workbook_path"] and Path(state["apply_workbook_path"]).is_file():
+            state["apply_sheets"] = read_workbook_sheets(Path(state["apply_workbook_path"]))
+        state["apply_selected_sheet"] = pick_sheet(state["apply_sheets"], request.form.get("apply_selected_sheet"), state)
         filename, path = save_uploaded_excel(request.files.get("file"), UPLOAD_DIR)
     except Exception as exc:
         if wants_json_response():
             return jsonify(ui_state_payload(error=str(exc))), 400
         return render_page(error=str(exc))
 
-    STATE["apply_blueprint_path"] = str(path)
-    STATE["apply_blueprint_filename"] = filename
+    state["apply_blueprint_path"] = str(path)
+    state["apply_blueprint_filename"] = filename
+    mark_state_changed()
     if wants_json_response():
         return jsonify(ui_state_payload(message=f"Loaded blueprint {filename}."))
     return render_page(message=f"Loaded blueprint {filename}.")
@@ -276,7 +310,10 @@ def sheets_endpoint():
 
 @app.route("/download-blueprint")
 def download_blueprint():
-    blueprint_path = APP_ROOT / DATA_DIR / "Blueprint.xlsx"
+    state = get_state()
+    if not state["apply_blueprint_path"]:
+        return jsonify({"error": "Blueprint has not been generated yet."}), 404
+    blueprint_path = resolve_allowed_path(state["apply_blueprint_path"], APP_ROOT, ALLOWED_FILE_ROOTS)
     if not blueprint_path.exists():
         return jsonify({"error": "Blueprint has not been generated yet."}), 404
     return send_file(blueprint_path, as_attachment=True, download_name="Blueprint.xlsx")
@@ -284,29 +321,31 @@ def download_blueprint():
 
 @app.route("/download-cleaned-workbook")
 def download_cleaned_workbook():
-    if not STATE["clean_path"]:
+    state = get_state()
+    if not state["clean_path"]:
         return jsonify({"error": "Cleaned workbook is not available."}), 404
-    workbook_path = resolve_allowed_path(STATE["clean_path"], APP_ROOT, ALLOWED_FILE_ROOTS)
+    workbook_path = resolve_allowed_path(state["clean_path"], APP_ROOT, ALLOWED_FILE_ROOTS)
     if not workbook_path.is_file():
         return jsonify({"error": "Cleaned workbook is not available."}), 404
     return send_file(
         workbook_path,
         as_attachment=True,
-        download_name=f"cleaned_{STATE['clean_filename'] or workbook_path.name}",
+        download_name=f"cleaned_{state['clean_filename'] or workbook_path.name}",
     )
 
 
 @app.route("/download-applied-workbook")
 def download_applied_workbook():
-    if not STATE["apply_workbook_path"]:
+    state = get_state()
+    if not state["apply_workbook_path"]:
         return jsonify({"error": "Applied workbook is not available."}), 404
-    workbook_path = resolve_allowed_path(STATE["apply_workbook_path"], APP_ROOT, ALLOWED_FILE_ROOTS)
+    workbook_path = resolve_allowed_path(state["apply_workbook_path"], APP_ROOT, ALLOWED_FILE_ROOTS)
     if not workbook_path.is_file():
         return jsonify({"error": "Applied workbook is not available."}), 404
     return send_file(
         workbook_path,
         as_attachment=True,
-        download_name=f"cleaned_{STATE['apply_workbook_filename'] or workbook_path.name}",
+        download_name=f"cleaned_{state['apply_workbook_filename'] or workbook_path.name}",
     )
 
 
@@ -326,6 +365,12 @@ def run():
     except ValueError as exc:
         return jsonify({"error": str(exc)}), 400
 
+    blueprint_path = UPLOAD_DIR / f"Blueprint_{job_id}.xlsx"
+    state = get_state()
+    state["apply_blueprint_path"] = str(blueprint_path)
+    state["apply_blueprint_filename"] = blueprint_path.name
+    mark_state_changed()
+
     command = [
         sys.executable,
         "-u",
@@ -336,6 +381,8 @@ def run():
         sheet,
         "--output_sheet",
         output_sheet,
+        "--blueprint",
+        str(blueprint_path),
     ]
     if model_list:
         command.extend(["--models", model_list])