Merge branch 'main' into multi-compare

Author: willdunklin

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 <!-- version list -->
 
+## v1.2.2 (2026-03-03)
+
+### Bug Fixes
+
+- **NERSC**: Improve jupyter/nersc usage
+  ([`cc7a7e5`](https://github.com/Kitware/E3SMQuickCompare/commit/cc7a7e55ec4d3b372822e1357c816735edd26176))
+
+### Chores
+
+- Cleanup pyproject
+  ([`2a3fa2e`](https://github.com/Kitware/E3SMQuickCompare/commit/2a3fa2e2531d0be5be2f12d93c5d84e5ccb2073f))
+
+### Refactoring
+
+- **name**: Rename compareview to quickcompare
+  ([`718824d`](https://github.com/Kitware/E3SMQuickCompare/commit/718824ddd986c2171366f695c8eed9505e888c56))
+
+
 ## v1.0.0 (2026-01-26)
 
 - Initial Release

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "e3sm-compareview"
-version = "1.2.0"
+version = "1.2.2"
 description = "An application to explore/analyze data for atmosphere component for E3SM"
 authors = [
     {name = "Kitware Inc."},
@@ -38,9 +38,6 @@ dependencies = [
 tauri = [
     "pyinstaller",
 ]
-vue2 = [
-    "trame-grid-layout>=1.0.3",
-]
 jupyter = [
     "jupyter-server-proxy>=4.0.0",
 ]
@@ -64,11 +61,12 @@ packages = [
 ]
 
 [project.scripts]
-compareview-vue2 = "e3sm_compareview.app:main"
 compareview = "e3sm_compareview.app:main"
+quickcompare = "e3sm_compareview.app:main"
 
 [project.entry-points."jupyter_serverproxy_servers"]
 compareview = "e3sm_compareview.jupyter:setup_compareview"
+quickcompare = "e3sm_compareview.jupyter:setup_quickcompare"
 
 [tool.ruff.lint.per-file-ignores]
 "e3sm_compareview/pipeline.py" = ["F821"]  # Plugin classes loaded dynamically

scripts/setup_tauri.sh

@@ -19,6 +19,7 @@ python -m PyInstaller --clean --noconfirm \
         --collect-all pyproj \
         --collect-all netCDF4 \
         --collect-all paraview \
+        --collect-all e3sm_quickview \
         --collect-all e3sm_compareview \
         --hidden-import pkgutil \
         --add-binary="$PVPYTHON_PATH:."  \

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "app"
-version = "1.2.0"
-description = "CompareView: Visual Analysis for E3SM Atmosphere Data"
+version = "1.2.2"
+description = "QuickCompare: Visual Analysis for E3SM Atmosphere Data"
 authors = ["Kitware"]
 license = ""
 repository = ""

src-tauri/sidecar/trame-x86_64-unknown-linux-gnu

@@ -1,12 +1,16 @@
 #!/bin/bash
 basedir=$(cd "$(dirname "$0")/../lib" && pwd)
 
-if [ -d "$basedir/compareview" ]; then
+if [ -d "$basedir/quickcompare" ]; then
+    rootdir="$basedir/quickcompare"
+elif [ -d "$basedir/compareview" ]; then
     rootdir="$basedir/compareview"
+elif [ -d "$basedir/quick-compare" ]; then
+    rootdir="$basedir/quick-compare"
 elif [ -d "$basedir/compare-view" ]; then
     rootdir="$basedir/compare-view"
 else
-    echo "Error: Could not find compareview or compare-view directory in $basedir" >&2
+    echo "Error: Could not find quickcompare, quick-compare, compareview, or compare-view directory in $basedir" >&2
     exit 1
 fi
 

src-tauri/tauri.conf.json

@@ -6,8 +6,8 @@
     "distDir": "./www"
   },
   "package": {
-    "productName": "CompareView",
-    "version": "1.2.0"
+    "productName": "QuickCompare",
+    "version": "1.2.2"
   },
   "tauri": {
     "allowlist": {
@@ -69,7 +69,7 @@
         "fullscreen": false,
         "height": 600,
         "resizable": true,
-        "title": "CompareView",
+        "title": "QuickCompare",
         "width": 800,
         "visible": false,
         "additionalBrowserArgs": "--force-device-scale-factor=1"

src/e3sm_compareview/__init__.py

@@ -1,6 +1,6 @@
 """CompareView: E3SM CompareView application."""
 
 # TODO(decouple): Revisit "quickview" naming/usage in Tauri configs after refactor.
-__version__ = "1.2.0"
+__version__ = "1.2.2"
 __author__ = "Kitware Inc."
 __license__ = "Apache-2.0"

src/e3sm_compareview/app.py

@@ -18,10 +18,10 @@
     comparison_signature_for,
     label_signature_for,
 )
-from e3sm_compareview.components import drawers, file_browser, toolbars
+from e3sm_compareview.components import doc, drawers, file_browser, toolbars
 from e3sm_compareview.pipeline import EAMVisSource
 from e3sm_compareview.view_manager import ViewManager
-from e3sm_quickview.components import css, dialogs, doc
+from e3sm_quickview.components import css, dialogs
 from e3sm_quickview import module as qv_module
 from e3sm_quickview.utils import cli, compute
 
@@ -44,7 +44,7 @@ def __init__(self, server=None):
         # Initial UI state
         self.state.update(
             {
-                "trame__title": "CompareView",
+                "trame__title": "QuickCompare",
                 "trame__favicon": ASSETS.icon,
                 "is_tauri": False,
                 "animation_play": False,
@@ -111,12 +111,27 @@ async def wait_for_import(**_):
 
     @life_cycle.server_ready
     def _tauri_ready(self, **_):
-        os.write(1, f"tauri-server-port={self.server.port}\n".encode())
+        jupyter_url_prefix = os.environ.get("JUPYTERHUB_SERVICE_PREFIX")
+        jupyter_url_api = os.environ.get("JUPYTERHUB_API_URL")
+        if jupyter_url_prefix:
+            base_url = "https://jupyter.nersc.gov"
+            if jupyter_url_api:
+                base_url = jupyter_url_api[:-8]
+
+            os.write(
+                1,
+                "\nUse URL below to connect to the application:\n\n  => "
+                f"{base_url}{jupyter_url_prefix}proxy/{self.server.port}"
+                "/index.html?ui=main&reconnect=auto\n\n".encode(),
+            )
+        else:
+            os.write(1, f"tauri-server-port={self.server.port}\n".encode())
 
     @life_cycle.client_connected
     def _tauri_show(self, **_):
-        os.write(1, "tauri-client-ready\n".encode())
-
+        jupyter_url_prefix = os.environ.get("JUPYTERHUB_SERVICE_PREFIX")
+        if not jupyter_url_prefix:
+            os.write(1, "tauri-client-ready\n".encode())
     # -------------------------------------------------------------------------
     # UI definition
     # -------------------------------------------------------------------------
@@ -700,7 +715,7 @@ def toggle_toolbar(self, toolbar_name=None):
 # -------------------------------------------------------------------------
 def main():
     app = EAMApp()
-    app.server.start()
+    app.server.start(show_connection_info=False, open_browser=False)
 
 
 if __name__ == "__main__":