odctl 0.4.4__tar.gz → 0.4.6__tar.gz

{odctl-0.4.4 → odctl-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: odctl
-Version: 0.4.4
+Version: 0.4.6
 Summary: Orchestrator for the Open Data Stack
 Project-URL: Homepage, https://github.com/jaehyeon-kim/odctl
 Project-URL: Repository, https://github.com/jaehyeon-kim/odctl

{odctl-0.4.4 → odctl-0.4.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "odctl"
-version = "0.4.4"
+version = "0.4.6"
 description = "Orchestrator for the Open Data Stack"
 readme = "README.md"
 authors = [

{odctl-0.4.4 → odctl-0.4.6}/src/odctl/main.py

@@ -305,6 +305,31 @@ def up(
     ui.print_success("All requested profiles successfully started!")
 
 
+_DEPS_FILE = "compose-deps.yml"
+
+
+def _shared_deps_are_idle(torn_down: dict) -> bool:
+    """Report whether the shared deps project is safe to remove.
+
+    The deps project owns the ``odctl`` network and the shared JAR volume, so it
+    may only go once no other profile has a container left. Containers are listed
+    including exited ones, so a stopped-but-present service still counts as in
+    use, and deps itself is excluded because its init container always exits.
+
+    Args:
+        torn_down (dict): The plan just stopped, so its files are not consulted.
+
+    Returns:
+        bool: True when nothing outside deps remains.
+    """
+    if _DEPS_FILE in torn_down:
+        return False
+
+    declared = build_execution_plan(None, True, resolve_deps=False)
+    others = {file: profs for file, profs in declared.items() if file != _DEPS_FILE}
+    return not get_managed_containers(others)
+
+
 @app.command(
     rich_help_panel="Cluster Lifecycle",
     epilog="""
@@ -395,6 +420,20 @@ def down(
         except Exception as e:
             ui.print_error(f"Failed to stop {file}", details=str(e))
             raise typer.Exit(1)
+
+    # `--all` already carries deps in its plan. A named teardown does not, so
+    # `odctl down kafka-lite -v` used to leave the init container, the odctl
+    # network and the shared JAR volume behind: a wipe that did not wipe. Remove
+    # them here, but only once nothing else is running, since every other profile
+    # attaches to that network and mounts that volume.
+    if volumes and not all and _shared_deps_are_idle(plan):
+        ui.print_info("🛑 Stopping [cyan]deps[/cyan]...")
+        try:
+            stop_stack(_DEPS_FILE, ["deps"], remove_volumes=True)
+        except Exception as e:
+            ui.print_error("Failed to stop deps", details=str(e))
+            raise typer.Exit(1)
+
     ui.print_success("Teardown complete.")
 
 

odctl-0.4.6/src/odctl/resources/trino/catalog/clickhouse.properties

@@ -0,0 +1,17 @@
+connector.name=clickhouse
+# compress=false is what keeps this catalog usable, not a tuning knob. The
+# clickhouse-jdbc 0.7.1 driver shaded into Trino 480 asks for a compressed
+# response two ways at once: the compress=1 URL parameter, which selects
+# ClickHouse's native compressed-block framing, and an Accept-Encoding: lz4
+# header. ClickHouse only honoured the header when enable_http_compression was
+# turned on, and that setting now defaults to 1, so the server wraps the native
+# blocks in an LZ4 frame and answers Content-Encoding: lz4. The driver never
+# unwraps that frame: it reads the frame's bytes as a block header and dies with
+# "Magic is not correct - expect [-126] but got [123]", which is 0x82 expected
+# against the '{' it found inside the frame. Every query through the catalog
+# fails, listing schemas included. Setting compress=false drops both the
+# parameter and the header, so the body arrives as plain RowBinary. The response
+# is uncompressed over the container network, which costs nothing here.
+connection-url=jdbc:clickhouse://ch-11:8123/feature_store?compress=false
+connection-user=user
+connection-password=password

odctl-0.4.6/tests/test_cli_extended.py

@@ -0,0 +1,146 @@
+from unittest.mock import MagicMock
+from typer.testing import CliRunner
+from odctl.main import app
+
+runner = CliRunner()
+
+
+def test_down_command(monkeypatch):
+    mock_stop = MagicMock()
+    monkeypatch.setattr("odctl.main.stop_stack", mock_stop)
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+
+    # Mock get_managed_containers to return a fake container so down --all proceeds
+    mock_container = MagicMock()
+    mock_container.config.labels = {"com.docker.compose.service": "kafka"}
+    monkeypatch.setattr(
+        "odctl.docker.get_managed_containers", lambda x: [mock_container]
+    )
+    monkeypatch.setattr(
+        "odctl.docker.get_stack_details",
+        lambda x, y: (["kafka"], [], [], []),
+    )
+
+    result = runner.invoke(app, ["down", "--all"])
+    assert result.exit_code == 0
+    mock_stop.assert_called()
+
+
+def test_restart_command(monkeypatch):
+    mock_restart = MagicMock()
+    monkeypatch.setattr("odctl.main.restart_managed_containers", mock_restart)
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+
+    result = runner.invoke(app, ["restart", "kafka-lite"])
+    assert result.exit_code == 0
+    mock_restart.assert_called()
+
+
+def test_logs_command(monkeypatch):
+    mock_logs = MagicMock()
+    monkeypatch.setattr("odctl.main.get_managed_logs", mock_logs)
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+
+    result = runner.invoke(app, ["logs", "kafka-lite"])
+    assert result.exit_code == 0
+    mock_logs.assert_called()
+
+
+def test_list_command(monkeypatch):
+    result = runner.invoke(app, ["list"])
+    assert result.exit_code == 0
+
+
+def test_explain_command(monkeypatch):
+    result = runner.invoke(app, ["explain", "kafka-lite"])
+    assert result.exit_code == 0
+
+
+def test_docker_not_running(monkeypatch):
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: False)
+    result = runner.invoke(app, ["up", "kafka-lite"])
+    assert result.exit_code != 0
+    assert "Docker is not reachable" in result.stdout
+
+
+def test_invalid_profile(monkeypatch):
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+    result = runner.invoke(app, ["up", "invalid_profile"])
+    assert result.exit_code != 0
+    assert "Unknown profile" in result.stdout
+
+
+def _stopped_files(mock_stop):
+    """The compose files a mocked stop_stack was asked to tear down, in order."""
+    return [call.args[0] for call in mock_stop.call_args_list]
+
+
+def test_down_named_profile_with_volumes_also_removes_shared_deps(monkeypatch):
+    """`odctl down kafka-lite -v` must not leave the deps init container, the
+    odctl network and the shared JAR volume behind."""
+    mock_stop = MagicMock()
+    monkeypatch.setattr("odctl.main.stop_stack", mock_stop)
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+    # Nothing else is left running, so deps is safe to remove.
+    monkeypatch.setattr("odctl.main.get_managed_containers", lambda plan: [])
+
+    result = runner.invoke(app, ["down", "kafka-lite", "-v"])
+
+    assert result.exit_code == 0
+    files = _stopped_files(mock_stop)
+    assert "compose-deps.yml" in files, files
+    deps_call = mock_stop.call_args_list[-1]
+    assert deps_call.args[0] == "compose-deps.yml"
+    assert deps_call.args[1] == ["deps"]
+    assert deps_call.kwargs["remove_volumes"] is True
+
+
+def test_down_named_profile_keeps_shared_deps_while_others_run(monkeypatch):
+    """Another profile still holding containers needs the network and the volume,
+    so deps must survive."""
+    mock_stop = MagicMock()
+    monkeypatch.setattr("odctl.main.stop_stack", mock_stop)
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+    monkeypatch.setattr("odctl.main.get_managed_containers", lambda plan: [MagicMock()])
+
+    result = runner.invoke(app, ["down", "kafka-lite", "-v"])
+
+    assert result.exit_code == 0
+    assert "compose-deps.yml" not in _stopped_files(mock_stop)
+
+
+def test_down_named_profile_without_volumes_keeps_shared_deps(monkeypatch):
+    """Without -v the data is meant to survive, and so is the shared volume."""
+    mock_stop = MagicMock()
+    monkeypatch.setattr("odctl.main.stop_stack", mock_stop)
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+    monkeypatch.setattr("odctl.main.get_managed_containers", lambda plan: [])
+
+    result = runner.invoke(app, ["down", "kafka-lite"])
+
+    assert result.exit_code == 0
+    assert "compose-deps.yml" not in _stopped_files(mock_stop)
+
+
+def test_down_all_with_volumes_removes_deps_exactly_once(monkeypatch):
+    """`--all` already carries deps in its plan, so the idle check must not add a
+    second teardown of the same project."""
+    mock_stop = MagicMock()
+    monkeypatch.setattr("odctl.main.stop_stack", mock_stop)
+    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
+    monkeypatch.setattr("odctl.main.typer.confirm", lambda *a, **k: True)
+
+    mock_container = MagicMock()
+    mock_container.config.labels = {"com.docker.compose.service": "init-deps"}
+    monkeypatch.setattr(
+        "odctl.docker.get_managed_containers", lambda plan: [mock_container]
+    )
+    monkeypatch.setattr(
+        "odctl.docker.get_stack_details",
+        lambda f, p: (["init-deps"], [], [], ["odctl-shared-deps"]),
+    )
+
+    result = runner.invoke(app, ["down", "--all", "-v"])
+
+    assert result.exit_code == 0
+    assert _stopped_files(mock_stop).count("compose-deps.yml") == 1

odctl-0.4.4/src/odctl/resources/trino/catalog/clickhouse.properties

@@ -1,4 +0,0 @@
-connector.name=clickhouse
-connection-url=jdbc:clickhouse://ch-11:8123/feature_store
-connection-user=user
-connection-password=password

odctl-0.4.4/tests/test_cli_extended.py

@@ -1,70 +0,0 @@
-from unittest.mock import MagicMock
-from typer.testing import CliRunner
-from odctl.main import app
-
-runner = CliRunner()
-
-
-def test_down_command(monkeypatch):
-    mock_stop = MagicMock()
-    monkeypatch.setattr("odctl.main.stop_stack", mock_stop)
-    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
-
-    # Mock get_managed_containers to return a fake container so down --all proceeds
-    mock_container = MagicMock()
-    mock_container.config.labels = {"com.docker.compose.service": "kafka"}
-    monkeypatch.setattr(
-        "odctl.docker.get_managed_containers", lambda x: [mock_container]
-    )
-    monkeypatch.setattr(
-        "odctl.docker.get_stack_details",
-        lambda x, y: (["kafka"], [], [], []),
-    )
-
-    result = runner.invoke(app, ["down", "--all"])
-    assert result.exit_code == 0
-    mock_stop.assert_called()
-
-
-def test_restart_command(monkeypatch):
-    mock_restart = MagicMock()
-    monkeypatch.setattr("odctl.main.restart_managed_containers", mock_restart)
-    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
-
-    result = runner.invoke(app, ["restart", "kafka-lite"])
-    assert result.exit_code == 0
-    mock_restart.assert_called()
-
-
-def test_logs_command(monkeypatch):
-    mock_logs = MagicMock()
-    monkeypatch.setattr("odctl.main.get_managed_logs", mock_logs)
-    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
-
-    result = runner.invoke(app, ["logs", "kafka-lite"])
-    assert result.exit_code == 0
-    mock_logs.assert_called()
-
-
-def test_list_command(monkeypatch):
-    result = runner.invoke(app, ["list"])
-    assert result.exit_code == 0
-
-
-def test_explain_command(monkeypatch):
-    result = runner.invoke(app, ["explain", "kafka-lite"])
-    assert result.exit_code == 0
-
-
-def test_docker_not_running(monkeypatch):
-    monkeypatch.setattr("odctl.main.is_docker_running", lambda: False)
-    result = runner.invoke(app, ["up", "kafka-lite"])
-    assert result.exit_code != 0
-    assert "Docker is not reachable" in result.stdout
-
-
-def test_invalid_profile(monkeypatch):
-    monkeypatch.setattr("odctl.main.is_docker_running", lambda: True)
-    result = runner.invoke(app, ["up", "invalid_profile"])
-    assert result.exit_code != 0
-    assert "Unknown profile" in result.stdout