nds-mapviewer 2026.4.2.dev203__tar.gz → 2026.4.2.dev205__tar.gz

nds_mapviewer-2026.4.2.dev205/.gitignore

@@ -0,0 +1,5 @@
+__pycache__/
+*.pyc
+*.egg-info/
+dist/
+build/

nds_mapviewer-2026.4.2.dev205/CHANGELOG.md

@@ -0,0 +1,91 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+- `--debug` flag to enable container debug logging (sets `HTTP_LOG_LEVEL=debug`)
+- `--env KEY=VALUE` (repeatable, short `-E`) to pass custom environment
+  variables into the container; overrides `--debug` on key collision
+- `--network NAME` to attach the container to a specific network (e.g. `host`);
+  in `host` mode port publishing is skipped and the viewer is reached on the
+  container's internal port
+- 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
+
+### Fixed
+
+- Clipboard copy in the Docker screen now uses the native OS clipboard
+  (`clip.exe` / `pbcopy` / `wl-copy`/`xclip`/`xsel`) instead of relying on the
+  OSC 52 terminal escape, which is unreliable on Windows; warns when a copy
+  cannot be confirmed
+- 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)
+
+### Changed
+
+- Version scheme: package now follows MapViewer calver (e.g. 2025.6.2)
+  with post-release dev builds between releases
+
+## [0.1.0] - Unreleased
+
+### Added
+
+- **CLI Commands**
+  - `setup` - Interactive setup wizard for Docker, registry auth, and image download
+  - `run` - Run MapViewer with a local path, saved config, or `--demo` mode
+  - `connect` - Interactive connection picker / wizard for saved or new data sources
+  - `update` - Check for and pull newer MapViewer Docker images
+  - Shorthand: `mapviewer <path>` resolves `.ndslive` files, SmartLayer folders, or saved config names
+
+- **Python API**
+  - `MapViewer` class for programmatic container lifecycle management
+  - Context manager support for automatic cleanup
+  - `start()` / `stop()` / `restart()` for container control
+  - `connect()` class method to attach to a running container by name
+  - `logs()` with real-time streaming and severity filtering
+  - `status()` and `get_datasources()` for runtime introspection
+  - `open_browser()` to launch the viewer in a system or bundled browser
+
+- **Configuration**
+  - Automatic path transformation (host paths to container mount points)
+  - Volume mount generation with read-only mounts and parent-directory deduplication
+  - Localhost translation to `host.docker.internal`
+  - YAML config creation helpers for filestores, SmartLayer folders, and remote services
+  - Saved connections stored under `~/.nds/configs/`
+  - Default config at `~/.nds/config.yaml` — shared across NDS tools, auto-loaded when no args given
+
+- **Authentication**
+  - Six methods: API key, query parameters, basic auth, bearer token, OAuth2 client credentials, and none
+  - Optional proxy support with authentication
+
+- **Browser Integration**
+  - Multi-platform system browser detection (Chrome, Chromium, Edge, Brave)
+  - Optional bundled Chromium via Playwright (`[browser]` extra)
+  - Automatic browser launch on `run` and `connect`
+
+- **Setup & Diagnostics**
+  - Interactive setup wizard with Docker daemon and registry checks
+  - Image pull with progress display
+  - `--dry` mode for walkthroughs without Docker access
+  - Edition selection (community / member)

{nds_mapviewer-2026.4.2.dev203 → nds_mapviewer-2026.4.2.dev205}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.4.2.dev203
+Version: 2026.4.2.dev205
 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

{nds_mapviewer-2026.4.2.dev203 → nds_mapviewer-2026.4.2.dev205}/src/nds_mapviewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.4.2.dev203
+Version: 2026.4.2.dev205
 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

{nds_mapviewer-2026.4.2.dev203 → nds_mapviewer-2026.4.2.dev205}/src/nds_mapviewer.egg-info/SOURCES.txt

@@ -1,3 +1,5 @@
+.gitignore
+CHANGELOG.md
 README.md
 pyproject.toml
 setup.py
@@ -18,6 +20,7 @@ src/ndslive/mapviewer/exceptions.py
 src/ndslive/mapviewer/tui.py
 src/ndslive/mapviewer/ui.py
 src/ndslive/mapviewer/viewer.py
