google-adk 0.4.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

google/adk/tools/openapi_tool/openapi_spec_parser/operation_parser.py

@@ -17,9 +17,13 @@ from textwrap import dedent
 from typing import Any, Dict, List, Optional, Union
 
 from fastapi.encoders import jsonable_encoder
-from fastapi.openapi.models import Operation, Parameter, Schema
+from fastapi.openapi.models import Operation
+from fastapi.openapi.models import Parameter
+from fastapi.openapi.models import Schema
 
-from ..common.common import ApiParameter, PydocHelper, to_snake_case
+from ..common.common import ApiParameter
+from ..common.common import PydocHelper
+from ..common.common import to_snake_case
 
 
 class OperationParser:
@@ -41,14 +45,14 @@ class OperationParser:
         should_parse: Whether to parse the operation during initialization.
     """
     if isinstance(operation, dict):
-      self.operation = Operation.model_validate(operation)
+      self._operation = Operation.model_validate(operation)
     elif isinstance(operation, str):
-      self.operation = Operation.model_validate_json(operation)
+      self._operation = Operation.model_validate_json(operation)
     else:
-      self.operation = operation
+      self._operation = operation
 
-    self.params: List[ApiParameter] = []
-    self.return_value: Optional[ApiParameter] = None
+    self._params: List[ApiParameter] = []
+    self._return_value: Optional[ApiParameter] = None
     if should_parse:
       self._process_operation_parameters()
       self._process_request_body()
@@ -63,32 +67,38 @@ class OperationParser:
       return_value: Optional[ApiParameter] = None,
   ) -> 'OperationParser':
     parser = cls(operation, should_parse=False)
-    parser.params = params
-    parser.return_value = return_value
+    parser._params = params
+    parser._return_value = return_value
     return parser
 
   def _process_operation_parameters(self):
     """Processes parameters from the OpenAPI operation."""
-    parameters = self.operation.parameters or []
+    parameters = self._operation.parameters or []
     for param in parameters:
       if isinstance(param, Parameter):
         original_name = param.name
         description = param.description or ''
         location = param.in_ or ''
         schema = param.schema_ or {}  # Use schema_ instead of .schema
+        schema.description = (
+            description if not schema.description else schema.description
+        )
+        # param.required can be None
+        required = param.required if param.required is not None else False
 
-        self.params.append(
+        self._params.append(
             ApiParameter(
                 original_name=original_name,
                 param_location=location,
                 param_schema=schema,
                 description=description,
+                required=required,
             )
         )
 
   def _process_request_body(self):
     """Processes the request body from the OpenAPI operation."""
-    request_body = self.operation.requestBody
+    request_body = self._operation.requestBody
     if not request_body:
       return
 
@@ -104,7 +114,7 @@ class OperationParser:
       if schema and schema.type == 'object':
         properties = schema.properties or {}
         for prop_name, prop_details in properties.items():
-          self.params.append(
+          self._params.append(
               ApiParameter(
                   original_name=prop_name,
                   param_location='body',
@@ -114,7 +124,7 @@ class OperationParser:
           )
 
       elif schema and schema.type == 'array':
-        self.params.append(
+        self._params.append(
             ApiParameter(
                 original_name='array',
                 param_location='body',
@@ -123,7 +133,7 @@ class OperationParser:
             )
         )
       else:
-        self.params.append(
+        self._params.append(
             # Empty name for unnamed body param
             ApiParameter(
                 original_name='',
@@ -137,7 +147,7 @@ class OperationParser:
   def _dedupe_param_names(self):
     """Deduplicates parameter names to avoid conflicts."""
     params_cnt = {}
-    for param in self.params:
+    for param in self._params:
       name = param.py_name
       if name not in params_cnt:
         params_cnt[name] = 0
@@ -147,7 +157,7 @@ class OperationParser:
 
   def _process_return_value(self) -> Parameter:
     """Returns a Parameter object representing the return type."""
-    responses = self.operation.responses or {}
+    responses = self._operation.responses or {}
     # Default to Any if no 2xx response or if schema is missing
     return_schema = Schema(type='Any')
 
@@ -164,7 +174,7 @@ class OperationParser:
           return_schema = content[mime_type].schema_
           break
 
-    self.return_value = ApiParameter(
+    self._return_value = ApiParameter(
         original_name='',
         param_location='',
         param_schema=return_schema,
@@ -172,42 +182,42 @@ class OperationParser:
 
   def get_function_name(self) -> str:
     """Returns the generated function name."""
-    operation_id = self.operation.operationId
+    operation_id = self._operation.operationId
     if not operation_id:
       raise ValueError('Operation ID is missing')
     return to_snake_case(operation_id)[:60]
 
   def get_return_type_hint(self) -> str:
     """Returns the return type hint string (like 'str', 'int', etc.)."""
-    return self.return_value.type_hint
+    return self._return_value.type_hint
 
   def get_return_type_value(self) -> Any:
     """Returns the return type value (like str, int, List[str], etc.)."""
-    return self.return_value.type_value
+    return self._return_value.type_value
 
   def get_parameters(self) -> List[ApiParameter]:
     """Returns the list of Parameter objects."""
-    return self.params
+    return self._params
 
   def get_return_value(self) -> ApiParameter:
     """Returns the list of Parameter objects."""
-    return self.return_value
+    return self._return_value
 
   def get_auth_scheme_name(self) -> str:
     """Returns the name of the auth scheme for this operation from the spec."""
-    if self.operation.security:
-      scheme_name = list(self.operation.security[0].keys())[0]
+    if self._operation.security:
+      scheme_name = list(self._operation.security[0].keys())[0]
       return scheme_name
     return ''
 
   def get_pydoc_string(self) -> str:
     """Returns the generated PyDoc string."""
-    pydoc_params = [param.to_pydoc_string() for param in self.params]
+    pydoc_params = [param.to_pydoc_string() for param in self._params]
     pydoc_description = (
-        self.operation.summary or self.operation.description or ''
+        self._operation.summary or self._operation.description or ''
     )
     pydoc_return = PydocHelper.generate_return_doc(
-        self.operation.responses or {}
+        self._operation.responses or {}
     )
     pydoc_arg_list = chr(10).join(
         f'        {param_doc}' for param_doc in pydoc_params
@@ -226,12 +236,12 @@ class OperationParser:
     """Returns the JSON schema for the function arguments."""
     properties = {
         p.py_name: jsonable_encoder(p.param_schema, exclude_none=True)
-        for p in self.params
+        for p in self._params
     }
     return {
         'properties': properties,
-        'required': [p.py_name for p in self.params],
-        'title': f"{self.operation.operationId or 'unnamed'}_Arguments",
+        'required': [p.py_name for p in self._params if p.required],
+        'title': f"{self._operation.operationId or 'unnamed'}_Arguments",
         'type': 'object',
     }
 
@@ -243,11 +253,11 @@ class OperationParser:
             inspect.Parameter.POSITIONAL_OR_KEYWORD,
             annotation=param.type_value,
         )
-        for param in self.params
+        for param in self._params
     ]
 
   def get_annotations(self) -> Dict[str, Any]:
     """Returns a dictionary of parameter annotations for the function."""
-    annotations = {p.py_name: p.type_value for p in self.params}
+    annotations = {p.py_name: p.type_value for p in self._params}
     annotations['return'] = self.get_return_type_value()
     return annotations

google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py

@@ -30,7 +30,7 @@ from ..auth.credential_exchangers.auto_auth_credential_exchanger import AutoAuth
 from ..auth.credential_exchangers.base_credential_exchanger import AuthCredentialMissingError
 from ..auth.credential_exchangers.base_credential_exchanger import BaseAuthCredentialExchanger
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 AuthPreparationState = Literal["pending", "done"]
 

google/adk/tools/preload_memory_tool.py

@@ -14,11 +14,11 @@
 
 from __future__ import annotations
 
-from datetime import datetime
 from typing import TYPE_CHECKING
 
 from typing_extensions import override
 
+from . import _memory_entry_utils
 from .base_tool import BaseTool
 from .tool_context import ToolContext
 
@@ -27,7 +27,10 @@ if TYPE_CHECKING:
 
 
 class PreloadMemoryTool(BaseTool):
-  """A tool that preloads the memory for the current user."""
+  """A tool that preloads the memory for the current user.
+
+  NOTE: Currently this tool only uses text part from the memory.
+  """
 
   def __init__(self):
     # Name and description are not used because this tool only
@@ -41,29 +44,35 @@ class PreloadMemoryTool(BaseTool):
       tool_context: ToolContext,
       llm_request: LlmRequest,
   ) -> None:
-    parts = tool_context.user_content.parts
-    if not parts or not parts[0].text:
+    user_content = tool_context.user_content
+    if (
+        not user_content
+        or not user_content.parts
+        or not user_content.parts[0].text
+    ):
       return
-    query = parts[0].text
-    response = tool_context.search_memory(query)
+
+    user_query: str = user_content.parts[0].text
+    response = await tool_context.search_memory(user_query)
     if not response.memories:
       return
-    memory_text = ''
+
+    memory_text_lines = []
     for memory in response.memories:
-      time_str = datetime.fromtimestamp(memory.events[0].timestamp).isoformat()
-      memory_text += f'Time: {time_str}\n'
-      for event in memory.events:
-        # TODO: support multi-part content.
-        if (
-            event.content
-            and event.content.parts
-            and event.content.parts[0].text
-        ):
-          memory_text += f'{event.author}: {event.content.parts[0].text}\n'
+      if time_str := (f'Time: {memory.timestamp}' if memory.timestamp else ''):
+        memory_text_lines.append(time_str)
+      if memory_text := _memory_entry_utils.extract_text(memory):
+        memory_text_lines.append(
+            f'{memory.author}: {memory_text}' if memory.author else memory_text
+        )
+    if not memory_text_lines:
+      return
+
+    full_memory_text = '\n'.join(memory_text_lines)
     si = f"""The following content is from your previous conversations with the user.
 They may be useful for answering the user's current query.
 <PAST_CONVERSATIONS>
