agentsystems-sdk 0.2.31__tar.gz → 0.3.0__tar.gz

{agentsystems_sdk-0.2.31/agentsystems_sdk.egg-info → agentsystems_sdk-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentsystems-sdk
-Version: 0.2.31
+Version: 0.3.0
 Summary: AgentSystems Python SDK and CLI
 Author-email: AgentSystems <support@agentsystems.ai>
 License-Expression: Apache-2.0

{agentsystems_sdk-0.2.31 → agentsystems_sdk-0.3.0}/agentsystems_sdk/commands/init.py

@@ -23,7 +23,6 @@ from dotenv import set_key
 
 from ..utils import (
     ensure_docker_installed,
-    docker_login_if_needed,
     run_command,
     get_required_images,
 )
@@ -40,12 +39,6 @@ def init_command(
         writable=True,
         resolve_path=True,
     ),
-    docker_token: Optional[str] = typer.Option(
-        None,
-        "--docker-token",
-        envvar="DOCKER_OAT",
-        help="Docker Hub Org Access Token for private images",
-    ),
 ) -> None:
     """Initialize a new AgentSystems deployment from the built-in template.
 
@@ -111,16 +104,6 @@ def init_command(
         pub_key = f"pk-lf-{uuid.uuid4()}"
         secret_key = f"sk-lf-{uuid.uuid4()}"
 
-    if docker_token is None and sys.stdin.isatty():
-        docker_token = (
-            typer.prompt(
-                "Docker org access token (leave blank if images are public)",
-                default="",
-                hide_input=True,
-            )
-            or None
-        )
-
     # Get the path to the scaffold directory
     import os
 
@@ -199,16 +182,6 @@ def init_command(
         ensure_docker_installed()
         progress.update(docker_task, completed=1)
 
-        # Docker login if token provided
-        if docker_token:
-            login_task = progress.add_task("Logging into Docker Hub", total=1)
-            progress.stop()  # Stop progress display temporarily
-            try:
-                docker_login_if_needed(docker_token)
-            finally:
-                progress.start()  # Always restart progress
-            progress.update(login_task, completed=1)
-
         # Pull required images
         required_images = get_required_images()
 
@@ -225,14 +198,9 @@ def init_command(
                 try:
                     run_command(["docker", "pull", img])
                 except typer.Exit:
-                    if docker_token is None and sys.stdin.isatty():
-                        docker_token = typer.prompt(
-                            "Pull failed – provide Docker org token", hide_input=True
-                        )
-                        docker_login_if_needed(docker_token)
-                        run_command(["docker", "pull", img])
-                    else:
-                        raise
+                    # Image pull failed - control-plane is public on ghcr.io
+                    # This shouldn't happen unless there's a network issue
+                    raise
                 finally:
                     progress.start()  # Always restart progress
                 progress.advance(pull_task)

{agentsystems_sdk-0.2.31 → agentsystems_sdk-0.3.0}/agentsystems_sdk/deployments_scaffold/compose/local/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     restart: "no"
 
   gateway:
-    image: agentsystems/agent-control-plane:${ACP_TAG:-latest}
+    image: ghcr.io/agentsystems/agent-control-plane:${ACP_TAG:-latest}
     ports: ["18080:8080"]
     depends_on: [postgres]
     environment:

{agentsystems_sdk-0.2.31 → agentsystems_sdk-0.3.0}/agentsystems_sdk/utils.py

@@ -264,7 +264,7 @@ def get_required_images() -> List[str]:
         List of Docker image names
     """
     return [
-        "agentsystems/agent-control-plane:latest",
+        "ghcr.io/agentsystems/agent-control-plane:latest",
     ]
 
 

