agent-starter-pack 0.9.2__py3-none-any.whl → 0.10.1__py3-none-any.whl

src/cli/utils/cicd.py

@@ -125,6 +125,7 @@ def create_github_connection(
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
+            encoding="utf-8",
         )
 
         # Send 'y' followed by enter key to handle both the API enablement prompt and any other prompts
@@ -263,12 +264,12 @@ class ProjectConfig:
     cicd_project_id: str
     agent: str
     deployment_target: str
+    repository_name: str
+    repository_owner: str
     region: str = "us-central1"
     dev_project_id: str | None = None
     project_name: str | None = None
-    repository_name: str | None = None
-    repository_owner: str | None = None
-    repository_exists: bool | None = None
+    create_repository: bool | None = None
     host_connection_name: str | None = None
     github_pat: str | None = None
     github_app_installation_id: str | None = None
@@ -405,6 +406,7 @@ def run_command(
     capture_output: bool = False,
     shell: bool = False,
     input: str | None = None,
+    env_vars: dict[str, str] | None = None,
 ) -> subprocess.CompletedProcess:
     """Run a command and display it to the user"""
     # Format command for display
@@ -413,6 +415,14 @@ def run_command(
     if cwd:
         print(f"📂 In directory: {cwd}")
 
+    # Prepare environment variables
+    env = None
+    if env_vars:
+        import os
+
+        env = os.environ.copy()
+        env.update(env_vars)
+
     # Run the command
     result = subprocess.run(
         cmd,
@@ -422,6 +432,7 @@ def run_command(
         text=True,
         shell=shell,
         input=input,
+        env=env,
     )
 
     # Display output if captured
@@ -475,6 +486,7 @@ def handle_github_authentication() -> None:
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 text=True,
+                encoding="utf-8",
             )
             stdout, stderr = process.communicate(input=token + "\n")
 
@@ -565,7 +577,7 @@ class E2EDeployment:
                 project_dir / "deployment" / "terraform" / "dev" / "vars" / "env.tfvars"
             )
 
-            with open(tf_vars_path) as f:
+            with open(tf_vars_path, encoding="utf-8") as f:
                 content = f.read()
 
             # Replace dev project ID
@@ -580,7 +592,7 @@ class E2EDeployment:
                 project_dir / "deployment" / "terraform" / "vars" / "env.tfvars"
             )
 
-            with open(tf_vars_path) as f:
+            with open(tf_vars_path, encoding="utf-8") as f:
                 content = f.read()
 
             # Replace all project IDs
@@ -613,7 +625,7 @@ class E2EDeployment:
             )
 
         # Write updated content
-        with open(tf_vars_path, "w") as f:
+        with open(tf_vars_path, "w", encoding="utf-8") as f:
             f.write(content)
 
     def setup_terraform_state(self, project_dir: Path, env: Environment) -> None:
@@ -667,7 +679,7 @@ class E2EDeployment:
             state_prefix = "dev" if is_dev_dir else "prod"
 
             backend_file = tf_dir / "backend.tf"
