nds-mapviewer 2026.1.3.dev43__tar.gz → 2026.1.3.dev45__tar.gz

{nds_mapviewer-2026.1.3.dev43/src/nds_mapviewer.egg-info → nds_mapviewer-2026.1.3.dev45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.1.3.dev43
+Version: 2026.1.3.dev45
 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.1.3.dev43 → nds_mapviewer-2026.1.3.dev45/src/nds_mapviewer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.1.3.dev43
+Version: 2026.1.3.dev45
 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.1.3.dev43 → nds_mapviewer-2026.1.3.dev45}/src/ndslive/mapviewer/docker_client.py

@@ -695,7 +695,7 @@ def get_container_logs(
         raise ContainerNotFound(name)
 
     if follow:
-        return _stream_logs(name)
+        return ContainerLogStream(rt.stream("logs", "--follow", name))
     else:
         cmd = ["logs"]
         if tail != "all":
@@ -712,15 +712,39 @@ def get_container_logs(
         return logs
 
 
-def _stream_logs(name: str) -> Iterator[str]:
-    """Generator that streams log lines from a container."""
-    proc = rt.stream("logs", "--follow", name)
-    try:
-        for line in proc.stdout:
-            yield line
-    finally:
-        proc.terminate()
-        proc.wait()
+class ContainerLogStream:
+    """Iterable log stream that can be closed from outside the iterator.
+
+    The underlying ``<runtime> logs --follow`` subprocess blocks in
+    ``proc.stdout`` until the container exits. Docker closes the pipe
+    promptly on ``stop``; Podman can keep the follower alive longer, so we
+    expose :meth:`close` to terminate it deterministically on shutdown.
+    """
+
+    def __init__(self, proc: subprocess.Popen[str]) -> None:
+        self._proc = proc
+
+    def __iter__(self) -> Iterator[str]:
+        try:
+            for line in self._proc.stdout:
+                yield line
+        finally:
+            self.close()
+
+    def close(self, timeout: float = 3.0) -> None:
+        if self._proc.poll() is not None:
+            return
+        self._proc.terminate()
+        try:
+            self._proc.wait(timeout=timeout)
+            return
+        except subprocess.TimeoutExpired:
+            pass
+        self._proc.kill()
+        try:
+            self._proc.wait(timeout=timeout)
+        except subprocess.TimeoutExpired:
+            pass
 
 
 _READY_SENTINEL = "NDS MapViewer is ready!"

{nds_mapviewer-2026.1.3.dev43 → nds_mapviewer-2026.1.3.dev45}/src/ndslive/mapviewer/viewer.py

@@ -16,7 +16,7 @@ from .config import (
     validate_paths,
     write_config_to_temp,
 )
-from .docker_client import ContainerInfo
+from .docker_client import ContainerInfo, ContainerLogStream
 from .exceptions import ConfigError, ContainerNotFound
 
 
@@ -84,6 +84,7 @@ class MapViewer:
         instance._bind_address = "127.0.0.1"
         instance._original_config = None
         instance._image_tag = info.image or None
+        instance._log_stream = None
         return instance
 
     def __init__(
@@ -155,6 +156,7 @@ class MapViewer:
         self._container: ContainerInfo | None = None
         self._original_config: dict | None = None
         self._image_tag: str | None = None
+        self._log_stream: ContainerLogStream | None = None
 
     @property
     def url(self) -> str:
@@ -322,11 +324,22 @@ class MapViewer:
         Args:
             remove: Also remove the container after stopping
         """
+        self._close_log_stream()
         try:
             docker_client.stop_container(self._name, remove=remove)
         finally:
             self._cleanup()
 
+    def _close_log_stream(self) -> None:
+        stream = getattr(self, "_log_stream", None)
+        if stream is None:
+            return
+        try:
+            stream.close()
+        except Exception:
+            pass
+        self._log_stream = None
+
     def restart(self, pull: bool = False, wait: bool = True, timeout: int = 30) -> None:
         """
         Restart the MapViewer container.
@@ -361,10 +374,15 @@ class MapViewer:
             tail: Number of lines from end, or "all"
 
         Returns:
-            If follow=True, returns an iterator of log lines.
+            If follow=True, returns a :class:`ContainerLogStream` (iterable,
+            closed automatically by :meth:`stop`).
             If follow=False, returns the full log as a string.
         """
-        return docker_client.get_container_logs(self._name, follow=follow, tail=tail)
+        result = docker_client.get_container_logs(self._name, follow=follow, tail=tail)
+        if follow and isinstance(result, ContainerLogStream):
+            self._close_log_stream()
+            self._log_stream = result
+        return result
 
     def get_datasources(self) -> list[str]:
         """

{nds_mapviewer-2026.1.3.dev43 → nds_mapviewer-2026.1.3.dev45}/tests/test_docker_client.py

@@ -198,6 +198,58 @@ class TestStopContainer:
             dc.stop_container("nonexistent-container-xyz123")
 
 
+class TestContainerLogStream:
+    """Tests for ContainerLogStream.close() teardown behaviour."""
+
+    def test_close_skips_when_already_exited(self, mocker):
+        proc = mocker.MagicMock()
+        proc.poll.return_value = 0
+        stream = dc.ContainerLogStream(proc)
+
+        stream.close()
+
+        proc.terminate.assert_not_called()
+        proc.kill.assert_not_called()
+
+    def test_close_terminates_and_waits(self, mocker):
+        proc = mocker.MagicMock()
+        proc.poll.return_value = None
+        proc.wait.return_value = 0
+        stream = dc.ContainerLogStream(proc)
+
+        stream.close(timeout=1.5)
+
+        proc.terminate.assert_called_once()
+        proc.wait.assert_called_once_with(timeout=1.5)
+        proc.kill.assert_not_called()
+
+    def test_close_kills_when_terminate_times_out(self, mocker):
+        proc = mocker.MagicMock()
+        proc.poll.return_value = None
+        proc.wait.side_effect = [
+            subprocess.TimeoutExpired(cmd="logs", timeout=1.0),
+            0,
+        ]
+        stream = dc.ContainerLogStream(proc)
+
+        stream.close(timeout=1.0)
+
+        proc.terminate.assert_called_once()
+        proc.kill.assert_called_once()
+        assert proc.wait.call_count == 2
+
+    def test_close_returns_even_if_kill_wait_times_out(self, mocker):
+        proc = mocker.MagicMock()
+        proc.poll.return_value = None
+        proc.wait.side_effect = subprocess.TimeoutExpired(cmd="logs", timeout=1.0)
+        stream = dc.ContainerLogStream(proc)
+
+        stream.close(timeout=1.0)
+
+        proc.terminate.assert_called_once()
+        proc.kill.assert_called_once()
+
+
 class TestPullImageErrorHandling:
     """Tests for pull_image() error handling."""