{agentsystems_sdk-0.2.31 → agentsystems_sdk-0.3.0/agentsystems_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentsystems-sdk
-Version: 0.2.31
+Version: 0.3.0
 Summary: AgentSystems Python SDK and CLI
 Author-email: AgentSystems <support@agentsystems.ai>
 License-Expression: Apache-2.0

{agentsystems_sdk-0.2.31 → agentsystems_sdk-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentsystems-sdk"
-version = "0.2.31"
+version = "0.3.0"
 description = "AgentSystems Python SDK and CLI"
 readme = "README.md"
 authors = [ { name = "AgentSystems", email = "support@agentsystems.ai" } ]

{agentsystems_sdk-0.2.31 → agentsystems_sdk-0.3.0}/tests/test_cli_init.py

@@ -12,7 +12,6 @@ class TestInitCommand:
     """Tests for the init command with local scaffold."""
 
     @patch("agentsystems_sdk.commands.init.get_required_images")
-    @patch("agentsystems_sdk.commands.init.docker_login_if_needed")
     @patch("agentsystems_sdk.commands.init.ensure_docker_installed")
     @patch("agentsystems_sdk.commands.init.set_key")
     @patch("agentsystems_sdk.commands.init.shutil.copy")
@@ -29,7 +28,6 @@ class TestInitCommand:
         mock_shutil_copy,
         mock_set_key,
         mock_ensure_docker,
-        mock_docker_login,
         mock_get_images,
         tmp_path,
     ):
@@ -43,19 +41,17 @@ class TestInitCommand:
             "TestOrg",  # Organization name
             "admin@test.com",  # Email
             "password123",  # Password
-            "docker-token-123",  # Docker token
         ]
 
         # Mock required images
         mock_get_images.return_value = [
-            "agentsystems/agent-control-plane:latest",
+            "ghcr.io/agentsystems/agent-control-plane:latest",
             "langfuse/langfuse:latest",
         ]
 
         # Execute
         init_command(
             project_dir=None,  # Will prompt for directory
-            docker_token=None,
         )
 
         # Verify scaffold was copied
@@ -65,17 +61,13 @@ class TestInitCommand:
         # Verify Docker was checked
         mock_ensure_docker.assert_called_once()
 
-        # Verify Docker login
-        mock_docker_login.assert_called_once_with("docker-token-123")
-
-        # Verify images were pulled
+        # Verify images were pulled (no Docker login needed for public images)
         assert any(
             "docker" in str(call) and "pull" in str(call)
             for call in mock_run_command.call_args_list
         )
 
     @patch("agentsystems_sdk.commands.init.get_required_images")
-    @patch("agentsystems_sdk.commands.init.docker_login_if_needed")
     @patch("agentsystems_sdk.commands.init.ensure_docker_installed")
     @patch("agentsystems_sdk.commands.init.set_key")
     @patch("agentsystems_sdk.commands.init.shutil.copy")
@@ -90,7 +82,6 @@ class TestInitCommand:
         mock_shutil_copy,
         mock_set_key,
         mock_ensure_docker,
-        mock_docker_login,
         mock_get_images,
         tmp_path,
     ):
@@ -100,12 +91,13 @@ class TestInitCommand:
         project_dir = tmp_path / "test-project"
 
         # Mock required images
-        mock_get_images.return_value = ["agentsystems/agent-control-plane:latest"]
+        mock_get_images.return_value = [
+            "ghcr.io/agentsystems/agent-control-plane:latest"
+        ]
 
         # Execute
         init_command(
             project_dir=project_dir,
-            docker_token="docker-token-123",
         )
 
         # Verify scaffold was copied
@@ -185,7 +177,6 @@ class TestInitCommand:
         # Execute
         init_command(
             project_dir=project_dir,
-            docker_token=None,
         )
 
         # Verify set_key was called to populate the .env file
@@ -211,76 +202,6 @@ class TestInitCommand:
         for var in langfuse_vars:
             assert var in set_keys
 
-    @patch("agentsystems_sdk.commands.init.get_required_images")
-    @patch("agentsystems_sdk.commands.init.docker_login_if_needed")
-    @patch("agentsystems_sdk.commands.init.ensure_docker_installed")
-    @patch("agentsystems_sdk.commands.init.set_key")
-    @patch("agentsystems_sdk.commands.init.shutil.copytree")
-    @patch("agentsystems_sdk.commands.init.run_command")
-    @patch("agentsystems_sdk.commands.init.typer.prompt")
-    @patch("agentsystems_sdk.commands.init.sys.stdin")
-    def test_init_command_docker_pull_failure_retry(
-        self,
-        mock_stdin,
-        mock_prompt,
-        mock_run_command,
-        mock_copytree,
-        mock_set_key,
-        mock_ensure_docker,
-        mock_docker_login,
-        mock_get_images,
-        tmp_path,
-    ):
-        """Test init command retries docker pull with token on failure."""
-        # Setup
-        mock_stdin.isatty.return_value = True
-        project_dir = tmp_path / "test-project"
-
-        # Mock user inputs
-        mock_prompt.side_effect = [
-            str(project_dir),  # Directory prompt
-            "TestOrg",  # Organization name
-            "admin@test.com",  # Email
-            "password123",  # Password
-            "",  # No initial docker token
-            "docker-token-retry",  # Docker token prompt after pull failure
-        ]
-
-        # Mock required images
-        mock_get_images.return_value = ["private/image:latest"]
-
-        # Mock copytree to create directory
-        def create_project_structure(src, dst):
-            dst.mkdir(parents=True)
-            (dst / ".env.example").write_text("")
-
-        mock_copytree.side_effect = create_project_structure
-
-        # Mock run_command to fail on first docker pull, succeed on retry
-        pull_attempts = 0
-
-        def mock_run_side_effect(cmd):
-            nonlocal pull_attempts
-            if "docker" in cmd and "pull" in cmd:
-                pull_attempts += 1
-                if pull_attempts == 1:
-                    raise typer.Exit(code=1)
-                # Success on second attempt
-
-        mock_run_command.side_effect = mock_run_side_effect
-
-        # Execute
-        init_command(
-            project_dir=None,
-            docker_token=None,  # No initial docker token
-        )
-
-        # Verify docker login was called after failure
-        mock_docker_login.assert_called_with("docker-token-retry")
-
-        # Verify pull was attempted twice
-        assert pull_attempts == 2
-
     @patch("agentsystems_sdk.commands.init.get_required_images")
     @patch("agentsystems_sdk.commands.init.ensure_docker_installed")
     @patch("agentsystems_sdk.commands.init.set_key")
