From 433c423d35f58737209fa2f4870ec2ee9c2196f4 Mon Sep 17 00:00:00 2001 From: Liang Wu Date: Tue, 3 Jun 2025 17:20:16 -0700 Subject: [PATCH] chore: include contributing/ folder in autoformat.sh Also formatted the files in that folder in this same commit. PiperOrigin-RevId: 766885306 --- autoformat.sh | 13 +++++++++++++ contributing/samples/artifact_save_text/agent.py | 15 ++++++--------- contributing/samples/bigquery/agent.py | 1 - contributing/samples/generate_image/agent.py | 5 ++--- contributing/samples/google_search_agent/agent.py | 3 +-- contributing/samples/hello_world/agent.py | 1 + contributing/samples/human_in_loop/main.py | 10 ++++------ contributing/samples/jira_agent/agent.py | 4 ++-- contributing/samples/jira_agent/tools.py | 3 +-- .../samples/mcp_sse_agent/filesystem_server.py | 1 + .../mcp_streamablehttp_agent/filesystem_server.py | 1 + contributing/samples/telemetry/agent.py | 1 + contributing/samples/telemetry/main.py | 2 +- 13 files changed, 34 insertions(+), 26 deletions(-) diff --git a/autoformat.sh b/autoformat.sh index 0c9a1c7..2e439a8 100755 --- a/autoformat.sh +++ b/autoformat.sh @@ -41,6 +41,13 @@ echo '---------------------------------------' isort tests/ echo 'All done! ✨ 🍰 ✨' +echo '---------------------------------------' +echo '| Organizing imports for contributing/...' +echo '---------------------------------------' + +isort contributing/ +echo 'All done! ✨ 🍰 ✨' + echo '---------------------------------------' echo '| Auto-formatting src/...' echo '---------------------------------------' @@ -52,3 +59,9 @@ echo '| Auto-formatting tests/...' echo '---------------------------------------' find -L tests/ -type f -name "*.py" -exec pyink --config pyproject.toml {} + + +echo '---------------------------------------' +echo '| Auto-formatting contributing/...' +echo '---------------------------------------' + +find -L contributing/ -type f -name "*.py" -exec pyink --config pyproject.toml {} + diff --git a/contributing/samples/artifact_save_text/agent.py b/contributing/samples/artifact_save_text/agent.py index e8f05ff..53a7f30 100755 --- a/contributing/samples/artifact_save_text/agent.py +++ b/contributing/samples/artifact_save_text/agent.py @@ -19,15 +19,12 @@ from google.genai import types async def log_query(tool_context: ToolContext, query: str): - """Saves the provided query string as a 'text/plain' artifact named 'query'.""" - query_bytes = query.encode('utf-8') - artifact_part = types.Part( - inline_data=types.Blob( - mime_type='text/plain', - data=query_bytes - ) - ) - await tool_context.save_artifact('query', artifact_part) + """Saves the provided query string as a 'text/plain' artifact named 'query'.""" + query_bytes = query.encode('utf-8') + artifact_part = types.Part( + inline_data=types.Blob(mime_type='text/plain', data=query_bytes) + ) + await tool_context.save_artifact('query', artifact_part) root_agent = Agent( diff --git a/contributing/samples/bigquery/agent.py b/contributing/samples/bigquery/agent.py index c866ef6..39663e0 100644 --- a/contributing/samples/bigquery/agent.py +++ b/contributing/samples/bigquery/agent.py @@ -19,7 +19,6 @@ from google.adk.tools.bigquery import BigQueryCredentialsConfig from google.adk.tools.bigquery import BigQueryToolset import google.auth - RUN_WITH_ADC = False diff --git a/contributing/samples/generate_image/agent.py b/contributing/samples/generate_image/agent.py index d501fb2..1d0fa6b 100644 --- a/contributing/samples/generate_image/agent.py +++ b/contributing/samples/generate_image/agent.py @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -from google.genai import Client -from google.genai import types - from google.adk import Agent from google.adk.tools import load_artifacts from google.adk.tools import ToolContext +from google.genai import Client +from google.genai import types # Only Vertex AI supports image generation for now. client = Client() diff --git a/contributing/samples/google_search_agent/agent.py b/contributing/samples/google_search_agent/agent.py index 9ec1c88..4056f1e 100644 --- a/contributing/samples/google_search_agent/agent.py +++ b/contributing/samples/google_search_agent/agent.py @@ -12,10 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from google.genai import Client - from google.adk import Agent from google.adk.tools import google_search +from google.genai import Client # Only Vertex AI supports image generation for now. client = Client() diff --git a/contributing/samples/hello_world/agent.py b/contributing/samples/hello_world/agent.py index b7b8ce1..6249730 100755 --- a/contributing/samples/hello_world/agent.py +++ b/contributing/samples/hello_world/agent.py @@ -65,6 +65,7 @@ async def check_prime(nums: list[int]) -> str: else f"{', '.join(str(num) for num in primes)} are prime numbers." ) + root_agent = Agent( model='gemini-2.0-flash', name='data_processing_agent', diff --git a/contributing/samples/human_in_loop/main.py b/contributing/samples/human_in_loop/main.py index 6beb9c8..f3f542f 100644 --- a/contributing/samples/human_in_loop/main.py +++ b/contributing/samples/human_in_loop/main.py @@ -13,25 +13,23 @@ # limitations under the License. import asyncio +import os +from typing import Any +from typing import Union import agent from dotenv import load_dotenv -from typing import Any -from typing import Union from google.adk.agents import Agent from google.adk.events import Event from google.adk.runners import Runner -from google.adk.tools import LongRunningFunctionTool from google.adk.sessions import InMemorySessionService +from google.adk.tools import LongRunningFunctionTool from google.genai import types - -import os from opentelemetry import trace from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter from opentelemetry.sdk.trace import export from opentelemetry.sdk.trace import TracerProvider - load_dotenv(override=True) APP_NAME = "human_in_the_loop" diff --git a/contributing/samples/jira_agent/agent.py b/contributing/samples/jira_agent/agent.py index c985333..12dc266 100644 --- a/contributing/samples/jira_agent/agent.py +++ b/contributing/samples/jira_agent/agent.py @@ -13,12 +13,13 @@ # limitations under the License. from google.adk.agents import Agent + from .tools import jira_tool root_agent = Agent( model='gemini-2.0-flash-001', name='jira_connector_agent', - description="This agent helps search issues in JIRA", + description='This agent helps search issues in JIRA', instruction=""" To start with, greet the user First, you will be given a description of what you can do. @@ -49,5 +50,4 @@ root_agent = Agent( - I currently support only **GET** and **LIST** operations. """, tools=jira_tool.get_tools(), - ) diff --git a/contributing/samples/jira_agent/tools.py b/contributing/samples/jira_agent/tools.py index 38c8eed..f03c5ed 100644 --- a/contributing/samples/jira_agent/tools.py +++ b/contributing/samples/jira_agent/tools.py @@ -17,7 +17,7 @@ from google.adk.tools.application_integration_tool.application_integration_tools jira_tool = ApplicationIntegrationToolset( project="your-gcp-project-id", # replace with your GCP project ID location="your-regions", # replace your regions - connection="your-integration-connection-name", #replace with your connection name + connection="your-integration-connection-name", # replace with your connection name entity_operations={ "Issues": ["GET", "LIST"], }, @@ -30,5 +30,4 @@ jira_tool = ApplicationIntegrationToolset( This tool is to call an integration to search for issues in JIRA """, - ) diff --git a/contributing/samples/mcp_sse_agent/filesystem_server.py b/contributing/samples/mcp_sse_agent/filesystem_server.py index 9a04f97..cda4f0a 100644 --- a/contributing/samples/mcp_sse_agent/filesystem_server.py +++ b/contributing/samples/mcp_sse_agent/filesystem_server.py @@ -16,6 +16,7 @@ import asyncio import os from pathlib import Path import sys + from mcp.server.fastmcp import FastMCP # Create an MCP server with a name diff --git a/contributing/samples/mcp_streamablehttp_agent/filesystem_server.py b/contributing/samples/mcp_streamablehttp_agent/filesystem_server.py index 51f8482..9e822f2 100644 --- a/contributing/samples/mcp_streamablehttp_agent/filesystem_server.py +++ b/contributing/samples/mcp_streamablehttp_agent/filesystem_server.py @@ -16,6 +16,7 @@ import asyncio import os from pathlib import Path import sys + from mcp.server.fastmcp import FastMCP # Create an MCP server with a name diff --git a/contributing/samples/telemetry/agent.py b/contributing/samples/telemetry/agent.py index b7b8ce1..6249730 100755 --- a/contributing/samples/telemetry/agent.py +++ b/contributing/samples/telemetry/agent.py @@ -65,6 +65,7 @@ async def check_prime(nums: list[int]) -> str: else f"{', '.join(str(num) for num in primes)} are prime numbers." ) + root_agent = Agent( model='gemini-2.0-flash', name='data_processing_agent', diff --git a/contributing/samples/telemetry/main.py b/contributing/samples/telemetry/main.py index 060096b..de08c82 100755 --- a/contributing/samples/telemetry/main.py +++ b/contributing/samples/telemetry/main.py @@ -27,9 +27,9 @@ from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter from opentelemetry.sdk.trace import export from opentelemetry.sdk.trace import TracerProvider - load_dotenv(override=True) + async def main(): app_name = 'my_app' user_id_1 = 'user1'