-            with open(backend_file, "w") as f:
+            with open(backend_file, "w", encoding="utf-8") as f:
                 f.write(f'''terraform {{
   backend "gcs" {{
     bucket = "{bucket_name}"

src/cli/utils/remote_template.py

@@ -198,7 +198,7 @@ def load_remote_template_config(template_dir: pathlib.Path) -> dict[str, Any]:
         return {}
 
     try:
-        with open(config_path) as f:
+        with open(config_path, encoding="utf-8") as f:
             config = yaml.safe_load(f)
             return config if config else {}
     except Exception as e:
@@ -265,7 +265,7 @@ def render_and_merge_makefiles(
     # Render the base Makefile
     base_makefile_path = base_template_path / "Makefile"
     if base_makefile_path.exists():
-        with open(base_makefile_path) as f:
+        with open(base_makefile_path, encoding="utf-8") as f:
             base_template = env.from_string(f.read())
         rendered_base_makefile = base_template.render(cookiecutter=cookiecutter_config)
     else:
@@ -276,7 +276,7 @@ def render_and_merge_makefiles(
     if remote_template_path:
         remote_makefile_path = remote_template_path / "Makefile"
         if remote_makefile_path.exists():
-            with open(remote_makefile_path) as f:
+            with open(remote_makefile_path, encoding="utf-8") as f:
                 remote_template = env.from_string(f.read())
             rendered_remote_makefile = remote_template.render(
                 cookiecutter=cookiecutter_config
@@ -316,6 +316,6 @@ def render_and_merge_makefiles(
         final_makefile_content = rendered_base_makefile
 
     # Write the final merged Makefile
-    with open(final_destination / "Makefile", "w") as f:
+    with open(final_destination / "Makefile", "w", encoding="utf-8") as f:
         f.write(final_makefile_content)
     logging.debug("Rendered and merged Makefile written to final destination.")

src/cli/utils/template.py

@@ -48,7 +48,7 @@ class TemplateConfig:
     def from_file(cls, config_path: pathlib.Path) -> "TemplateConfig":
         """Load template config from file with validation"""
         try:
-            with open(config_path) as f:
+            with open(config_path, encoding="utf-8") as f:
                 data = yaml.safe_load(f)
 
             if not isinstance(data, dict):
@@ -101,7 +101,7 @@ def get_available_agents(deployment_target: str | None = None) -> dict:
             template_config_path = agent_dir / ".template" / "templateconfig.yaml"
             if template_config_path.exists():
                 try:
-                    with open(template_config_path) as f:
+                    with open(template_config_path, encoding="utf-8") as f:
                         config = yaml.safe_load(f)
                     agent_name = agent_dir.name
 
@@ -150,7 +150,7 @@ def load_template_config(template_dir: pathlib.Path) -> dict[str, Any]:
         return {}
 
     try:
-        with open(config_file) as f:
+        with open(config_file, encoding="utf-8") as f:
             config = yaml.safe_load(f)
             return config if config else {}
     except Exception as e:
@@ -230,6 +230,10 @@ def prompt_session_type_selection() -> str:
             "display_name": "AlloyDB",
             "description": "Use AlloyDB for session management. Comes with terraform resources for deployment.",
         },
+        "agent_engine": {
+            "display_name": "Vertex AI Agent Engine",
+            "description": "Managed session service that automatically handles conversation history",
+        },
     }
 
     console.print("\n> Please select a session type:")
@@ -357,6 +361,36 @@ def prompt_datastore_selection(
     return datastore_type
 
 
+def prompt_cicd_runner_selection() -> str:
+    """Ask user to select a CI/CD runner."""
+    console = Console()
+
+    cicd_runners = {
+        "google_cloud_build": {
+            "display_name": "Google Cloud Build",
+            "description": "Fully managed CI/CD, deeply integrated with GCP for fast, consistent builds and deployments.",
+        },
+        "github_actions": {
+            "display_name": "GitHub Actions",
+            "description": "GitHub Actions: CI/CD with secure workload identity federation directly in GitHub.",
+        },
+    }
+
+    console.print("\n> Please select a CI/CD runner:")
+    for idx, (_key, info) in enumerate(cicd_runners.items(), 1):
+        console.print(
+            f"{idx}. [bold]{info['display_name']}[/] - [dim]{info['description']}[/]"
+        )
+
+    choice = IntPrompt.ask(
+        "\nEnter the number of your CI/CD runner choice",
+        default=1,
+        show_default=True,
+    )
+
+    return list(cicd_runners.keys())[choice - 1]
+
+
 def get_template_path(agent_name: str, debug: bool = False) -> pathlib.Path:
     """Get the absolute path to the agent template directory."""
     current_dir = pathlib.Path(__file__).parent.parent.parent.parent
@@ -404,6 +438,7 @@ def process_template(
     template_dir: pathlib.Path,
     project_name: str,
     deployment_target: str | None = None,
+    cicd_runner: str | None = None,
     include_data_ingestion: bool = False,
     datastore: str | None = None,
     session_type: str | None = None,
@@ -418,6 +453,7 @@ def process_template(
         template_dir: Directory containing the template files
         project_name: Name of the project to create
         deployment_target: Optional deployment target (agent_engine or cloud_run)
+        cicd_runner: Optional CI/CD runner to use
         include_data_ingestion: Whether to include data pipeline components
         datastore: Optional datastore type for data ingestion
         session_type: Optional session type for cloud_run deployment
@@ -585,13 +621,13 @@ def process_template(
                 / "docs"
                 / "adk-cheatsheet.md"
             )
-            with open(adk_cheatsheet_path) as f:
+            with open(adk_cheatsheet_path, encoding="utf-8") as f:
                 adk_cheatsheet_content = f.read()
 
             llm_txt_path = (
                 pathlib.Path(__file__).parent.parent.parent.parent / "llm.txt"
             )
-            with open(llm_txt_path) as f:
+            with open(llm_txt_path, encoding="utf-8") as f:
                 llm_txt_content = f.read()
 
             cookiecutter_config = {
@@ -605,6 +641,7 @@ def process_template(
                 "settings": settings,
                 "tags": tags,
                 "deployment_target": deployment_target or "",
+                "cicd_runner": cicd_runner or "google_cloud_build",
                 "session_type": session_type or "",
                 "frontend_type": frontend_type,
                 "extra_dependencies": [extra_deps],
@@ -629,7 +666,9 @@ def process_template(
                 ],
             }
 
-            with open(cookiecutter_template / "cookiecutter.json", "w") as f:
+            with open(
+                cookiecutter_template / "cookiecutter.json", "w", encoding="utf-8"
+            ) as f:
                 json.dump(cookiecutter_config, f, indent=4)
 
             logging.debug(f"Template structure created at {cookiecutter_template}")
@@ -641,6 +680,7 @@ def process_template(
             cookiecutter(
                 str(cookiecutter_template),
                 no_input=True,
+                overwrite_if_exists=True,
                 extra_context={
                     "project_name": project_name,
                     "agent_name": agent_name,
@@ -681,6 +721,27 @@ def process_template(
                         file_path.unlink()
                         logging.debug(f"Deleted {file_path}")
 
+                # Clean up unused_* files and directories created by conditional templates
+                import glob
+
+                unused_patterns = [
+                    final_destination / "unused_*",
+                    final_destination / "**" / "unused_*",
+                ]
+
+                for pattern in unused_patterns:
+                    for unused_path_str in glob.glob(str(pattern), recursive=True):
+                        unused_path = pathlib.Path(unused_path_str)
+                        if unused_path.exists():
+                            if unused_path.is_dir():
+                                shutil.rmtree(unused_path)
+                                logging.debug(
+                                    f"Deleted unused directory: {unused_path}"
+                                )
+                            else:
+                                unused_path.unlink()
+                                logging.debug(f"Deleted unused file: {unused_path}")
+
                 # Handle pyproject.toml and uv.lock files
                 if is_remote and remote_template_path:
                     # For remote templates, use their pyproject.toml and uv.lock if they exist
@@ -696,19 +757,6 @@ def process_template(
                     if remote_uv_lock.exists():
                         shutil.copy2(remote_uv_lock, final_destination / "uv.lock")
                         logging.debug("Used uv.lock from remote template")
-                    elif deployment_target:
-                        # Fallback to base template lock file
-                        base_template_name = get_base_template_name(remote_config or {})
-                        lock_path = (
-                            pathlib.Path(__file__).parent.parent.parent.parent
-                            / "src"
-                            / "resources"
-                            / "locks"
-                            / f"uv-{base_template_name}-{deployment_target}.lock"
-                        )
-                        if lock_path.exists():
-                            shutil.copy2(lock_path, final_destination / "uv.lock")
-                            logging.debug(f"Used fallback lock file from {lock_path}")
                 elif deployment_target:
                     # For local templates, use the existing logic
                     lock_path = (

src/deployment_targets/cloud_run/app/server.py

@@ -20,6 +20,9 @@ from google.adk.cli.fast_api import get_fast_api_app
 from google.cloud import logging as google_cloud_logging
 from opentelemetry import trace
 from opentelemetry.sdk.trace import TracerProvider, export
+{%- if cookiecutter.session_type == "agent_engine" %}
+from vertexai import agent_engines
+{%- endif %}
 
 from app.utils.gcs import create_bucket_if_not_exists
 from app.utils.tracing import CloudTraceLoggingSpanExporter
@@ -55,6 +58,22 @@ db_host = os.environ.get("DB_HOST")
 session_service_uri = None
 if db_host and db_pass:
     session_service_uri = f"postgresql://{db_user}:{db_pass}@{db_host}:5432/{db_name}"
+{%- elif cookiecutter.session_type == "agent_engine" %}
+# Agent Engine session configuration
+# Use environment variable for agent name, default to project name
+agent_name = os.environ.get("AGENT_ENGINE_SESSION_NAME", "{{cookiecutter.project_name}}")
+
+# Check if an agent with this name already exists
+existing_agents = list(agent_engines.list(filter=f"display_name={agent_name}"))
+
+if existing_agents:
+    # Use the existing agent
+    agent_engine = existing_agents[0]
+else:
+    # Create a new agent if none exists
+    agent_engine = agent_engines.create(display_name=agent_name)
+
+session_service_uri = f"agentengine://{agent_engine.resource_name}"
 {%- else %}
 # In-memory session configuration - no persistent storage
 session_service_uri = None

src/deployment_targets/cloud_run/deployment/terraform/dev/service.tf

@@ -63,9 +63,10 @@ resource "google_service_networking_connection" "vpc_connection" {
 
 # AlloyDB Cluster
 resource "google_alloydb_cluster" "session_db_cluster" {
-  project    = var.dev_project_id
-  cluster_id = "${var.project_name}-alloydb-cluster"
-  location   = var.region
+  project         = var.dev_project_id
+  cluster_id      = "${var.project_name}-alloydb-cluster"
+  location        = var.region
+  deletion_policy = "FORCE"
 
   network_config {
     network = google_compute_network.default.id

src/deployment_targets/cloud_run/deployment/terraform/service.tf

@@ -75,9 +75,10 @@ resource "google_service_networking_connection" "vpc_connection" {
 resource "google_alloydb_cluster" "session_db_cluster" {
   for_each = local.deploy_project_ids
   
-  project    = local.deploy_project_ids[each.key]
-  cluster_id = "${var.project_name}-alloydb-cluster"
-  location   = var.region
+  project         = local.deploy_project_ids[each.key]
+  cluster_id      = "${var.project_name}-alloydb-cluster"
+  location        = var.region
+  deletion_policy = "FORCE"
 
   network_config {
     network = google_compute_network.default[each.key].id

src/deployment_targets/cloud_run/tests/integration/test_server_e2e.py

@@ -62,6 +62,10 @@ def start_server() -> subprocess.Popen[str]:
     ]
     env = os.environ.copy()
     env["INTEGRATION_TEST"] = "TRUE"
+{%- if cookiecutter.session_type == "agent_engine" %}
+    # Set test-specific agent engine session name
+    env["AGENT_ENGINE_SESSION_NAME"] = "test-{{cookiecutter.project_name}}"
+{%- endif %}
     process = subprocess.Popen(
         command,
         stdout=subprocess.PIPE,
@@ -250,3 +254,34 @@ def test_collect_feedback(server_fixture: subprocess.Popen[str]) -> None:
         FEEDBACK_URL, json=feedback_data, headers=HEADERS, timeout=10
     )
     assert response.status_code == 200
+{%- if cookiecutter.session_type == "agent_engine" %}
+
+
+@pytest.fixture(scope="session", autouse=True)
+def cleanup_agent_engine_sessions() -> None:
+    """Cleanup agent engine sessions created during tests."""
+    yield  # Run tests first
+
+    # Cleanup after tests complete
+    from vertexai import agent_engines
+
+    try:
+        # Use same environment variable as server, default to project name
+        agent_name = os.environ.get(
+            "AGENT_ENGINE_SESSION_NAME", "{{cookiecutter.project_name}}"
+        )
+
+        # Find and delete agent engines with this name
+        existing_agents = list(agent_engines.list(filter=f"display_name={agent_name}"))
+
+        for agent_engine in existing_agents:
+            try:
+                agent_engines.delete(resource_name=agent_engine.name)
+                logger.info(f"Cleaned up agent engine: {agent_engine.name}")
+            except Exception as e:
+                logger.warning(
+                    f"Failed to cleanup agent engine {agent_engine.name}: {e}"
+                )
+    except Exception as e:
+        logger.warning(f"Failed to cleanup agent engine sessions: {e}")
+{%- endif %}

src/deployment_targets/cloud_run/tests/load_test/README.md

@@ -41,7 +41,7 @@ Comprehensive CSV and HTML reports detailing the load test performance will be g
 
 ## Remote Load Testing (Targeting Cloud Run)
 
-This framework also supports load testing against remote targets, such as a staging Cloud Run instance. This process is seamlessly integrated into the Continuous Delivery pipeline via Cloud Build, as defined in the [pipeline file](cicd/cd/staging.yaml).
+This framework also supports load testing against remote targets, such as a staging Cloud Run instance. This process is seamlessly integrated into the Continuous Delivery (CD) pipeline.
 
 **Prerequisites:**
 

src/frontends/live_api_react/frontend/package-lock.json

@@ -6452,16 +6452,16 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
-      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "compressible": "~2.0.18",
         "debug": "2.6.9",
         "negotiator": "~0.6.4",
-        "on-headers": "~1.0.2",
+        "on-headers": "~1.1.0",
         "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
@@ -8038,14 +8038,15 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
         "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9335,14 +9336,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.2.tgz",
-      "integrity": "sha512-sJe+TQb2vIaIyO783qN6BlMYWMw3WBOHA1Ay2qxsnjuafEOQFJ2JakedOQirT6D5XPRxDvS7AHYyem9fTpb4LQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
+      "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
@@ -12916,9 +12919,9 @@
       }
     },
     "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"

src/frontends/streamlit/frontend/side_bar.py

@@ -31,7 +31,7 @@ DEFAULT_BASE_URL = "http://localhost:8000/"
 
 DEFAULT_REMOTE_AGENT_ENGINE_ID = "N/A"
 if os.path.exists("deployment_metadata.json"):
-    with open("deployment_metadata.json") as f:
+    with open("deployment_metadata.json", encoding="utf-8") as f:
         DEFAULT_REMOTE_AGENT_ENGINE_ID = json.load(f)["remote_agent_engine_id"]
 DEFAULT_AGENT_CALLABLE_PATH = "app.agent_engine_app.AgentEngineApp"
 

src/frontends/streamlit/frontend/utils/chat_utils.py

@@ -56,7 +56,7 @@ def save_chat(st: Any) -> None:
     if len(messages) > 0:
         session["messages"] = sanitize_messages(session["messages"])
         filename = f"{session_id}.yaml"
-        with open(Path(SAVED_CHAT_PATH) / filename, "w") as file:
+        with open(Path(SAVED_CHAT_PATH) / filename, "w", encoding="utf-8") as file:
             yaml.dump(
                 [session],
                 file,

src/frontends/streamlit/frontend/utils/local_chat_history.py

@@ -49,7 +49,7 @@ class LocalChatMessageHistory(BaseChatMessageHistory):
         for filename in os.listdir(self.user_dir):
             if filename.endswith(".yaml"):
                 file_path = os.path.join(self.user_dir, filename)
-                with open(file_path) as f:
+                with open(file_path, encoding="utf-8") as f:
                     conversation = yaml.safe_load(f)
                     if not isinstance(conversation, list) or len(conversation) > 1:
                         raise ValueError(
@@ -71,7 +71,7 @@ class LocalChatMessageHistory(BaseChatMessageHistory):
     def upsert_session(self, session: dict) -> None:
         """Updates or inserts a session into the local storage."""
         session["update_time"] = datetime.now().isoformat()
-        with open(self.session_file, "w") as f:
+        with open(self.session_file, "w", encoding="utf-8") as f:
             yaml.dump(
                 [session],
                 f,

src/resources/docs/adk-cheatsheet.md

@@ -356,7 +356,7 @@ document_pipeline = SequentialAgent(
 Executes `sub_agents` simultaneously. Useful for independent tasks to reduce overall latency. All sub-agents share the same `session.state`.
 
 ```python
-from google.adk.agents import ParallelAgent, Agent
+from google.adk.agents import ParallelAgent, Agent, SequentialAgent
 
 # Agents to fetch data concurrently
 fetch_stock_price = Agent(name="StockPriceFetcher", ..., output_key="stock_data")