Skip to content

Commit c395077

Browse files
authored
Merge branch 'main' into feat/add-metadata-parameter
2 parents 88bb0ca + 1de65cf commit c395077

38 files changed

+5564
-4468
lines changed

contributing/samples/hello_world_stream_fc_args/agent.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ def concat_number_and_string(num: int, s: str) -> str:
2929
return str(num) + ': ' + s
3030

3131

32+
def write_document(document: str) -> dict[str, str]:
33+
"""Write a document."""
34+
return {'status': 'ok'}
35+
36+
3237
root_agent = Agent(
3338
model='gemini-3-pro-preview',
3439
name='hello_world_stream_fc_args',
@@ -38,9 +43,14 @@ def concat_number_and_string(num: int, s: str) -> str:
3843
You can use the `concat_number_and_string` tool to concatenate a number and a string.
3944
You should always call the concat_number_and_string tool to concatenate a number and a string.
4045
You should never concatenate on your own.
46+
47+
You can use the `write_document` tool to write a document.
48+
You should always call the write_document tool to write a document.
49+
You should never write a document on your own.
4150
""",
4251
tools=[
4352
concat_number_and_string,
53+
write_document,
4454
],
4555
generate_content_config=types.GenerateContentConfig(
4656
automatic_function_calling=types.AutomaticFunctionCallingConfig(

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
"click>=8.1.8, <9.0.0", # For CLI tools
3333
"fastapi>=0.124.1, <1.0.0", # FastAPI framework
3434
"google-api-python-client>=2.157.0, <3.0.0", # Google API client discovery
35-
"google-auth>=2.47.0", # Google Auth library
35+
"google-auth[pyopenssl]>=2.47.0", # Google Auth library
3636
"google-cloud-aiplatform[agent_engines]>=1.132.0, <2.0.0", # For VertexAI integrations, e.g. example store.
3737
"google-cloud-bigquery-storage>=2.0.0",
3838
"google-cloud-bigquery>=2.2.0",
@@ -48,13 +48,13 @@ dependencies = [
4848
"httpx>=0.27.0, <1.0.0", # HTTP client library
4949
"jsonschema>=4.23.0, <5.0.0", # Agent Builder config validation
5050
"mcp>=1.23.0, <2.0.0", # For MCP Toolset
51-
"opentelemetry-api>=1.37.0, <=1.37.0", # OpenTelemetry - limit upper version for sdk and api to not risk breaking changes from unstable _logs package.
51+
"opentelemetry-api>=1.36.0, <1.40.0", # OpenTelemetry - keep below 1.40.0 to reduce risk of breaking changes around log-signal APIs.
5252
"opentelemetry-exporter-gcp-logging>=1.9.0a0, <2.0.0",
5353
"opentelemetry-exporter-gcp-monitoring>=1.9.0a0, <2.0.0",
5454
"opentelemetry-exporter-gcp-trace>=1.9.0, <2.0.0",
5555
"opentelemetry-exporter-otlp-proto-http>=1.36.0",
5656
"opentelemetry-resourcedetector-gcp>=1.9.0a0, <2.0.0",
57-
"opentelemetry-sdk>=1.37.0, <=1.37.0",
57+
"opentelemetry-sdk>=1.36.0, <1.40.0",
5858
"pyarrow>=14.0.0",
5959
"pydantic>=2.0, <3.0.0", # For data validation/models
6060
"python-dateutil>=2.9.0.post0, <3.0.0", # For Vertext AI Session Service

src/google/adk/cli/browser/chunk-2WH2EVR6.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/google/adk/cli/browser/chunk-4MSGFQCD.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/adk/cli/browser/chunk-7MR4QDTO.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/adk/cli/browser/chunk-A6XEKK5I.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/adk/cli/browser/chunk-AK5ESGDJ.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/adk/cli/browser/chunk-BWFUMX67.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/adk/cli/browser/chunk-BX7YU7E6.js

Lines changed: 439 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/adk/cli/browser/chunk-CHLIPOEM.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)