Update cloud run scripts

Author: yuantian-agentspace

samples/agent/adk/gemini_enterprise/cloud_run/agent.py

@@ -25,26 +25,13 @@
     Part,
     TextPart,
 )
-<<<<<<< HEAD
-from a2ui.a2a import (
-    get_a2ui_agent_extension,
-    parse_response_to_parts,
-)
-from a2ui.basic_catalog.provider import BasicCatalog
-from a2ui.core.parser.parser import parse_response
-from a2ui.core.schema.common_modifiers import remove_strict_validation
-from a2ui.core.schema.constants import A2UI_CLOSE_TAG, A2UI_OPEN_TAG, VERSION_0_8
-from a2ui.core.schema.manager import A2uiSchemaManager
-=======
 from a2ui.a2a.extension import get_a2ui_agent_extension
 from a2ui.a2a.parts import parse_response_to_parts
 from a2ui.basic_catalog.provider import BasicCatalog
 from a2ui.parser.parser import parse_response
 from a2ui.schema.common_modifiers import remove_strict_validation
 from a2ui.schema.constants import A2UI_CLOSE_TAG, A2UI_OPEN_TAG, VERSION_0_8
 from a2ui.schema.manager import A2uiSchemaManager
-
->>>>>>> main
 import dotenv
 from google.adk.agents import run_config
 from google.adk.agents.llm_agent import LlmAgent
@@ -71,7 +58,9 @@ def __init__(self, base_url: str):
     self.base_url = base_url
     self._agent_name = "contact_agent"
     self._user_id = "remote_agent"
-    self._text_runner: Optional[Runner] = self._build_runner(self._build_llm_agent())
+    self._text_runner: Optional[Runner] = self._build_runner(
+        self._build_llm_agent()
+    )
 
     self._schema_managers: Dict[str, A2uiSchemaManager] = {}
     self._ui_runners: Dict[str, Runner] = {}
@@ -137,7 +126,8 @@ def _build_agent_card(self) -> AgentCard:
     return AgentCard(
         name="Contact Lookup Agent",
         description=(
-            "This agent helps find contact info for people in your organization."
+            "This agent helps find contact info for people in your"
+            " organization."
         ),
         url=self.base_url,
         version="1.0.0",
@@ -225,7 +215,9 @@ async def fetch_response(
     current_query_text = query
 
     # Ensure catalog schema was loaded
-    if ui_version and (not selected_catalog or not selected_catalog.catalog_schema):
+    if ui_version and (
+        not selected_catalog or not selected_catalog.catalog_schema
+    ):
       logger.error(
           "--- ContactAgent.fetch_response: A2UI_SCHEMA is not loaded. "
           "Cannot perform UI validation. ---"
@@ -261,8 +253,14 @@ async def fetch_response(
           new_message=current_message,
       ):
         if event.is_final_response():
-          if event.content and event.content.parts and event.content.parts[0].text:
-            full_content_list.extend([p.text for p in event.content.parts if p.text])
+          if (
+              event.content
+              and event.content.parts
+              and event.content.parts[0].text
+          ):
+            full_content_list.extend(
+                [p.text for p in event.content.parts if p.text]
+            )
 
       final_response_content = "".join(full_content_list)
 
@@ -282,7 +280,8 @@ async def fetch_response(
           logger.info("Retries exhausted on no-response")
           # Retries exhausted on no-response
           final_response_content = (
-              "I'm sorry, I encountered an error and couldn't process your request."
+              "I'm sorry, I encountered an error and couldn't process your"
+              " request."
           )
           # Fall through to send this as a text-only error
 
@@ -341,7 +340,8 @@ async def fetch_response(
               f" (Attempt {attempt}) ---"
           )
           logger.warning(
-              f"--- Failed response content: {final_response_content[:500]}... ---"
+              "--- Failed response content:"
+              f" {final_response_content[:500]}... ---"
           )
           error_message = f"Validation failed: {e}."
 

samples/agent/adk/gemini_enterprise/cloud_run/agent_executor.py

@@ -30,11 +30,7 @@
     new_task,
 )
 from a2a.utils.errors import ServerError
-<<<<<<< HEAD
 from a2ui.a2a import try_activate_a2ui_extension
-=======
-from a2ui.a2a.extension import try_activate_a2ui_extension
->>>>>>> main
 from agent import ContactAgent
 
 logger = logging.getLogger(__name__)
@@ -55,8 +51,12 @@ async def execute(
     ui_event_part = None
     action = None
 
-    logger.info(f"--- Client requested extensions: {context.requested_extensions} ---")
-    active_ui_version = try_activate_a2ui_extension(context, self._agent.agent_card)
+    logger.info(
+        f"--- Client requested extensions: {context.requested_extensions} ---"
+    )
+    active_ui_version = try_activate_a2ui_extension(
+        context, self._agent.agent_card
+    )
 
     if active_ui_version:
       logger.info(
@@ -65,7 +65,8 @@ async def execute(
       )
     else:
       logger.info(
-          "--- AGENT_EXECUTOR: A2UI extension is not active. Using text runner. ---"
+          "--- AGENT_EXECUTOR: A2UI extension is not active. Using text"
+          " runner. ---"
       )
 
     if context.message and context.message.parts:

samples/agent/adk/gemini_enterprise/cloud_run/prompt_builder.py

@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
 from a2ui.core.schema.constants import A2UI_CLOSE_TAG, A2UI_OPEN_TAG
-=======
-from a2ui.schema.constants import A2UI_CLOSE_TAG, A2UI_OPEN_TAG
->>>>>>> main
 
 ROLE_DESCRIPTION = (
     "You are a helpful contact lookup assistant. Your final output MUST always"

samples/agent/adk/gemini_enterprise/cloud_run/pyproject.toml

@@ -26,11 +26,7 @@ dependencies = [
     "uvicorn",
     "google-cloud-aiplatform>=1.84",
     "jsonschema>=4.0.0",
-<<<<<<< HEAD
-    "a2ui-agent-sdk>=0.1.1",
-=======
-    "a2ui-agent-sdk",
->>>>>>> main
+    "a2ui-agent-sdk>=0.1.2",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -49,9 +45,3 @@ default = true
 
 [project.scripts]
 start = "main:serve"
-<<<<<<< HEAD
-=======
-
-[tool.uv.sources]
-a2ui-agent-sdk = { path = "../../../../agent_sdks/python", editable = true }
->>>>>>> main

samples/agent/adk/gemini_enterprise/cloud_run/tools.py

@@ -46,13 +46,17 @@ def get_contact_info(name: str = None, department: str = "") -> str:
 
     # Filter by name
     results = [
-        contact for contact in all_contacts if name_lower in contact["name"].lower()
+        contact
+        for contact in all_contacts
+        if name_lower in contact["name"].lower()
     ]
 
     # If department is provided, filter results further
     if dept_lower:
       results = [
-          contact for contact in results if dept_lower in contact["department"].lower()
+          contact
+          for contact in results
+          if dept_lower in contact["department"].lower()
       ]
 
     logger.info(f"  - Success: Found {len(results)} matching contacts.")