agent-starter-pack 0.0.4b0__py3-none-any.whl → 0.0.6b0__py3-none-any.whl

{agent_starter_pack-0.0.4b0.dist-info → agent_starter_pack-0.0.6b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.0.4b0
+Version: 0.0.6b0
 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.0.4b0.dist-info → agent_starter_pack-0.0.6b0.dist-info}/RECORD

@@ -57,7 +57,7 @@ src/base_template/deployment/terraform/dev/vars/env.tfvars,sha256=xz5cYG29ZIgqM1
 src/base_template/deployment/terraform/vars/env.tfvars,sha256=2dxWRDzeolN2f7eKSHXcBiBt9fRcIMO6VH-2MAZevLQ,1633
 src/base_template/tests/unit/test_utils/test_tracing_exporter.py,sha256=JAb0vIB7wNFPm_kaDaHcxtPKNReypDHjdsMQyzpuePQ,4687
 src/cli/main.py,sha256=134KpcOQlexr_vR-KT3D3B1jKh1Y6S3qHGJ-9uD9Kkg,950
-src/cli/commands/create.py,sha256=KkGte-FAvuSwkivuTLJ8s_HqpAJ35senyWA04VUKllA,16898
+src/cli/commands/create.py,sha256=oupbVv8zfMho4JowBCvgr0YpS2I7mYWCDR3We8VxqjI,18497
 src/cli/commands/setup_cicd.py,sha256=EgVkDdA94npDHHPTuYDmWNIiRscnsXtN7CbTuelrTVU,28347
 src/cli/utils/__init__.py,sha256=x-k6jfcv68_zYS88LrA1mr0yB5y5SekJ0nc5Tvt6iDA,1064
 src/cli/utils/cicd.py,sha256=x-8PKp4aevkUwAmtbEZVwu0UlrA6ifXGbouxICu1D0o,25664
@@ -135,7 +135,7 @@ src/frontends/streamlit/frontend/utils/local_chat_history.py,sha256=9wc8L8j4tk10
 src/frontends/streamlit/frontend/utils/message_editing.py,sha256=YWoPe2KeWMuL3YVTm0am6MK3kzjEIYVmdkdwTQpmGdQ,2263
 src/frontends/streamlit/frontend/utils/multimodal_utils.py,sha256=v6YbCkz_YcnEo-9YvRjwBNt0SzU4M39bYxJGmKk69vE,7313
 src/frontends/streamlit/frontend/utils/stream_handler.py,sha256=J7MMsOR2GvDEsyJbsv8VQeZbMs7mNySrclZNfuzsZD4,11578
-src/frontends/streamlit/frontend/utils/title_summary.py,sha256=JtFnPzS3JcEcZRrRmFVz5wZacORVLtN86MEjCTqP-wA,2405
+src/frontends/streamlit/frontend/utils/title_summary.py,sha256=8yaatgn86wwzc9wXY83tubUxxC-Cu-8LY9O5xo3IaJA,2526
 src/resources/containers/data_processing/Dockerfile,sha256=uXjqDiSrr7YpoX-vtzaIJIVXZ2qeUpu1Nzju9qWZ9oI,859
 src/resources/locks/uv-agentic_rag_vertexai_search-agent_engine.lock,sha256=6muWlgt4dduqGDiGUvTg-d2zzY5rgW9zP9DbDnt3krc,474353
 src/resources/locks/uv-agentic_rag_vertexai_search-cloud_run.lock,sha256=ViUzp35RGWZiiQvvVi6ntFTT-bEbHg4_HDDQznD4ML8,756574
@@ -150,8 +150,8 @@ src/resources/setup_cicd/providers.tf,sha256=Km4z6IJt7x7PLaa0kyZbBrO2m3lpuIJZFD5
 src/utils/generate_locks.py,sha256=xu5IAhGGBPkVQGSJX4kk7_JNDwWJUEaXAHbmaQIohbg,4386
 src/utils/lock_utils.py,sha256=plw3vWkRViCMxBK3IrLRHtF_I0kbbP043T9KIYxcb20,2423
 src/utils/watch_and_rebuild.py,sha256=IdbTLReYknTXXu5KWPz3sc7Zg5HTEMS5UVlMSnuhs5E,6067
