comfygit-deploy 0.3.4__tar.gz → 0.3.6__tar.gz

{comfygit_deploy-0.3.4 → comfygit_deploy-0.3.6}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: comfygit-deploy
-Version: 0.3.4
+Version: 0.3.6
 Summary: ComfyGit Deploy - Remote deployment and worker management CLI
 Requires-Python: >=3.10
 Requires-Dist: aiohttp>=3.9.0
-Requires-Dist: comfygit==0.3.4
+Requires-Dist: comfygit==0.3.6
 Requires-Dist: zeroconf>=0.131.0
 Description-Content-Type: text/markdown
 

{comfygit_deploy-0.3.4 → comfygit_deploy-0.3.6}/comfygit_deploy/commands/worker.py

@@ -112,6 +112,13 @@ def handle_up(args: argparse.Namespace) -> int:
         print("Worker not configured. Run 'cg-deploy worker setup' first.")
         return 1
 
+    # Use COMFYGIT_HOME if set, otherwise fall back to config
+    workspace = get_validated_workspace()
+    if not workspace:
+        print("No valid workspace found.")
+        print("Set COMFYGIT_HOME or run 'cg-deploy worker setup --workspace /path'")
+        return 1
+
     # Parse port range
     port_range = args.port_range.split(":")
     port_start = int(port_range[0])
@@ -136,7 +143,6 @@ def handle_up(args: argparse.Namespace) -> int:
     if dev_manager:
         dev_manager = str(Path(dev_manager).resolve())
         # Symlink manager to system_nodes
-        workspace = Path(config["workspace_path"])
         system_nodes = workspace / ".metadata" / "system_nodes"
         system_nodes.mkdir(parents=True, exist_ok=True)
         manager_link = system_nodes / "comfygit-manager"
@@ -163,7 +169,7 @@ def handle_up(args: argparse.Namespace) -> int:
 
     app = create_worker_app(
         api_key=config["api_key"],
-        workspace_path=Path(config["workspace_path"]),
+        workspace_path=workspace,
         default_mode=args.mode,
         port_range_start=port_start,
         port_range_end=port_end,

{comfygit_deploy-0.3.4 → comfygit_deploy-0.3.6}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "comfygit-deploy"
-version = "0.3.4"
+version = "0.3.6"
 description = "ComfyGit Deploy - Remote deployment and worker management CLI"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "comfygit==0.3.4",
+    "comfygit==0.3.6",
     "aiohttp>=3.9.0",
     "zeroconf>=0.131.0",
 ]

{comfygit_deploy-0.3.4 → comfygit_deploy-0.3.6}/tests/test_worker_commands.py

@@ -93,6 +93,60 @@ class TestWorkspaceValidation:
 class TestWorkerCommands:
     """Tests for worker command handlers."""
 
+    def test_handle_up_uses_env_workspace_over_config(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        """handle_up should use COMFYGIT_HOME over config workspace_path.
+
+        This is the key test: when COMFYGIT_HOME is set, the worker server
+        should use that workspace, not the one saved in worker.json.
+        """
+        config_path = tmp_path / "worker.json"
+        config_workspace = tmp_path / "config-workspace"
+        env_workspace = tmp_path / "env-workspace"
+        config_workspace.mkdir(parents=True)
+        env_workspace.mkdir(parents=True)
+
+        # Create config with one workspace
+        import json
+        config_path.write_text(json.dumps({
+            "version": "1",
+            "api_key": "cg_wk_test123",
+            "workspace_path": str(config_workspace),
+            "default_mode": "native",
+        }))
+
+        # Set env to different workspace
+        monkeypatch.setenv("COMFYGIT_HOME", str(env_workspace))
+
+        args = argparse.Namespace(
+            host="127.0.0.1",
+            port=9999,
+            mode="native",
+            broadcast=False,
+            port_range="8200:8210",
+            dev=False,
+            dev_core=None,
+            dev_manager=None,
+        )
+
+        # Track what workspace_path is passed to create_worker_app
+        captured_workspace = None
+
+        def mock_create_app(**kwargs):
+            nonlocal captured_workspace
+            captured_workspace = kwargs.get("workspace_path")
+            # Return a mock app that we can "run"
+            return MagicMock()
+
+        with patch("comfygit_deploy.commands.worker.WORKER_CONFIG_PATH", config_path):
+            with patch("comfygit_deploy.worker.server.create_worker_app", mock_create_app):
+                with patch("aiohttp.web.run_app"):  # Don't actually start server
+                    worker_commands.handle_up(args)
+
+        # The workspace passed to create_worker_app should be from env, not config
+        assert captured_workspace == env_workspace
+
     def test_handle_setup_creates_config(self, tmp_path: Path) -> None:
         """worker setup should create worker config."""
         config_path = tmp_path / "worker.json"