agent-starter-pack 0.1.7__py3-none-any.whl → 0.2.0__py3-none-any.whl

src/resources/setup_cicd/cicd_variables.tf

@@ -34,3 +34,8 @@ variable "connection_exists" {
   default     = false
 }
 
+variable "repository_exists" {
+  description = "Flag indicating if the Git repository already exists"
+  type        = bool
+  default     = false
+}

src/resources/setup_cicd/github.tf

@@ -46,12 +46,13 @@ locals {
 
 # Try to get existing repo
 data "github_repository" "existing_repo" {
+  count = var.repository_exists ? 1 : 0
   full_name = "${var.repository_owner}/${var.repository_name}"
 }
 
 # Only create GitHub repo if it doesn't already exist
 resource "github_repository" "repo" {
-  count       = data.github_repository.existing_repo.repo_id == null ? 1 : 0
+  count       = var.repository_exists ? 0 : 1
   name        = var.repository_name
   description = "Repository created by Terraform"
   visibility  = "private"
@@ -80,6 +81,7 @@ resource "google_cloudbuildv2_repository" "repo" {
     resource.google_project_service.cicd_services,
     resource.google_project_service.shared_services,
     data.github_repository.existing_repo,
-    github_repository.repo
+    github_repository.repo,
+    google_cloudbuildv2_connection.github_connection,
   ]
 }

src/utils/watch_and_rebuild.py

@@ -34,12 +34,14 @@ class TemplateHandler(FileSystemEventHandler):
         deployment_target: str,
         output_dir: str | None,
         region: str,
+        extra_params: str | None = None,
     ):
         self.agent_name = agent_name
         self.project_name = project_name
         self.deployment_target = deployment_target
         self.output_dir = output_dir
         self.region = region
+        self.extra_params = extra_params
         self.last_rebuild = 0
         self.rebuild_cooldown = 1  # Seconds to wait between rebuilds
 
@@ -91,6 +93,13 @@ class TemplateHandler(FileSystemEventHandler):
                 "--region",
                 self.region,
             ]
+            
+            # Add extra parameters if provided
+            if self.extra_params:
+                # Split comma-separated parameters and add them individually
+                for param in self.extra_params.split(','):
+                    cmd.append(param.strip())
+                
             console.print(f"Executing: {' '.join(cmd)}", style="bold blue")
             subprocess.run(cmd, check=True)
 
@@ -115,6 +124,7 @@ class TemplateHandler(FileSystemEventHandler):
 )
 @click.option("--debug", is_flag=True, help="Enable debug logging")
 @click.option("--region", default="us-central1", help="GCP region to use")
+@click.option("--extra-params", help="Additional parameters to pass to the create command")
 def watch(
     agent: str,
     project_name: str,
@@ -122,6 +132,7 @@ def watch(
     output_dir: str | None,
     debug: bool,
     region: str,
+    extra_params: str | None,
 ):
     """
     Watch a agent's template and automatically rebuild when changes are detected.
@@ -155,6 +166,8 @@ def watch(
     console.print(f"agents directory: {agents_dir}")
     console.print(f"Project name: {project_name}")
     console.print(f"Region: {region}")
+    if extra_params:
+        console.print(f"Extra parameters: {extra_params}")
 
     event_handler = TemplateHandler(
         agent_name=agent,
@@ -162,6 +175,7 @@ def watch(
         deployment_target=deployment_target,
         output_dir=output_dir,
         region=region,
+        extra_params=extra_params,
     )
 
     observer = Observer()

agents/agentic_rag_vertexai_search/app/retrievers.py

@@ -1,79 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-from unittest.mock import MagicMock
-
-from langchain_google_community import VertexAISearchRetriever
-from langchain_google_community.vertex_rank import VertexAIRank
-from langchain_google_vertexai import VertexAIEmbeddings
-
-
-def get_retriever(
-    project_id: str,
-    data_store_id: str,
-    data_store_region: str,
-    embedding: VertexAIEmbeddings,
-    embedding_column: str = "embedding",
-    max_documents: int = 10,
-    custom_embedding_ratio: float = 0.5,
-) -> VertexAISearchRetriever:
-    """
-    Creates and returns an instance of the retriever service.
-
-    Uses mock service if the INTEGRATION_TEST environment variable is set to "TRUE",
-    otherwise initializes real Vertex AI retriever.
-    """
-    if os.getenv("INTEGRATION_TEST") == "TRUE":
-        retriever = MagicMock()
-        retriever.invoke = lambda x: []
-        return retriever
-
-    return VertexAISearchRetriever(
-        project_id=project_id,
-        data_store_id=data_store_id,
-        location_id=data_store_region,
-        engine_data_type=1,
-        # The following parameters are used when you want to search
-        # using custom embeddings in Agent Builder.
-        # The ratio is set to 0.5 by default to use a mix of custom
-        # embeddings but you can adapt the ratio as you need.
-        custom_embedding_ratio=custom_embedding_ratio,
-        custom_embedding=embedding,
-        custom_embedding_field_path=embedding_column,
-        # Extracting 20 documents before re-rank.
-        max_documents=max_documents,
-        beta=True,
-    )
-
-
-def get_compressor(project_id: str, top_n: int = 5) -> VertexAIRank:
-    """
-    Creates and returns an instance of the compressor service.
-
-    Uses mock service if the INTEGRATION_TEST environment variable is set to "TRUE",
-    otherwise initializes real Vertex AI compressor.
-    """
-    if os.getenv("INTEGRATION_TEST") == "TRUE":
-        compressor = MagicMock()
-        compressor.compress_documents = lambda documents, query: []
-        return compressor
-
-    return VertexAIRank(
-        project_id=project_id,
-        location_id="global",
-        ranking_config="default_ranking_config",
-        title_field="id",
-        top_n=top_n,
-    )

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

@@ -1,22 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-resource "google_artifact_registry_repository" "repo-artifacts-genai" {
-  location      = var.region
-  repository_id = var.artifact_registry_repo_name
-  description   = "Repo for Generative AI applications"
-  format        = "DOCKER"
-  project       = var.cicd_runner_project_id
-  depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
-}

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

@@ -1,20 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-resource "google_service_account" "cloud_run_app_sa" {
-  account_id   = var.cloud_run_app_sa_name
-  display_name = "Cloud Run Generative AI app SA"
-  project      = var.dev_project_id
-  depends_on   = [resource.google_project_service.services]
-}