lunar-toolkit 0.1.0.dev7__tar.gz → 0.1.0.dev13__tar.gz

{lunar_toolkit-0.1.0.dev7 → lunar_toolkit-0.1.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lunar-toolkit
-Version: 0.1.0.dev7
+Version: 0.1.0.dev13
 Summary: Find, download and process lunar orbital imagery (LROC, ShadowCam, Kaguya TC) and build stereo and shape-from-shading DEMs with ISIS + ASP
 License-Expression: BSD-3-Clause
 Keywords: moon,lroc,shadowcam,kaguya,isis,ames-stereo-pipeline,shape-from-shading,dem
@@ -51,6 +51,7 @@ Dynamic: license-file
 [![coverage](https://img.shields.io/endpoint?url=https://alexmaietta.github.io/lunar-toolkit/coverage/badge.json)](https://alexmaietta.github.io/lunar-toolkit/coverage/)
 [![pypi](https://img.shields.io/pypi/v/lunar-toolkit)](https://pypi.org/project/lunar-toolkit/)
 [![license](https://img.shields.io/badge/license-BSD_3--Clause-blue)](LICENSE)
+[![app](https://img.shields.io/badge/app-open_in_browser-yellow)](https://alexmaietta.github.io/lunar-toolkit/browser/)
 
 # Lunar Toolkit
 

{lunar_toolkit-0.1.0.dev7 → lunar_toolkit-0.1.0.dev13}/README.md

@@ -2,6 +2,7 @@
 [![coverage](https://img.shields.io/endpoint?url=https://alexmaietta.github.io/lunar-toolkit/coverage/badge.json)](https://alexmaietta.github.io/lunar-toolkit/coverage/)
 [![pypi](https://img.shields.io/pypi/v/lunar-toolkit)](https://pypi.org/project/lunar-toolkit/)
 [![license](https://img.shields.io/badge/license-BSD_3--Clause-blue)](LICENSE)
+[![app](https://img.shields.io/badge/app-open_in_browser-yellow)](https://alexmaietta.github.io/lunar-toolkit/browser/)
 
 # Lunar Toolkit
 

{lunar_toolkit-0.1.0.dev7 → lunar_toolkit-0.1.0.dev13}/lunar_toolkit/cli/app.py

@@ -54,7 +54,7 @@ Examples
 
 The server runs on this machine (a free port on 127.0.0.1 by default) and stops when
 the window closes. Window backends, first available wins (--backend auto):
-  webview   pywebview: Qt WebEngine on Linux (pip install PyQt6 PyQt6-WebEngine qtpy,
+  webview   pywebview: Qt WebEngine on Linux (pip install "lunar-toolkit[app]",
             or PyGObject + WebKitGTK), Edge WebView2 on Windows, WebKit on macOS
   chromium  Chrome / Chromium / Edge / Brave in --app mode (own profile in the cache dir)
   browser   the default browser (Ctrl-C stops the server)
@@ -128,22 +128,39 @@ def chromium_binary(platform: str | None = None) -> str | None:
     return None
 
 
+INSTALL_HINT = 'pip install "lunar-toolkit[app]"'
+
+
 def choose_backend(requested: str = "auto", platform: str | None = None) -> tuple[str, str | None]:
     """``(backend, detail)``: the pywebview GUI name, the Chromium binary, or None for the browser."""
     if requested in ("auto", "webview"):
         gui = webview_gui(platform)
         if gui:
             return "webview", gui
-    if requested in ("auto", "chromium", "webview"):
+    if requested in ("auto", "chromium"):
         binary = chromium_binary(platform)
         if binary:
             return "chromium", binary
     return "browser", None
 
 
+def _quiet_qt_exit() -> None:
+    """Drop Qt WebEngine's harmless "Release of profile requested" warning on window close."""
+    from qtpy.QtCore import qInstallMessageHandler
+
+    def handler(mode: Any, context: Any, message: str | None) -> None:
+        if message and "WebEnginePage still not deleted" not in message:
+            sys.stderr.write(message + "\n")
+
+    qInstallMessageHandler(handler)
+
+
 def _run_webview(url: str, gui: str) -> None:
     import webview
 
+    if gui == "qt":
+        _quiet_qt_exit()
+
     from ..constants import DEFAULT_CACHE_DIR
 
     webview.create_window(TITLE, url, width=SIZE[0], height=SIZE[1], min_size=MIN_SIZE)
@@ -171,6 +188,12 @@ def _run_chromium(url: str, binary: str) -> None:
 def run(args: argparse.Namespace) -> int:
     from .serve import make_server, print_banner
 
+    backend, detail = choose_backend(args.backend)
+    if args.backend == "webview" and backend != "webview":
+        print(
+            f"No native window toolkit for pywebview here; {INSTALL_HINT}, or use --backend chromium / browser."
+        )
+        return 1
     try:
         server, cfg = make_server(args)
     except (ValueError, OSError) as exc:
@@ -179,7 +202,8 @@ def run(args: argparse.Namespace) -> int:
     url = print_banner(server, cfg, args.host, TITLE)
     thread = threading.Thread(target=server.serve_forever, name="lunar-server", daemon=True)
     thread.start()
-    backend, detail = choose_backend(args.backend)
+    if backend != "webview" and args.backend == "auto":
+        print(f"  note     : no native window toolkit; {INSTALL_HINT} for one")
     try:
         if backend == "webview" and detail:
             print(f"  window   : pywebview ({detail})")
@@ -193,7 +217,7 @@ def run(args: argparse.Namespace) -> int:
             print(f"  window   : {Path(detail).name} --app")
             _run_chromium(url, detail)
             return 0
-        print("  window   : none found (pip install PyQt6 PyQt6-WebEngine qtpy); opening a browser tab")
+        print("  window   : no Chrome / Chromium / Edge either; opening a browser tab")
         print("  Ctrl-C to stop.\n")
         webbrowser.open(url)
         while thread.is_alive():

{lunar_toolkit-0.1.0.dev7 → lunar_toolkit-0.1.0.dev13}/lunar_toolkit/cli/serve.py

@@ -29,6 +29,7 @@ COMMAND = "serve"
 
 _STATIC_DIR = Path(__file__).parent.parent / "static"
 _INDEX = _STATIC_DIR / "index.html"
+_BASEMAPS = _STATIC_DIR / "basemaps"
 
 _IMAGE_TYPES = {
     ".tif": "image/tiff",
@@ -44,7 +45,11 @@ _RELAY_HOSTS = (
     "pds.lroc.im-ldi.com",
     "pds.shadowcam.im-ldi.com",
     "data.darts.isas.jaxa.jp",
+    "pgda.gsfc.nasa.gov",
 )
+# Hosts relayed only under these path prefixes (PGDA: the LOLA DEMs for the map's contours)
+_RELAY_PATHS = {"pgda.gsfc.nasa.gov": "/data/LOLA_20mpp/"}
+_BASEMAP_TYPES = {**_IMAGE_TYPES, ".json": "application/json"}
 _MAX_LISTED_IMAGES = 2000
 RELAY_MAX = 6
 RELAY_WAIT = 30.0
@@ -189,6 +194,7 @@ def _relay_allowed(url: str) -> bool:
         and port is None
         and not u.username
         and Path(u.path).suffix.lower() in _IMAGE_TYPES
+        and u.path.startswith(_RELAY_PATHS.get(u.hostname, "/"))
     )
 
 
@@ -382,6 +388,13 @@ class LunarHandler(http.server.BaseHTTPRequestHandler):
                 },
                 body,
             )
+        elif path.startswith("/basemaps/"):
+            name = path[len("/basemaps/") :]
+            ctype = _BASEMAP_TYPES.get(Path(name).suffix.lower())
+            if not ctype or "/" in name or name.startswith("."):
+                self._send_code(404)
+                return
+            self._serve(_BASEMAPS / name, ctype, body)
         elif path == "/api/images":
             self._json(_list_images(cfg.images_dir) if cfg.images_dir else [], body)
         elif path.startswith("/images/") and cfg.images_dir is not None:

lunar_toolkit-0.1.0.dev13/lunar_toolkit/static/basemaps/manifest.json

@@ -0,0 +1,11 @@
+{
+  "wac_global": {"file": "wac_global.jpg", "proj": "eqc", "bounds": [-180, -90, 180, 90]},
+  "lola_shade_global": {"file": "lola_shade_global.jpg", "proj": "eqc", "bounds": [-180, -90, 180, 90]},
+  "lola_dem_global": {"file": "lola_dem_global.tif", "proj": "eqc"},
+  "wac_south": {"file": "wac_south.jpg", "proj": "S", "bounds": [-609600, -609600, 609600, 609600]},
+  "wac_north": {"file": "wac_north.jpg", "proj": "N", "bounds": [-609600, -609600, 609600, 609600]},
+  "lola_shade_south": {"file": "lola_shade_south.jpg", "proj": "S", "bounds": [-609600, -609600, 609600, 609600]},
+  "lola_shade_north": {"file": "lola_shade_north.jpg", "proj": "N", "bounds": [-609600, -609600, 609600, 609600]},
+  "lola_dem_south": {"file": "lola_dem_south.tif", "proj": "S"},
+  "lola_dem_north": {"file": "lola_dem_north.tif", "proj": "N"}
+}