+tests/conftest.py
 tests/test_cli.py
 tests/test_clipboard.py
 tests/test_config.py

nds_mapviewer-2026.4.2.dev205/tests/conftest.py

@@ -0,0 +1,142 @@
+"""Shared pytest fixtures and container-runtime availability check."""
+
+import shutil
+import tempfile
+from pathlib import Path
+
+import pytest
+import yaml
+
+
+# Default edition for tests
+DEFAULT_EDITION = "member"
+
+
+@pytest.fixture(scope="session")
+def docker_client():
+    """Verify the container runtime is available, skipping tests otherwise.
+
+    Returns ``None`` — the fixture is kept for backward compatibility with
+    tests that declare it as a dependency to gate on runtime availability.
+    """
+    from ndslive.mapviewer import docker_client as dc
+    from ndslive.mapviewer.exceptions import RuntimeNotInstalled, RuntimeNotRunning
+
+    try:
+        dc.get_docker_client()
+        return None  # runtime OK
+    except RuntimeNotInstalled:
+        pytest.skip("No container runtime installed (Docker/Podman)")
+    except RuntimeNotRunning:
+        pytest.skip("Container runtime is not running")
+
+
+@pytest.fixture(scope="session")
+def edition():
+    """Default edition for tests."""
+    return DEFAULT_EDITION
+
+
+@pytest.fixture
+def temp_dir():
+    """Create a temporary directory for test files."""
+    path = Path(tempfile.mkdtemp(prefix="mapviewer-test-"))
+    yield path
+    shutil.rmtree(path, ignore_errors=True)
+
+
+@pytest.fixture
+def sample_config(temp_dir):
+    """Create a sample config file with HTTP-only sources (no local paths)."""
+    config = {
+        "http-settings": [
+            {
+                "scope": "https://api.nds.live/*",
+                "api-key": "test-key",
+            }
+        ],
+        "sources": [
+            {
+                "type": "SmartLayerTileService",
+                "uri": "https://api.nds.live/island6/openapi.json",
+                "mapId": "Test Island",
+            }
+        ],
+    }
+    config_path = temp_dir / "config.yaml"
+    with open(config_path, "w") as f:
+        yaml.dump(config, f)
+    return config_path
+
+
+@pytest.fixture
+def sample_config_with_local_path(temp_dir):
+    """Create a sample config with a local path that needs volume mounting."""
+    data_dir = temp_dir / "data" / "maps"
+    data_dir.mkdir(parents=True)
+    (data_dir / "dummy.db").touch()
+
+    config = {
+        "sources": [
+            {
+                "type": "ClassicFolder",
+                "folder": str(data_dir),
+                "mapId": "Local Data",
+            }
+        ],
+    }
+    config_path = temp_dir / "config.yaml"
+    with open(config_path, "w") as f:
+        yaml.dump(config, f)
+    return config_path, data_dir
+
+
+@pytest.fixture
+def sample_config_filestore(temp_dir):
+    """Create a sample config with filestore: URI."""
+    data_dir = temp_dir / "filestore"
+    data_dir.mkdir(parents=True)
+    (data_dir / "test.nds").touch()
+
+    config = {
+        "sources": [
+            {
+                "type": "SmartLayerTileService",
+                "uri": f"filestore:{data_dir}",
+                "mapId": "Filestore Test",
+            }
+        ],
+    }
+    config_path = temp_dir / "config.yaml"
+    with open(config_path, "w") as f:
+        yaml.dump(config, f)
+    return config_path, data_dir
+
+
+@pytest.fixture
+def container_name():
+    """Generate a unique container name for test isolation."""
+    import uuid
+    return f"mapviewer-test-{uuid.uuid4().hex[:8]}"
+
+
+@pytest.fixture
+def cleanup_container(docker_client, container_name):
+    """Ensure test container is cleaned up after test."""
+    from ndslive.mapviewer import container_runtime as rt
+    yield container_name
+    try:
+        rt.run("stop", container_name, check=False, timeout=10)
+        rt.run("rm", container_name, check=False, timeout=10)
+    except Exception:
+        pass
+
+
+def pytest_configure(config):
+    """Register custom markers."""
+    config.addinivalue_line(
+        "markers", "docker: mark test as requiring Docker"
+    )
+    config.addinivalue_line(
+        "markers", "slow: mark test as slow-running"
+    )