Fix Netlify build and add two-output function to simdec_app.py

Author: justushelo

.gitignore

@@ -40,3 +40,6 @@ app.html
 venv/
 .venv/
 .wasm-build-venv/
+
+# Local Netlify folder
+.netlify

netlify.toml

@@ -2,5 +2,17 @@
   command = "npm run build"
   publish = "dist/pyodide"
 
+[dev]
+  # Prevent Netlify from watching these folders for changes
+  ignore = ["dist", ".wasm-build-venv", "panel/data"]
+  # Force it to use a specific port to avoid EADDRINUSE
+  port = 8888
+
 [build.environment]
   PYTHON_VERSION = "3.11"
+
+[[headers]]
+  for = "/*"
+  [headers.values]
+    Cross-Origin-Embedder-Policy = "require-corp"
+    Cross-Origin-Opener-Policy = "same-origin"

package.json

@@ -5,6 +5,6 @@
   "description": "Static Panel WASM build wrapper",
   "scripts": {
     "build": "bash ./scripts/build_wasm.sh",
-    "serve": "python3 -m http.server 8000 --directory dist/pyodide"
+    "serve": "mkdir -p dist/pyodide && python3 -m http.server 8000 --directory dist/pyodide"
   }
 }

panel/simdec_app.py

@@ -11,7 +11,6 @@
 import pandas as pd
 from pandas.io.formats.style import Styler
 import panel as pn
-import seaborn as sns
 
 import simdec as sd
 from simdec.sensitivity_indices import SensitivityAnalysisResult
@@ -43,10 +42,15 @@
 )
 
 VALID_CHARACTERS = re.compile(r"[^A-Za-z0-9_ \-.]")
-try:
-    DEFAULT_STRESS_CSV = Path(__file__).resolve().parent / "data" / "stress.csv"
-except NameError:
+# try:
+#     DEFAULT_STRESS_CSV = Path(__file__).resolve().parent / "data" / "stress.csv"
+# except NameError:
+#     DEFAULT_STRESS_CSV = Path("data/stress.csv")
+if Path("data/stress.csv").exists():
     DEFAULT_STRESS_CSV = Path("data/stress.csv")
+else:
+    # Fallback for if the zip was flattened or file is in the root
+    DEFAULT_STRESS_CSV = Path("stress.csv")
 GENERIC_ERROR_MSG = (
     "Could not parse the CSV file. "
     "Please check that it uses commas ',' as the delimiter "
@@ -262,49 +266,18 @@ def figure_pn(
         ax.set(xlabel=output_name)
         ax.set_xlim(xlim)
     else:
-        fig, axs = plt.subplots(2, 2, sharex="col", sharey="row", figsize=(8, 8))
-
-        axs[0][1].axison = False
-
-        _ = sd.visualization(
+        fig, _ = sd.two_output_visualization(
             bins=res.bins,
+            bins2=res2.bins,
             palette=palette,
             n_bins=n_bins,
-            kind="histogram",
-            ax=axs[0][0],
-        )
-        axs[0][0].set_xlim(xlim)
-        axs[0][0].set_box_aspect(aspect=1)
-        axs[0][0].axis("off")
-
-        data = pd.concat([pd.melt(res.bins), pd.melt(res2.bins)["value"]], axis=1)
-        data.columns = ["c", "x", "y"]
-        data = data.sample(int(r_scatter * len(data)))
-        _ = sns.scatterplot(
-            data, x="x", y="y", hue="c", palette=palette, ax=axs[1][0], legend=False
-        )
-        axs[1][0].set(xlabel=output_name)
-        axs[1][0].set(ylabel=output_2_name)
-        axs[1][0].set_box_aspect(aspect=1)
-
-        _ = sns.histplot(
-            data,
-            y="y",
-            hue="c",
-            multiple="stack",
-            stat="probability",
-            palette=palette,
-            common_bins=True,
-            common_norm=True,
-            bins=40,
-            legend=False,
-            ax=axs[1][1],
+            output_name=output_name,
+            output_name2=output_2_name,
+            xlim=xlim,
+            ylim=ylim,
+            r_scatter=r_scatter,
         )
-        axs[1][1].set_ylim(ylim)
-        axs[1][1].set_box_aspect(aspect=1)
-        axs[1][1].axis("off")
 
-    fig.subplots_adjust(wspace=-0.015, hspace=0)
     return fig
 
 

scripts/build_wasm.sh

@@ -5,6 +5,14 @@ set -x
 
 # Setup paths and environment
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+OUT_DIR="${ROOT_DIR}/dist/pyodide"
+
+# Wipe old build before starting
+if [ -d "${OUT_DIR}" ]; then
+    echo "Cleaning old build..."
+    rm -rf "${OUT_DIR}"
+fi
+
 cd "${ROOT_DIR}"
 
 # Determine which Python interpreter to use
@@ -51,7 +59,6 @@ WHEEL_FILENAME=$(basename "${SIMDEC_WHEEL_PATH}")
 OUT_DIR="${ROOT_DIR}/dist/pyodide"
 mkdir -p "${OUT_DIR}/_static"
 mkdir -p "${OUT_DIR}/data"
-mkdir -p "${OUT_DIR}/panel/data"
 
 # Copy the wheel into the output directory so it's accessible via HTTP
 cp "${SIMDEC_WHEEL_PATH}" "${OUT_DIR}/"
@@ -89,6 +96,9 @@ if [[ ! -f "data/stress.csv" ]]; then
     fi
 fi
 
+# Copy stress.csv to output directory
+cp "data/stress.csv" "${OUT_DIR}/data/"
+
 # Run conversion
 "${PYTHON_BIN}" -m panel convert \
     simdec_app.py \
@@ -98,6 +108,8 @@ fi
     --requirements "${WHEEL_FILENAME}" numpy pandas matplotlib seaborn scipy SALib \
     --resources data/stress.csv
 
+cp "./${WHEEL_FILENAME}" "${OUT_DIR}/"
+
 # Clean up the copied wheel
 rm "${WHEEL_FILENAME}"