@@ -312,7 +233,6 @@ class TestInitCommand:
         # Execute
         init_command(
             project_dir=project_dir,
-            docker_token=None,
         )
 
         # Verify no docker pull commands were executed
@@ -346,22 +266,21 @@ class TestInitCommand:
         # Mock other dependencies to avoid actual execution
         with patch("agentsystems_sdk.commands.init.shutil.copytree"):
             with patch("agentsystems_sdk.commands.init.ensure_docker_installed"):
-                with patch("agentsystems_sdk.commands.init.docker_login_if_needed"):
-                    with patch(
-                        "agentsystems_sdk.commands.init.get_required_images",
-                        return_value=[],
-                    ):
-                        with patch("agentsystems_sdk.commands.init.set_key"):
-                            # Execute
-                            init_command(project_dir=None)
-
-                            # Verify email prompt was called twice (invalid, then valid)
-                            email_calls = [
-                                call
-                                for call in mock_prompt.call_args_list
-                                if "email" in str(call).lower()
-                            ]
-                            assert len(email_calls) >= 2
+                with patch(
+                    "agentsystems_sdk.commands.init.get_required_images",
+                    return_value=[],
+                ):
+                    with patch("agentsystems_sdk.commands.init.set_key"):
+                        # Execute
+                        init_command(project_dir=None)
+
+                        # Verify email prompt was called twice (invalid, then valid)
+                        email_calls = [
+                            call
+                            for call in mock_prompt.call_args_list
+                            if "email" in str(call).lower()
+                        ]
+                        assert len(email_calls) >= 2
 
     @patch("agentsystems_sdk.commands.init.typer.prompt")
     @patch("agentsystems_sdk.commands.init.sys.stdin")
@@ -388,19 +307,18 @@ class TestInitCommand:
         # Mock other dependencies to avoid actual execution
         with patch("agentsystems_sdk.commands.init.shutil.copytree"):
             with patch("agentsystems_sdk.commands.init.ensure_docker_installed"):
-                with patch("agentsystems_sdk.commands.init.docker_login_if_needed"):
-                    with patch(
-                        "agentsystems_sdk.commands.init.get_required_images",
-                        return_value=[],
-                    ):
-                        with patch("agentsystems_sdk.commands.init.set_key"):
-                            # Execute
-                            init_command(project_dir=None)
-
-                            # Verify password prompt was called twice (short, then valid)
-                            password_calls = [
-                                call
-                                for call in mock_prompt.call_args_list
-                                if "password" in str(call).lower()
-                            ]
-                            assert len(password_calls) >= 2
+                with patch(
+                    "agentsystems_sdk.commands.init.get_required_images",
+                    return_value=[],
+                ):
+                    with patch("agentsystems_sdk.commands.init.set_key"):
+                        # Execute
+                        init_command(project_dir=None)
+
+                        # Verify password prompt was called twice (short, then valid)
+                        password_calls = [
+                            call
+                            for call in mock_prompt.call_args_list
+                            if "password" in str(call).lower()
+                        ]
+                        assert len(password_calls) >= 2

{agentsystems_sdk-0.2.31 → agentsystems_sdk-0.3.0}/tests/test_utils.py

@@ -320,7 +320,7 @@ EQUALS_IN_VALUE=key=value
         images = get_required_images()
 
         assert isinstance(images, list)
-        assert "agentsystems/agent-control-plane:latest" in images
+        assert "ghcr.io/agentsystems/agent-control-plane:latest" in images
 
     def test_cleanup_langfuse_init_vars_first_time(self, tmp_path):
         """Test cleanup_langfuse_init_vars on first cleanup."""