agent-starter-pack 0.1.4__tar.gz → 0.1.5__tar.gz

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.1.4
+Version: 0.1.5
 Summary: CLI tool to create GCP-based AI agent projects from templates
 Author-email: Google LLC <agent-starter-pack@google.com>
 License: Apache-2.0

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.1.4"
+version = "0.1.5"
 description = "CLI tool to create GCP-based AI agent projects from templates"
 authors = [
     { name = "Google LLC", email = "agent-starter-pack@google.com" },

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/src/base_template/Makefile

@@ -31,6 +31,24 @@ ui:
 {%- endif %}
 {%- endif %}
 
+setup-dev-env:
+	@if [ -z "$$PROJECT_ID" ]; then echo "Error: PROJECT_ID environment variable is not set"; exit 1; fi
+	(cd deployment/terraform/dev && terraform init && terraform apply --var-file vars/env.tfvars --var dev_project_id=$$PROJECT_ID --auto-approve)
+
+{%- if cookiecutter.data_ingestion%}
+data-ingestion:
+	@if [ -z "$$PROJECT_ID" ]; then echo "Error: PROJECT_ID environment variable is not set"; exit 1; fi
+	$(MAKE) install
+	(cd data_ingestion && uv run data_ingestion_pipeline/submit_pipeline.py \
+		--project-id=$$PROJECT_ID \
+		--data-store-id="sample-datastore" \
+		--region="us-central1" \
+		--data-store-region="us" \
+		--service-account="vertexai-pipelines-sa@$$PROJECT_ID.iam.gserviceaccount.com" \
+		--pipeline-root="gs://$$PROJECT_ID-pipeline-artifacts" \
+		--pipeline-name="data-ingestion-pipeline")
+{%- endif %}
+
 lint:
 	uv run codespell
 	uv run ruff check . --diff

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/src/base_template/README.md

@@ -113,6 +113,15 @@ For full command options and usage, refer to the [Makefile](Makefile).
 3.  **Interact with the Agent**
     Once both the backend and frontend are running, click the play button in the frontend UI to establish a connection with the backend. You can now interact with the Multimodal Live Agent! You can try asking questions such as "Using the tool you have, define Governance in the context MLOPs" to allow the agent to use the documentation it was provided to.
 
+**Remote access**:
+Use [Cloud Run proxy](https://cloud.google.com/sdk/gcloud/reference/run/services/proxy) for local access. The backend will be accessible at `http://localhost:8000`:
+
+   ```bash
+   gcloud run services proxy genai-app-sample --port 8000 --project $PROJECT_ID --region $REGION
+   ```
+
+   You can then use the same frontend setup described above to interact with your Cloud Run deployment.
+
 <details>
 <summary><b>Cloud Shell usage</b></summary>
 

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/src/base_template/pyproject.toml

@@ -22,9 +22,9 @@ dependencies = [
 {%- endif %}
 ]
 {% if cookiecutter.deployment_target == 'cloud_run' %}
-requires-python = ">=3.10,<=3.13"
+requires-python = ">=3.10,<3.14"
 {% elif cookiecutter.deployment_target == 'agent_engine' %}
-requires-python = ">=3.10,<=3.11"
+requires-python = ">=3.10,<3.13"
 {%- endif %}
 
 [dependency-groups]

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/src/cli/commands/create.py

@@ -163,11 +163,12 @@ def create(
         # GCP Setup
         logging.debug("Setting up GCP...")
 
+        creds_info = {}
         # Check for uv installation if not skipping checks
         if not skip_checks:
             # Set up GCP environment
             try:
-                setup_gcp_environment(
+                creds_info = setup_gcp_environment(
                     auto_approve=auto_approve,
                     skip_checks=skip_checks,
                     region=region,
@@ -211,17 +212,29 @@ def create(
         )
 
         project_path = destination_dir / project_name
-        console.print("\n> 👍 Done. Execute the following command to get started:")
-        if output_dir:
-            # If output_dir was specified, use the absolute path
-            console.print(
-                f"[bold bright_green]cd {project_path} && make install && make playground[/]"
-            )
-        else:
-            # If no output_dir specified, just use project name
+        # Determine the correct path to display to the user
+        display_path = str(project_path) if output_dir else project_name
+
+        if include_data_ingestion:
+            project_id = creds_info.get("project", "")
             console.print(
-                f"[bold bright_green]cd {project_name} && make install && make playground[/]"
+                f"\n[bold white]===== DATA INGESTION SETUP =====[/bold white]\n"
+                f"This agent uses a datastore for grounded responses.\n"
+                f"The agent will work without data, but for optimal results:\n"
+                f"1. Set up dev environment:\n"
+                f"   [white italic]`export PROJECT_ID={project_id} && cd {display_path} && make setup-dev-env`[/white italic]\n\n"
+                f"   See deployment/README.md for more info\n"
+                f"2. Run the data ingestion pipeline:\n"
+                f"   [white italic]`export PROJECT_ID={project_id} && cd {display_path} && make data-ingestion`[/white italic]\n\n"
+                f"   See data_ingestion/README.md for more info\n"
+                f"[bold white]=================================[/bold white]\n"
             )
+        console.print("\n> 👍 Done. Execute the following command to get started:")
+
+        # Show the command to get started
+        console.print(
+            f"[bold bright_green]cd {display_path} && make install && make playground[/]"
+        )
 
         # Replace region in all files if a different region was specified
         if region != "us-central1":
@@ -473,7 +486,16 @@ def replace_region_in_files(
         )
 
     # Define allowed file extensions
-    allowed_extensions = {".md", ".py", ".tfvars", ".yaml", ".tf", ".yml"}
+    allowed_extensions = {
+        ".md",
+        ".py",
+        ".tfvars",
+        ".yaml",
+        ".tf",
+        ".yml",
+        "Makefile",
+        "makefile",
+    }
 
     # Skip directories that shouldn't be modified
     skip_dirs = {".git", "__pycache__", "venv", ".venv", "node_modules"}
@@ -491,7 +513,10 @@ def replace_region_in_files(
         if (
             file_path.is_dir()
             or any(skip_dir in file_path.parts for skip_dir in skip_dirs)
-            or file_path.suffix not in allowed_extensions
+            or (
+                file_path.suffix not in allowed_extensions
+                and file_path.name not in allowed_extensions
+            )
         ):
             continue
 
@@ -522,6 +547,13 @@ def replace_region_in_files(
                     'data_store_region="us"', f'data_store_region="{data_store_region}"'
                 )
                 modified = True
+            elif 'data-store-region="us"' in content:
+                if debug:
+                    logging.debug(f"Replacing data-store-region in {file_path}")
+                content = content.replace(
+                    'data-store-region="us"', f'data-store-region="{data_store_region}"'
+                )
+                modified = True
             elif "_DATA_STORE_REGION: us" in content:
                 if debug:
                     logging.debug(f"Replacing _DATA_STORE_REGION in {file_path}")

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/src/frontends/streamlit/frontend/side_bar.py

@@ -56,10 +56,11 @@ class SideBar:
             )
             use_agent_path = self.st.selectbox(
                 "Select Agent Type",
-                ["Local Agent", "Remote Engine ID", "Remote URL"],
+                ["Local Agent", "Remote Agent Engine ID", "Remote URL"],
                 index=["Local Agent", "Remote Engine ID", "Remote URL"].index(
                     default_agent_type
                 ),
+                help="'Local Agent' uses a local implementation, 'Remote Agent Engine ID' connects to a deployed Vertex AI agent, and 'Remote URL' connects to a custom endpoint.",
             )
 
             if use_agent_path == "Local Agent":

{agent_starter_pack-0.1.4 → agent_starter_pack-0.1.5}/src/frontends/streamlit/frontend/utils/stream_handler.py

@@ -32,6 +32,8 @@ from vertexai.preview import reasoning_engines
 
 from frontend.utils.multimodal_utils import format_content
 
+st.cache_resource.clear()
+
 
 @st.cache_resource
 def get_remote_agent(remote_agent_engine_id: str) -> Any:
@@ -65,6 +67,16 @@ def get_remote_url_config(url: str, authenticate_request: bool) -> dict[str, Any
     }
 
 
+@st.cache_resource()
+def get_local_agent(agent_callable_path: str) -> Any:
+    """Get cached local agent instance."""
+    module_path, class_name = agent_callable_path.rsplit(".", 1)
+    module = importlib.import_module(module_path)
+    agent = getattr(module, class_name)()
+    agent.set_up()
+    return agent
+
+
 class Client:
     """A client for streaming events from a server."""
 
@@ -94,14 +106,10 @@ class Client:
             self.agent = get_remote_agent(remote_agent_engine_id)
             self.url = None
         else:
-            # Force reload all submodules to get latest changes
             self.url = None
             if agent_callable_path is None:
                 raise ValueError("agent_callable_path cannot be None")
-            module_path, class_name = agent_callable_path.rsplit(".", 1)
-            module = importlib.import_module(module_path)
-            self.agent = getattr(module, class_name)()
-            self.agent.set_up()
+            self.agent = get_local_agent(agent_callable_path)
 
     def log_feedback(self, feedback_dict: dict[str, Any], run_id: str) -> None:
         """Log user feedback for a specific run."""