From 1e752b1378c72577072dac1e5d4e8bbe33369dbf Mon Sep 17 00:00:00 2001 From: Wei Sun Date: Mon, 21 Apr 2025 10:41:57 -0700 Subject: [PATCH] chore: Fixes type hints in google_api_tool_set.py. PiperOrigin-RevId: 749844560 --- README.md | 3 --- .../google_api_tool/google_api_tool_set.py | 21 +++++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ab8e72b..dbad6a7 100644 --- a/README.md +++ b/README.md @@ -112,9 +112,6 @@ adk eval \ samples_for_testing/hello_world/hello_world_eval_set_001.evalset.json ``` -## 🤖 A2A and ADK integration - -For remote agent-to-agent communication, ADK integrates with the [A2A protocol](https://github.com/google/A2A/). See this [example](https://github.com/google/A2A/tree/main/samples/python/agents/google_adk) for how they can work together. ## 🤝 Contributing diff --git a/src/google/adk/tools/google_api_tool/google_api_tool_set.py b/src/google/adk/tools/google_api_tool/google_api_tool_set.py index 53201ba..5409593 100644 --- a/src/google/adk/tools/google_api_tool/google_api_tool_set.py +++ b/src/google/adk/tools/google_api_tool/google_api_tool_set.py @@ -11,10 +11,12 @@ # 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. + +from __future__ import annotations + import inspect import os from typing import Any -from typing import Dict from typing import Final from typing import List from typing import Optional @@ -28,6 +30,7 @@ from .googleapi_to_openapi_converter import GoogleApiToOpenApiConverter class GoogleApiToolSet: + """Google API Tool Set.""" def __init__(self, tools: List[RestApiTool]): self.tools: Final[List[GoogleApiTool]] = [ @@ -45,10 +48,10 @@ class GoogleApiToolSet: @staticmethod def _load_tool_set_with_oidc_auth( - spec_file: str = None, - spec_dict: Dict[str, Any] = None, - scopes: list[str] = None, - ) -> Optional[OpenAPIToolset]: + spec_file: Optional[str] = None, + spec_dict: Optional[dict[str, Any]] = None, + scopes: Optional[list[str]] = None, + ) -> OpenAPIToolset: spec_str = None if spec_file: # Get the frame of the caller @@ -90,18 +93,18 @@ class GoogleApiToolSet: @classmethod def load_tool_set( - cl: Type['GoogleApiToolSet'], + cls: Type[GoogleApiToolSet], api_name: str, api_version: str, - ) -> 'GoogleApiToolSet': + ) -> GoogleApiToolSet: spec_dict = GoogleApiToOpenApiConverter(api_name, api_version).convert() scope = list( spec_dict['components']['securitySchemes']['oauth2']['flows'][ 'authorizationCode' ]['scopes'].keys() )[0] - return cl( - cl._load_tool_set_with_oidc_auth( + return cls( + cls._load_tool_set_with_oidc_auth( spec_dict=spec_dict, scopes=[scope] ).get_tools() )