-{memory_text}
+{full_memory_text}
 </PAST_CONVERSATIONS>
 """
     llm_request.append_instructions([si])

google/adk/tools/retrieval/__init__.py

@@ -29,7 +29,7 @@ try:
 except ImportError:
   import logging
 
-  logger = logging.getLogger(__name__)
+  logger = logging.getLogger('google_adk.' + __name__)
   logger.debug(
       'The Vertex sdk is not installed. If you want to use the Vertex RAG with'
       ' agents, please install it. If not, you can ignore this warning.'

google/adk/tools/retrieval/vertex_ai_rag_retrieval.py

@@ -30,7 +30,7 @@ from .base_retrieval_tool import BaseRetrievalTool
 if TYPE_CHECKING:
   from ...models.llm_request import LlmRequest
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class VertexAiRagRetrieval(BaseRetrievalTool):

google/adk/tools/tool_context.py

@@ -69,21 +69,21 @@ class ToolContext(CallbackContext):
   def get_auth_response(self, auth_config: AuthConfig) -> AuthCredential:
     return AuthHandler(auth_config).get_auth_response(self.state)
 
-  def list_artifacts(self) -> list[str]:
+  async def list_artifacts(self) -> list[str]:
     """Lists the filenames of the artifacts attached to the current session."""
     if self._invocation_context.artifact_service is None:
       raise ValueError('Artifact service is not initialized.')
-    return self._invocation_context.artifact_service.list_artifact_keys(
+    return await self._invocation_context.artifact_service.list_artifact_keys(
         app_name=self._invocation_context.app_name,
         user_id=self._invocation_context.user_id,
         session_id=self._invocation_context.session.id,
     )
 
-  def search_memory(self, query: str) -> 'SearchMemoryResponse':
+  async def search_memory(self, query: str) -> SearchMemoryResponse:
     """Searches the memory of the current user."""
     if self._invocation_context.memory_service is None:
       raise ValueError('Memory service is not available.')
-    return self._invocation_context.memory_service.search_memory(
+    return await self._invocation_context.memory_service.search_memory(
         app_name=self._invocation_context.app_name,
         user_id=self._invocation_context.user_id,
         query=query,

google/adk/tools/toolbox_toolset.py

@@ -0,0 +1,79 @@
+# 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.
+
+from typing import List
+from typing import Optional
+
+import toolbox_core as toolbox
+from typing_extensions import override
+
+from ..agents.readonly_context import ReadonlyContext
+from .base_tool import BaseTool
+from .base_toolset import BaseToolset
+from .function_tool import FunctionTool
+
+
+class ToolboxToolset(BaseToolset):
+  """A class that provides access to toolbox toolsets.
+
+  Example:
+  ```python
+  toolbox_toolset = ToolboxToolset("http://127.0.0.1:5000",
+  toolset_name="my-toolset")
+  )
+  ```
+  """
+
+  def __init__(
+      self,
+      server_url: str,
+      toolset_name: Optional[str] = None,
+      tool_names: Optional[List[str]] = None,
+  ):
+    """Args:
+
+      server_url: The URL of the toolbox server.
+      toolset_name: The name of the toolbox toolset to load.
+      tool_names: The names of the tools to load.
+    The resulting ToolboxToolset will contain both tools loaded by tool_names
+    and toolset_name.
+    """
+    if not tool_names and not toolset_name:
+      raise ValueError("tool_names and toolset_name cannot both be None")
+    super().__init__()
+    self._server_url = server_url
+    self._toolbox_client = toolbox.ToolboxSyncClient(server_url)
+    self._toolset_name = toolset_name
+    self._tool_names = tool_names
+
+  @override
+  async def get_tools(
+      self, readonly_context: Optional[ReadonlyContext] = None
+  ) -> list[BaseTool]:
+    tools = []
+    if self._toolset_name:
+      tools.extend([
+          FunctionTool(tool)
+          for tool in self._toolbox_client.load_toolset(self._toolset_name)
+      ])
+    if self._tool_names:
+      tools.extend([
+          FunctionTool(self._toolbox_client.load_tool(tool_name))
+          for tool_name in self._tool_names
+      ])
+    return tools
+
+  @override
+  async def close(self):
+    self._toolbox_client.close()

google/adk/tools/transfer_to_agent_tool.py

@@ -15,7 +15,6 @@
 from .tool_context import ToolContext
 
 
-# TODO: make this internal, since user doesn't need to use this tool directly.
 def transfer_to_agent(agent_name: str, tool_context: ToolContext):
   """Transfer the question to another agent."""
   tool_context.actions.transfer_to_agent = agent_name

google/adk/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 # version: date+base_cl
-__version__ = "0.4.0"
+__version__ = "1.0.0"

{google_adk-0.4.0.dist-info → google_adk-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-adk
-Version: 0.4.0
+Version: 1.0.0
 Summary: Agent Development Kit
 Author-email: Google LLC <googleapis-packages@google.com>
 Requires-Python: >=3.9
@@ -11,10 +11,10 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: Apache Software License
@@ -27,7 +27,7 @@ Requires-Dist: google-cloud-aiplatform>=1.87.0
 Requires-Dist: google-cloud-secret-manager>=2.22.0
 Requires-Dist: google-cloud-speech>=2.30.0
 Requires-Dist: google-cloud-storage>=2.18.0, <3.0.0
-Requires-Dist: google-genai>=1.11.0
+Requires-Dist: google-genai>=1.14.0
 Requires-Dist: graphviz>=0.20.2
 Requires-Dist: mcp>=1.5.0;python_version>='3.10'
 Requires-Dist: opentelemetry-api>=1.31.0
@@ -43,6 +43,7 @@ Requires-Dist: flit>=3.10.0 ; extra == "dev"
 Requires-Dist: isort>=6.0.0 ; extra == "dev"
 Requires-Dist: pyink>=24.10.0 ; extra == "dev"
 Requires-Dist: pylint>=2.6.0 ; extra == "dev"
+Requires-Dist: mypy>=1.15.0 ; extra == "dev"
 Requires-Dist: autodoc_pydantic ; extra == "docs"
 Requires-Dist: furo ; extra == "docs"
 Requires-Dist: myst-parser ; extra == "docs"
@@ -60,6 +61,7 @@ Requires-Dist: langgraph>=0.2.60 ; extra == "extensions"
 Requires-Dist: litellm>=1.63.11 ; extra == "extensions"
 Requires-Dist: llama-index-readers-file>=0.4.0 ; extra == "extensions"
 Requires-Dist: lxml>=5.3.0 ; extra == "extensions"
+Requires-Dist: toolbox-core>=0.1.0 ; extra == "extensions"
 Requires-Dist: anthropic>=0.43.0 ; extra == "test"
 Requires-Dist: langchain-community>=0.3.17 ; extra == "test"
 Requires-Dist: langgraph>=0.2.60 ; extra == "test"