agent-starter-pack 0.19.0__tar.gz → 0.19.1__tar.gz

{agent_starter_pack-0.19.0 → agent_starter_pack-0.19.1}/.claude/settings.local.json

@@ -37,7 +37,8 @@
       "Bash(terraform plan -var-file=vars/env.tfvars)",
       "Bash(uv run pytest \"tests/unit/test_makefile_template.py::TestMakefileGeneration::test_makefile_hash[adk_base_agent_engine_no_data]\" -v)",
       "Bash(git add:*)",
-      "Bash(git commit:*)"
+      "Bash(git commit:*)",
+      "Read(//private/tmp/asp-test/test-labels-check/rag/**)"
     ],
     "deny": [],
     "ask": []

{agent_starter_pack-0.19.0 → agent_starter_pack-0.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.19.0
+Version: 0.19.1
 Summary: CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates.
 Author-email: Google LLC <agent-starter-pack@google.com>
 License: Apache-2.0

{agent_starter_pack-0.19.0 → agent_starter_pack-0.19.1}/agent_starter_pack/cli/utils/template.py

@@ -562,11 +562,46 @@ def process_template(
             # Extract agent sample info for labeling when using agent garden with remote templates
             agent_sample_id = None
             agent_sample_publisher = None
+
+            # Handle remote specs with ADK samples metadata
             if agent_garden and remote_spec and remote_spec.is_adk_samples:
                 # For ADK samples, template_path is like "python/agents/sample-name"
                 agent_sample_id = pathlib.Path(remote_spec.template_path).name
                 # For ADK samples, publisher is always "google"
                 agent_sample_publisher = "google"
+                logging.debug(
+                    f"Detected ADK sample from remote_spec: {agent_sample_id}"
+                )
+            # Fallback: Detect ADK samples from pyproject.toml (for version-locked templates)
+            elif agent_garden and remote_template_path:
+                pyproject_path = remote_template_path / "pyproject.toml"
+                if pyproject_path.exists():
+                    try:
+                        import sys
+
+                        if sys.version_info >= (3, 11):
+                            import tomllib
+                        else:
+                            import tomli as tomllib
+
+                        with open(pyproject_path, "rb") as f:
+                            pyproject_data = tomllib.load(f)
+
+                        # Extract project name from pyproject.toml
+                        project_name_from_toml = pyproject_data.get("project", {}).get(
+                            "name"
+                        )
+
+                        if project_name_from_toml:
+                            agent_sample_id = project_name_from_toml
+                            agent_sample_publisher = (
+                                "google"  # ADK samples are from Google
+                            )
+                            logging.debug(
+                                f"Detected ADK sample from pyproject.toml: {agent_sample_id}"
+                            )
+                    except Exception as e:
+                        logging.debug(f"Failed to read pyproject.toml: {e}")
 
             # Create the cookiecutter template structure
             cookiecutter_template = temp_path / "template"

{agent_starter_pack-0.19.0 → agent_starter_pack-0.19.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.19.0"
+version = "0.19.1"
 description = "CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates."
 authors = [
     { name = "Google LLC", email = "agent-starter-pack@google.com" },

{agent_starter_pack-0.19.0 → agent_starter_pack-0.19.1}/tests/cli/utils/test_remote_template.py

@@ -1047,3 +1047,117 @@ class TestCheckAndExecuteWithVersionLock:
 
         write_call = write_calls[0][0][0]
         assert "installing test_project" in write_call
+
+
+class TestAgentGardenLabelExtraction:
+    """Test the logic for extracting agent_garden labels."""
+
+    def test_extract_from_remote_spec_adk_samples(self) -> None:
+        """Test extracting labels from remote_spec when is_adk_samples=True."""
+        from agent_starter_pack.cli.utils.remote_template import RemoteTemplateSpec
+
+        # Simulate the logic in template.py
+        agent_garden = True
+        remote_spec = RemoteTemplateSpec(
+            repo_url="https://github.com/google/adk-samples",
+            template_path="python/agents/RAG",
+            git_ref="main",
+            is_adk_samples=True,
+        )
+
+        # Extract labels (mimicking template.py logic)
+        agent_sample_id = None
+        agent_sample_publisher = None
+
+        if agent_garden and remote_spec and remote_spec.is_adk_samples:
+            agent_sample_id = pathlib.Path(remote_spec.template_path).name
+            agent_sample_publisher = "google"
+
+        assert agent_sample_id == "RAG"
+        assert agent_sample_publisher == "google"
+
+    def test_extract_from_pyproject_toml(self) -> None:
+        """Test extracting labels from pyproject.toml fallback."""
+        # Simulate the logic in template.py
+        remote_template_path = pathlib.Path("/test/template")
+
+        pyproject_content = b"""
+[project]
+name = "rag"
+version = "0.1.0"
+"""
+
+        agent_sample_id = None
+        agent_sample_publisher = None
+
+        # Mock the toml data that would be loaded
+        mock_toml_data = {"project": {"name": "rag", "version": "0.1.0"}}
+
+        with (
+            patch("pathlib.Path.exists", return_value=True),
+            patch("builtins.open", mock_open(read_data=pyproject_content)),
+        ):
+            # Manually parse the pyproject content for this test
+
+            pyproject_path = remote_template_path / "pyproject.toml"
+            if pyproject_path.exists():
+                try:
+                    # Simulate what would happen with real tomllib.load
+                    pyproject_data = mock_toml_data
+
+                    project_name_from_toml = pyproject_data.get("project", {}).get(
+                        "name"
+                    )
+
+                    if project_name_from_toml:
+                        agent_sample_id = project_name_from_toml
+                        agent_sample_publisher = "google"
+                except Exception:
+                    pass
+
+        assert agent_sample_id == "rag"
+        assert agent_sample_publisher == "google"
+
+    def test_no_labels_when_agent_garden_false(self) -> None:
+        """Test that labels are not set when agent_garden=False."""
+        from agent_starter_pack.cli.utils.remote_template import RemoteTemplateSpec
+
+        agent_garden = False
+        remote_spec = RemoteTemplateSpec(
+            repo_url="https://github.com/google/adk-samples",
+            template_path="python/agents/RAG",
+            git_ref="main",
+            is_adk_samples=True,
+        )
+
+        agent_sample_id = None
+        agent_sample_publisher = None
+
+        if agent_garden and remote_spec and remote_spec.is_adk_samples:
+            agent_sample_id = pathlib.Path(remote_spec.template_path).name
+            agent_sample_publisher = "google"
+
+        # Labels should remain None when agent_garden=False
+        assert agent_sample_id is None
+        assert agent_sample_publisher is None
+
+    def test_no_labels_when_no_pyproject_toml(self) -> None:
+        """Test that labels remain empty when pyproject.toml doesn't exist."""
+        remote_template_path = pathlib.Path("/test/template")
+
+        agent_sample_id = None
+        agent_sample_publisher = None
+
+        with patch("pathlib.Path.exists", return_value=False):
+            pyproject_path = remote_template_path / "pyproject.toml"
+            if pyproject_path.exists():
+                # This shouldn't execute
+                agent_sample_id = "should_not_be_set"
+                agent_sample_publisher = "should_not_be_set"
+
+        assert agent_sample_id is None
+        assert agent_sample_publisher is None
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])

{agent_starter_pack-0.19.0 → agent_starter_pack-0.19.1}/uv.lock

@@ -11,7 +11,7 @@ resolution-markers = [
 
 [[package]]
 name = "agent-starter-pack"
-version = "0.19.0"
+version = "0.19.1"
 source = { editable = "." }
 dependencies = [
     { name = "backoff" },