-agent_starter_pack-0.0.4b0.dist-info/METADATA,sha256=_m-NtcmnQH_6wZWro1uVIG6dBJTQia3GEuh1AlSblVE,6805
-agent_starter_pack-0.0.4b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agent_starter_pack-0.0.4b0.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
-agent_starter_pack-0.0.4b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-agent_starter_pack-0.0.4b0.dist-info/RECORD,,
+agent_starter_pack-0.0.6b0.dist-info/METADATA,sha256=yYnMdi49WWJ3JG27GPtJmM1oU08-QScuGDxF_R5u4iY,6805
+agent_starter_pack-0.0.6b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agent_starter_pack-0.0.6b0.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
+agent_starter_pack-0.0.6b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+agent_starter_pack-0.0.6b0.dist-info/RECORD,,

src/cli/commands/create.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import logging
+import os
 import pathlib
 import subprocess
 
@@ -161,18 +162,22 @@ def create(
 
         # GCP Setup
         logging.debug("Setting up GCP...")
-            
+
         # Check for uv installation if not skipping checks
         if not skip_checks:
             check_and_install_uv()
-            
+
             # Set up GCP environment
-            setup_gcp_environment(
-                auto_approve=auto_approve,
-                skip_checks=skip_checks,
-                region=region,
-                debug=debug
-            )
+            try:
+                setup_gcp_environment(
+                    auto_approve=auto_approve,
+                    skip_checks=skip_checks,
+                    region=region,
+                    debug=debug,
+                )
+            except Exception as e:
+                if debug:
+                    logging.warning(f"GCP environment setup failed: {e}")
 
         # Process template
         template_path = get_template_path(final_agent, debug=debug)
@@ -259,122 +264,172 @@ def display_agent_selection(deployment_target: str | None = None) -> str:
     return agents[choice]["name"]
 
 
-def set_project_quota(project_id: str) -> None:
-    """Set the GCP project and application default quota project.
-    
+def set_gcp_project(project_id: str, set_quota_project: bool = True) -> None:
+    """Set the GCP project and optionally the application default quota project.
+
     Args:
-        project_id: The GCP project ID to set
+        project_id: The GCP project ID to set.
+        set_quota_project: Whether to set the application default quota project.
     """
     try:
         subprocess.run(
-            ["gcloud", "config", "set", "project", project_id], check=True, capture_output=True, text=True
+            ["gcloud", "config", "set", "project", project_id],
+            check=True,
+            capture_output=True,
+            text=True,
         )
     except subprocess.CalledProcessError as e:
         console.print(f"\n> Error setting project to {project_id}:")
         console.print(e.stderr)
         raise
 
-    try:
-        subprocess.run(
-            ["gcloud", "auth", "application-default", "set-quota-project", project_id],
-            check=True, capture_output=True, text=True
-        )
-    except subprocess.CalledProcessError as e:
-        console.print(f"> Error setting application default quota project:")
-        console.print(e.stderr)
-        raise
-    
+    if set_quota_project:
+        try:
+            subprocess.run(
+                [
+                    "gcloud",
+                    "auth",
+                    "application-default",
+                    "set-quota-project",
+                    project_id,
+                ],
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+        except subprocess.CalledProcessError as e:
+            console.print("> Error setting application default quota project:")
+            console.print(e.stderr)
+            raise
+
     console.print(f"> Successfully configured project: {project_id}")
 
 
 def setup_gcp_environment(
-    auto_approve: bool, 
-    skip_checks: bool, 
-    region: str,
-    debug: bool
+    auto_approve: bool, skip_checks: bool, region: str, debug: bool
 ) -> dict:
     """Set up the GCP environment with proper credentials and project.
-    
+
     Args:
         auto_approve: Whether to skip confirmation prompts
         skip_checks: Whether to skip verification checks
         region: GCP region for deployment
         debug: Whether debug logging is enabled
-        
+
     Returns:
         Dictionary with credential information
     """
+    # Skip all verification if requested
     if skip_checks:
         if debug:
             logging.debug("Skipping verification checks due to --skip-checks flag")
         console.print("> Skipping verification checks", style="yellow")
-        # Set a default creds_info when skipping checks
         return {"project": "unknown"}
-    
+
     # Verify current GCP credentials
     if debug:
         logging.debug("Verifying GCP credentials...")
     creds_info = verify_credentials()
-    
+
+    # Handle credential verification and project selection
     if not auto_approve:
-        # Ask user if current credentials are correct
-        change_creds = (
+        creds_info = _handle_credential_verification(creds_info)
+    else:
+        # Even with auto_approve, we should still set the GCP project
+        set_gcp_project(creds_info["project"], set_quota_project=True)
+
+    # Test Vertex AI connection
+    _test_vertex_ai_connection(creds_info["project"], region)
+
+    return creds_info
+
+
+def _handle_credential_verification(creds_info: dict) -> dict:
+    """Handle verification of credentials and project selection.
+
+    Args:
+        creds_info: Current credential information
+
+    Returns:
+        Updated credential information
+    """
+    # Check if running in Cloud Shell
+    if os.environ.get("CLOUD_SHELL") == "true":
+        if creds_info["project"] == "":
+            console.print("> It looks like you are running in Cloud Shell.")
+            console.print(
+                "> You need to set up a project ID to continue, but you haven't setup a project yet."
+            )
+            new_project = Prompt.ask("\n> Enter a project ID")
+            creds_info["project"] = new_project
+            set_gcp_project(creds_info["project"], set_quota_project=False)
+        return creds_info
+
+    # Ask user if current credentials are correct
+    change_creds = (
+        Prompt.ask(
+            f"\n> You are logged in with account '{creds_info['account']}' "
+            f"and using project '{creds_info['project']}'. "
+            "Is this correct?",
+            choices=["Y", "n"],
+            default="Y",
+        ).lower()
+        == "n"
+    )
+
+    if change_creds:
+        # Handle credential change
+        console.print("\n> Initiating new login...")
+        subprocess.run(["gcloud", "auth", "login", "--update-adc"], check=True)
+        console.print("> Login successful. Verifying new credentials...")
+
+        # Re-verify credentials after login
+        creds_info = verify_credentials()
+
+        # Prompt for project change
+        change_project = (
             Prompt.ask(
-                f"\n> You are logged in with account '{creds_info['account']}' "
-                f"and using project '{creds_info['project']}'. "
+                f"\n> You are now logged in with account '{creds_info['account']}'. "
+                f"Current project is '{creds_info['project']}'. "
                 "Is this correct?",
-                choices=["Y", "n"],
-                default="Y",
-            ).lower() == "n"
+                choices=["y", "n"],
+                default="y",
+            ).lower()
+            == "n"
         )
-        
-        if change_creds:
-            # Handle credential change
-            console.print("\n> Initiating new login...")
-            subprocess.run(["gcloud", "auth", "login", "--update-adc"], check=True)
-            console.print("> Login successful. Verifying new credentials...")
-            
-            # Re-verify credentials after login
-            creds_info = verify_credentials()
-            
-            # Prompt for project change
-            change_project = (
-                Prompt.ask(
-                    f"\n> You are now logged in with account '{creds_info['account']}'. "
-                    f"Current project is '{creds_info['project']}'. "
-                    "Do you wish to change the project?",
-                    choices=["y", "n"],
-                    default="n",
-                ).lower() == "y"
-            )
-            
-            if change_project:
-                # Prompt for new project ID
-                new_project = Prompt.ask("\n> Enter the new project ID")
-                creds_info["project"] = new_project
-    
-    # Always set project and quota, regardless of whether credentials were changed
-    set_project_quota(creds_info["project"])
-    
-    # Test Vertex AI connection
+
+        if change_project:
+            # Prompt for new project ID
+            new_project = Prompt.ask("\n> Enter the new project ID")
+            creds_info["project"] = new_project
+
+    set_gcp_project(creds_info["project"], set_quota_project=True)
+    return creds_info
+
+
+def _test_vertex_ai_connection(project_id: str, region: str) -> None:
+    """Test connection to Vertex AI.
+
+    Args:
+        project_id: GCP project ID
+        region: GCP region for deployment
+    """
     console.print("> Testing GCP and Vertex AI Connection...")
     try:
         verify_vertex_connection(
-            project_id=creds_info["project"],
+            project_id=project_id,
             location=region,
         )
         console.print(
-            f"> ✓ Successfully verified connection to Vertex AI in project {creds_info['project']}"
+            f"> ✓ Successfully verified connection to Vertex AI in project {project_id}"
         )
     except Exception as e:
         console.print(
             f"> ✗ Failed to connect to Vertex AI: {e!s}\n"
             f"> Please check your authentication settings and permissions. "
-            f"Visit https://cloud.google.com/vertex-ai/docs/authentication for help.", 
-            style="bold red"
+            f"Visit https://cloud.google.com/vertex-ai/docs/authentication for help.",
+            style="bold red",
         )
-    
-    return creds_info
 
 
 def replace_region_in_files(

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

@@ -12,14 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import google.auth
 import os
 
 from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
 from langchain_google_vertexai import ChatVertexAI
 
+# Get default project from credentials
+_, project_id = google.auth.default()
+
 llm = ChatVertexAI(
     model_name="gemini-2.0-flash-001",
     temperature=0,
+    project=project_id,
     location=os.getenv("LOCATION", "us-central1"),
 )