nds-mapviewer 2026.2.1.dev93__tar.gz → 2026.2.1.dev94__tar.gz

{nds_mapviewer-2026.2.1.dev93 → nds_mapviewer-2026.2.1.dev94}/CHANGELOG.md

@@ -18,6 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Run screen now shows a config line below the info banner with the source
   (config file or directly-passed data-source path, e.g. a `*.ndslive`
   filestore) and the mapped config mounted into the container
+- Accept an http(s) service URL directly as a source (e.g.
+  `mapviewer https://my-host/openapi.json`), turned into a
+  `SmartLayerTileService`; the bare-URL form configures no auth — use
+  ndslive-server as a proxy or a config.yaml with `http-settings` for
+  authenticated services
 - Default Docker image version pinned to package (`--image-version` defaults to
   matching calver instead of `"latest"`)
 - SCM-based versioning — package version derived from MapViewer git tags
@@ -31,6 +36,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Quitting the TUI no longer hangs — the log-follow stream is torn down by
   terminating the process before closing pipes, and container shutdown is
   bounded so the terminal is always returned to the user
+- `localhost`/`127.0.0.1` in service `uri` values and `http-settings` `scope`
+  values are now translated to `host.docker.internal`, so a service running on
+  the host machine is reachable from the container without `--network host`
 - Container readiness check uses log sentinel before HTTP polling to avoid
   startup crash (mapget#151)
 

{nds_mapviewer-2026.2.1.dev93/src/nds_mapviewer.egg-info → nds_mapviewer-2026.2.1.dev94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.2.1.dev93
+Version: 2026.2.1.dev94
 Summary: CLI to run the NDS MapViewer Docker container for visualizing map data (NDS.Live, GeoJSON, and more)
 Author-email: NDS Association <support@nds-association.org>
 License: Proprietary
@@ -74,6 +74,7 @@ mapviewer                         # HomeScreen (or auto-loads ~/.nds/config.yaml
 mapviewer /path/to/data.ndslive   # View a local FileStore
 mapviewer /path/to/folder         # View a local SmartLayer folder
 mapviewer /path/to/geojson/       # View a GeoJSON folder
+mapviewer https://host/openapi.json  # Connect to a remote service (unauthenticated)
 mapviewer --demo                  # Try it with NDS Islands sample data
 
 mapviewer mywork                  # Load a saved config by name
@@ -86,6 +87,19 @@ mapviewer --demo --network host   # Run the container on the host network
 
 All commands accept `-e community|member` and `-i VERSION`.
 
+### Remote service URLs
+
+A source can be an http(s) service URL (e.g. `mapviewer https://my-host/openapi.json`),
+which is turned into a `SmartLayerTileService`. The bare-URL form configures **no
+authentication** — for protected services, proxy them through `ndslive-server` or
+declare the service in a `config.yaml` with an `http-settings` block (api-key, basic,
+bearer, OAuth2, proxy).
+
+For a service running on your own machine, use `localhost`/`127.0.0.1`
+(e.g. `mapviewer http://127.0.0.1:8080/openapi.json`) — it is automatically
+rewritten to `host.docker.internal` so the container can reach it. You do **not**
+need `--network host` for this.
+
 ### Container environment variables
 
 `--debug` turns on verbose logging in the MapViewer container (shorthand for

{nds_mapviewer-2026.2.1.dev93 → nds_mapviewer-2026.2.1.dev94}/README.md

@@ -41,6 +41,7 @@ mapviewer                         # HomeScreen (or auto-loads ~/.nds/config.yaml
 mapviewer /path/to/data.ndslive   # View a local FileStore
 mapviewer /path/to/folder         # View a local SmartLayer folder
 mapviewer /path/to/geojson/       # View a GeoJSON folder
+mapviewer https://host/openapi.json  # Connect to a remote service (unauthenticated)
 mapviewer --demo                  # Try it with NDS Islands sample data
 
 mapviewer mywork                  # Load a saved config by name
@@ -53,6 +54,19 @@ mapviewer --demo --network host   # Run the container on the host network
 
 All commands accept `-e community|member` and `-i VERSION`.
 
+### Remote service URLs
+
+A source can be an http(s) service URL (e.g. `mapviewer https://my-host/openapi.json`),
+which is turned into a `SmartLayerTileService`. The bare-URL form configures **no
+authentication** — for protected services, proxy them through `ndslive-server` or
+declare the service in a `config.yaml` with an `http-settings` block (api-key, basic,
+bearer, OAuth2, proxy).
+
+For a service running on your own machine, use `localhost`/`127.0.0.1`
+(e.g. `mapviewer http://127.0.0.1:8080/openapi.json`) — it is automatically
+rewritten to `host.docker.internal` so the container can reach it. You do **not**
+need `--network host` for this.
+
 ### Container environment variables
 
 `--debug` turns on verbose logging in the MapViewer container (shorthand for

{nds_mapviewer-2026.2.1.dev93 → nds_mapviewer-2026.2.1.dev94/src/nds_mapviewer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.2.1.dev93
+Version: 2026.2.1.dev94
 Summary: CLI to run the NDS MapViewer Docker container for visualizing map data (NDS.Live, GeoJSON, and more)
 Author-email: NDS Association <support@nds-association.org>
 License: Proprietary
@@ -74,6 +74,7 @@ mapviewer                         # HomeScreen (or auto-loads ~/.nds/config.yaml
 mapviewer /path/to/data.ndslive   # View a local FileStore
 mapviewer /path/to/folder         # View a local SmartLayer folder
 mapviewer /path/to/geojson/       # View a GeoJSON folder
+mapviewer https://host/openapi.json  # Connect to a remote service (unauthenticated)
 mapviewer --demo                  # Try it with NDS Islands sample data
 
 mapviewer mywork                  # Load a saved config by name
@@ -86,6 +87,19 @@ mapviewer --demo --network host   # Run the container on the host network
 
 All commands accept `-e community|member` and `-i VERSION`.
 
+### Remote service URLs
+
+A source can be an http(s) service URL (e.g. `mapviewer https://my-host/openapi.json`),
+which is turned into a `SmartLayerTileService`. The bare-URL form configures **no
+authentication** — for protected services, proxy them through `ndslive-server` or
+declare the service in a `config.yaml` with an `http-settings` block (api-key, basic,
+bearer, OAuth2, proxy).
+
+For a service running on your own machine, use `localhost`/`127.0.0.1`
+(e.g. `mapviewer http://127.0.0.1:8080/openapi.json`) — it is automatically
+rewritten to `host.docker.internal` so the container can reach it. You do **not**
+need `--network host` for this.
+
 ### Container environment variables
 
 `--debug` turns on verbose logging in the MapViewer container (shorthand for

{nds_mapviewer-2026.2.1.dev93 → nds_mapviewer-2026.2.1.dev94}/src/ndslive/mapviewer/cli.py

@@ -117,6 +117,7 @@ def cmd_main(args: argparse.Namespace) -> int:
         create_folder_config,
         create_geojson_config,
         create_classic_config,
+        create_service_config,
         get_demo_config,
     )
     from .tui import MapViewerApp
@@ -219,6 +220,18 @@ def cmd_main(args: argparse.Namespace) -> int:
     source_config_path: Path | None = None
 
     for source_arg in source_args:
+        # Remote service: an http(s) URL is turned into a SmartLayerTileService
+        # source directly. Checked before the path:mapId split below because
+        # URLs contain colons. No auth is configured for the bare-URL form —
+        # use ndslive-server as a proxy or a config.yaml for authenticated
+        # services.
+        if source_arg.startswith(("http://", "https://")):
+            config = create_service_config(source_arg)
+            descriptions.append(f"service: {source_arg}")
+            all_sources.extend(config.get("sources", []))
+            all_http_settings.extend(config.get("http-settings", []))
+            continue
+
         # Parse optional path:mapId syntax
         custom_map_id = None
         if ":" in source_arg:
@@ -313,6 +326,9 @@ Examples:
   mapviewer /path/to/geojson/folder
   mapviewer --demo
 
+  # Connect to a remote service (unauthenticated)
+  mapviewer https://my-host/openapi.json
+
   # Multiple sources at once
   mapviewer /path/a.ndslive /path/to/geojson/
 
@@ -335,7 +351,7 @@ Examples:
     parser.add_argument(
         "sources",
         nargs="*",
-        help="One or more data source paths or saved config names",
+        help="One or more data source paths, http(s) service URLs, or saved config names",
     )
     parser.add_argument(
         "--demo",

{nds_mapviewer-2026.2.1.dev93 → nds_mapviewer-2026.2.1.dev94}/src/ndslive/mapviewer/config.py

@@ -138,6 +138,22 @@ def _transform_localhost(host: str) -> str:
     return host
 
 
+def _transform_localhost_url(url: str) -> str:
+    """Rewrite a localhost host in an http(s) URL to host.docker.internal.
+
+    Used for source ``uri`` values and ``http-settings`` ``scope`` values so a
+    service running on the host machine (e.g. ``http://127.0.0.1:8080/...``) is
+    reachable from inside the container. Non-http(s) values and non-localhost
+    hosts are returned unchanged.
+    """
+    parsed = urlparse(url)
+    if parsed.scheme not in ("http", "https"):
+        return url
+    if not _is_localhost(parsed.netloc):
+        return url
+    return parsed._replace(netloc=_transform_localhost(parsed.netloc)).geturl()
+
+
 def _is_external_or_bundle_url(value: str) -> bool:
     """Return True for URLs that should not be rewritten as local files."""
     return value.startswith(("http://", "https://", "bundle"))
@@ -313,6 +329,12 @@ def transform_config(
             if local_path:
                 local_paths.append(local_path)
                 path_locations.append(("sources", idx, "uri", uri))
+            else:
+                # Remote service on the host: localhost/127.0.0.1 must become
+                # host.docker.internal to be reachable from inside the container.
+                new_uri = _transform_localhost_url(uri)
+                if new_uri != uri:
+                    transformed["sources"][idx]["uri"] = new_uri
 
         # Check folder field (ClassicFolder, GeoJsonFolder)
         folder = source.get("folder", "")
@@ -327,6 +349,15 @@ def transform_config(
         if host and _is_localhost(host):
             transformed["sources"][idx]["host"] = _transform_localhost(host)
 
+    # Translate localhost in http-settings scopes so auth settings keep
+    # matching the rewritten source URIs.
+    for setting in transformed.get("http-settings", []) or []:
+        scope = setting.get("scope", "")
+        if scope:
+            new_scope = _transform_localhost_url(scope)
+            if new_scope != scope:
+                setting["scope"] = new_scope
+
     # Find optimal mount points
     path_to_mount_parent = _find_common_parent(local_paths)
 

{nds_mapviewer-2026.2.1.dev93 → nds_mapviewer-2026.2.1.dev94}/tests/test_cli.py

@@ -128,6 +128,56 @@ class TestCliSourceValidation:
         assert "not found" in output.lower() or "error" in output.lower()
 
 
+class TestCliUrlSource:
+    """Tests for passing an http(s) service URL as a source."""
+
+    def _run_cmd_main(self, monkeypatch, sources):
+        from ndslive.mapviewer.cli import _build_parser, cmd_main
+
+        captured = {}
+
+        def fake_run(self):
+            captured["config"] = self._run_config
+            captured["source_paths"] = self._run_source_paths
+            captured["label"] = self._run_label
+
+        monkeypatch.setattr(
+            "ndslive.mapviewer.tui.MapViewerApp.run", fake_run,
+        )
+        args = _build_parser().parse_args([*sources, "--no-pull"])
+        rc = cmd_main(args)
+        return rc, captured
+
+    def test_help_mentions_url(self):
+        result = run_cli("--help")
+        assert "URL" in result.stdout or "openapi.json" in result.stdout
+
+    def test_url_becomes_smartlayer_source(self, monkeypatch):
+        rc, cap = self._run_cmd_main(
+            monkeypatch, ["https://my-host/openapi.json"],
+        )
+        assert rc == 0
+        sources = cap["config"]["sources"]
+        assert len(sources) == 1
+        assert sources[0]["type"] == "SmartLayerTileService"
+        assert sources[0]["uri"] == "https://my-host/openapi.json"
+        # bare URL → no auth configured
+        assert "http-settings" not in cap["config"]
+
+    def test_url_shown_as_source_path(self, monkeypatch):
+        _, cap = self._run_cmd_main(
+            monkeypatch, ["https://my-host/openapi.json"],
+        )
+        assert cap["source_paths"] == ["https://my-host/openapi.json"]
+        assert "service:" in cap["label"]
+
+    def test_http_and_https_both_recognized(self, monkeypatch):
+        for url in ("http://h/openapi.json", "https://h/openapi.json"):
+            rc, cap = self._run_cmd_main(monkeypatch, [url])
+            assert rc == 0
+            assert cap["config"]["sources"][0]["uri"] == url
+
+
 class TestCliLegacyMigration:
     """Tests for legacy mapviewer.yaml migration hint."""
 

{nds_mapviewer-2026.2.1.dev93 → nds_mapviewer-2026.2.1.dev94}/tests/test_config.py

@@ -10,6 +10,7 @@ from ndslive.mapviewer.config import (
     _extract_local_path,
     _is_localhost,
     _transform_localhost,
+    _transform_localhost_url,
     create_classic_config,
     create_filestore_config,
     create_folder_config,
@@ -166,6 +167,76 @@ class TestTransformLocalhost:
         assert _transform_localhost("api.nds.live") == "api.nds.live"
 
 
+class TestTransformLocalhostUrl:
+    """Tests for _transform_localhost_url()."""
+
+    def test_127_0_0_1_with_port(self):
+        assert _transform_localhost_url("http://127.0.0.1:8080/openapi.json") == \
+            "http://host.docker.internal:8080/openapi.json"
+
+    def test_localhost_https(self):
+        assert _transform_localhost_url("https://localhost:443/s") == \
+            "https://host.docker.internal:443/s"
+
+    def test_scope_wildcard(self):
+        assert _transform_localhost_url("http://localhost:8080/*") == \
+            "http://host.docker.internal:8080/*"
+
+    def test_remote_host_untouched(self):
+        url = "https://api.nds.live/island6/openapi.json"
+        assert _transform_localhost_url(url) == url
+
+    def test_non_http_scheme_untouched(self):
+        assert _transform_localhost_url("filestore:/data/x.ndslive") == \
+            "filestore:/data/x.ndslive"
+
+
+class TestTransformConfigLocalhostUri:
+    """Localhost in source uri / http-settings scope -> host.docker.internal."""
+
+    def test_uri_localhost_rewritten(self):
+        config = {
+            "sources": [{
+                "type": "SmartLayerTileService",
+                "uri": "http://127.0.0.1:8080/openapi.json",
+                "mapId": "M",
+            }]
+        }
+        result = transform_config(config)
+        assert result.config["sources"][0]["uri"] == \
+            "http://host.docker.internal:8080/openapi.json"
+        assert result.volumes == []
+
+    def test_scope_follows_uri(self):
+        config = {
+            "sources": [{
+                "type": "SmartLayerTileService",
+                "uri": "http://localhost:8080/openapi.json",
+                "mapId": "M",
+            }],
+            "http-settings": [{"scope": "http://localhost:8080/*", "api-key": "K"}],
+        }
+        result = transform_config(config)
+        assert result.config["sources"][0]["uri"] == \
+            "http://host.docker.internal:8080/openapi.json"
+        assert result.config["http-settings"][0]["scope"] == \
+            "http://host.docker.internal:8080/*"
+        # auth value preserved
+        assert result.config["http-settings"][0]["api-key"] == "K"
+
+    def test_remote_uri_untouched(self):
+        config = {
+            "sources": [{
+                "type": "SmartLayerTileService",
+                "uri": "https://api.nds.live/island6/openapi.json",
+                "mapId": "M",
+            }]
+        }
+        result = transform_config(config)
+        assert result.config["sources"][0]["uri"] == \
+            "https://api.nds.live/island6/openapi.json"
+
+
 class TestTransformConfig:
     """Tests for transform_config()."""