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

google/adk/models/google_llm.py

@@ -210,48 +210,6 @@ class Gemini(BaseLlm):
     ) as live_session:
       yield GeminiLlmConnection(live_session)
 
-  def _maybe_append_user_content(self, llm_request: LlmRequest):
-    """Appends a user content, so that model can continue to output.
-
-    Args:
-      llm_request: LlmRequest, the request to send to the Gemini model.
-    """
-    # If no content is provided, append a user content to hint model response
-    # using system instruction.
-    if not llm_request.contents:
-      llm_request.contents.append(
-          types.Content(
-              role='user',
-              parts=[
-                  types.Part(
-                      text=(
-                          'Handle the requests as specified in the System'
-                          ' Instruction.'
-                      )
-                  )
-              ],
-          )
-      )
-      return
-
-    # Insert a user content to preserve user intent and to avoid empty
-    # model response.
-    if llm_request.contents[-1].role != 'user':
-      llm_request.contents.append(
-          types.Content(
-              role='user',
-              parts=[
-                  types.Part(
-                      text=(
-                          'Continue processing previous requests as instructed.'
-                          ' Exit or provide a summary if no more outputs are'
-                          ' needed.'
-                      )
-                  )
-              ],
-          )
-      )
-
 
 def _build_function_declaration_log(
     func_decl: types.FunctionDeclaration,

google/adk/models/lite_llm.py

@@ -172,19 +172,19 @@ def _content_to_message_param(
     tool_calls = []
     content_present = False
     for part in content.parts:
-        if part.function_call:
-            tool_calls.append(
-                ChatCompletionMessageToolCall(
-                    type="function",
-                    id=part.function_call.id,
-                    function=Function(
-                        name=part.function_call.name,
-                        arguments=part.function_call.args,
-                    ),
-                )
+      if part.function_call:
+        tool_calls.append(
+            ChatCompletionMessageToolCall(
+                type="function",
+                id=part.function_call.id,
+                function=Function(
+                    name=part.function_call.name,
+                    arguments=part.function_call.args,
+                ),
             )
-        elif part.text or part.inline_data:
-            content_present = True
+        )
+      elif part.text or part.inline_data:
+        content_present = True
 
     final_content = message_content if content_present else None
 
@@ -453,9 +453,9 @@ def _get_completion_inputs(
   for content in llm_request.contents or []:
     message_param_or_list = _content_to_message_param(content)
     if isinstance(message_param_or_list, list):
-        messages.extend(message_param_or_list)
-    elif message_param_or_list: # Ensure it's not None before appending
-        messages.append(message_param_or_list)
+      messages.extend(message_param_or_list)
+    elif message_param_or_list:  # Ensure it's not None before appending
+      messages.append(message_param_or_list)
 
   if llm_request.config.system_instruction:
     messages.insert(
@@ -573,7 +573,6 @@ class LiteLlm(BaseLlm):
   Attributes:
     model: The name of the LiteLlm model.
     llm_client: The LLM client to use for the model.
-    model_config: The model config.
   """
 
   llm_client: LiteLLMClient = Field(default_factory=LiteLLMClient)
@@ -611,7 +610,8 @@ class LiteLlm(BaseLlm):
       LlmResponse: The model response.
     """
 
-    logger.info(_build_request_log(llm_request))
+    self._maybe_append_user_content(llm_request)
+    logger.debug(_build_request_log(llm_request))
 
     messages, tools = _get_completion_inputs(llm_request)
 

google/adk/models/llm_request.py

@@ -37,7 +37,7 @@ class LlmRequest(BaseModel):
   """
 
   model_config = ConfigDict(arbitrary_types_allowed=True)
-  """The model config."""
+  """The pydantic model config."""
 
   model: Optional[str] = None
   """The model name."""

google/adk/models/llm_response.py

@@ -41,7 +41,7 @@ class LlmResponse(BaseModel):
   """
 
   model_config = ConfigDict(extra='forbid')
-  """The model config."""
+  """The pydantic model config."""
 
   content: Optional[types.Content] = None
   """The content of the response."""

google/adk/runners.py

@@ -186,7 +186,7 @@ class Runner:
       root_agent = self.agent
 
       if new_message:
-        self._append_new_message_to_session(
+        await self._append_new_message_to_session(
             session,
             new_message,
             invocation_context,
@@ -199,7 +199,7 @@ class Runner:
           self.session_service.append_event(session=session, event=event)
         yield event
 
-  def _append_new_message_to_session(
+  async def _append_new_message_to_session(
       self,
       session: Session,
       new_message: types.Content,
@@ -225,7 +225,7 @@ class Runner:
         if part.inline_data is None:
           continue
         file_name = f'artifact_{invocation_context.invocation_id}_{i}'
-        self.artifact_service.save_artifact(
+        await self.artifact_service.save_artifact(
             app_name=self.app_name,
             user_id=session.user_id,
             session_id=session.id,
@@ -297,14 +297,14 @@ class Runner:
       self.session_service.append_event(session=session, event=event)
       yield event
 
-  def close_session(self, session: Session):
+  async def close_session(self, session: Session):
     """Closes a session and adds it to the memory service (experimental feature).
 
     Args:
         session: The session to close.
     """
     if self.memory_service:
-      self.memory_service.add_session_to_memory(session)
+      await self.memory_service.add_session_to_memory(session)
     self.session_service.close_session(session=session)
 
   def _find_agent_to_run(

google/adk/sessions/_session_util.py

@@ -1,3 +1,17 @@
+# 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.
+
 """Utility functions for session service."""
 
 import base64

google/adk/sessions/base_session_service.py

@@ -26,6 +26,7 @@ from .state import State
 
 class GetSessionConfig(BaseModel):
   """The configuration of getting a session."""
+
   num_recent_events: Optional[int] = None
   after_timestamp: Optional[float] = None
 
@@ -35,11 +36,13 @@ class ListSessionsResponse(BaseModel):
 
   The events and states are not set within each Session object.
   """
+
   sessions: list[Session] = Field(default_factory=list)
 
 
 class ListEventsResponse(BaseModel):
   """The response of listing events in a session."""
+
   events: list[Event] = Field(default_factory=list)
   next_page_token: Optional[str] = None
 

google/adk/sessions/database_session_service.py

@@ -219,6 +219,7 @@ class StorageAppState(Base):
       DateTime(), default=func.now(), onupdate=func.now()
   )
 
+
 class StorageUserState(Base):
   """Represents a user state stored in the database."""
 
@@ -483,9 +484,11 @@ class DatabaseSessionService(BaseSessionService):
 
       if storage_session.update_time.timestamp() > session.last_update_time:
         raise ValueError(
-            f"Session last_update_time {session.last_update_time} is later than"
-            f" the upate_time in storage {storage_session.update_time}"
-        )
+          f"Session last_update_time "
+          f"{datetime.fromtimestamp(session.last_update_time):%Y-%m-%d %H:%M:%S} "
+          f"is later than the update_time in storage "
+          f"{storage_session.update_time:%Y-%m-%d %H:%M:%S}"
+      )
 
       # Fetch states from storage
       storage_app_state = sessionFactory.get(
@@ -562,6 +565,7 @@ class DatabaseSessionService(BaseSessionService):
   ) -> ListEventsResponse:
     raise NotImplementedError()
 
+
 def convert_event(event: StorageEvent) -> Event:
   """Converts a storage event to an event."""
   return Event(

google/adk/sessions/in_memory_session_service.py

@@ -95,14 +95,14 @@ class InMemorySessionService(BaseSessionService):
         copied_session.events = copied_session.events[
             -config.num_recent_events :
         ]
-      elif config.after_timestamp:
-        i = len(session.events) - 1
+      if config.after_timestamp:
+        i = len(copied_session.events) - 1
         while i >= 0:
           if copied_session.events[i].timestamp < config.after_timestamp:
             break
           i -= 1
         if i >= 0:
-          copied_session.events = copied_session.events[i:]
+          copied_session.events = copied_session.events[i + 1:]
 
     return self._merge_state(app_name, user_id, copied_session)
 

google/adk/sessions/session.py

@@ -38,6 +38,7 @@ class Session(BaseModel):
       extra='forbid',
       arbitrary_types_allowed=True,
   )
+  """The pydantic model config."""
 
   id: str
   """The unique identifier of the session."""

google/adk/tools/agent_tool.py

@@ -146,18 +146,21 @@ class AgentTool(BaseTool):
 
     if runner.artifact_service:
       # Forward all artifacts to parent session.
-      for artifact_name in runner.artifact_service.list_artifact_keys(
+      artifact_names = await runner.artifact_service.list_artifact_keys(
           app_name=session.app_name,
           user_id=session.user_id,
           session_id=session.id,
-      ):
-        if artifact := runner.artifact_service.load_artifact(
+      )
+      for artifact_name in artifact_names:
+        if artifact := await runner.artifact_service.load_artifact(
             app_name=session.app_name,
             user_id=session.user_id,
             session_id=session.id,
             filename=artifact_name,
         ):
-          tool_context.save_artifact(filename=artifact_name, artifact=artifact)
+          await tool_context.save_artifact(
+              filename=artifact_name, artifact=artifact
+          )
 
     if (
         not last_event

google/adk/tools/application_integration_tool/clients/connections_client.py

@@ -312,9 +312,7 @@ class ConnectionsClient:
                 "content": {
                     "application/json": {
                         "schema": {
-                            "$ref": (
-                                f"#/components/schemas/{action_display_name}_Request"
-                            )
+                            "$ref": f"#/components/schemas/{action_display_name}_Request"
                         }
                     }
                 }
@@ -325,9 +323,7 @@ class ConnectionsClient:
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": (
-                                    f"#/components/schemas/{action_display_name}_Response"
-                                ),
+                                "$ref": f"#/components/schemas/{action_display_name}_Response",
                             }
                         }
                     },
@@ -346,11 +342,9 @@ class ConnectionsClient:
     return {
         "post": {
             "summary": f"List {entity}",
-            "description": (
-                f"""Returns the list of {entity} data. If the page token was available in the response, let users know there are more records available. Ask if the user wants to fetch the next page of results. When passing filter use the
+            "description": f"""Returns the list of {entity} data. If the page token was available in the response, let users know there are more records available. Ask if the user wants to fetch the next page of results. When passing filter use the
                 following format: `field_name1='value1' AND field_name2='value2'
-                `. {tool_instructions}"""
-            ),
+                `. {tool_instructions}""",
             "x-operation": "LIST_ENTITIES",
             "x-entity": f"{entity}",
             "operationId": f"{tool_name}_list_{entity}",
@@ -375,9 +369,7 @@ class ConnectionsClient:
                                     f"Returns a list of {entity} of json"
                                     f" schema: {schema_as_string}"
                                 ),
-                                "$ref": (
-                                    "#/components/schemas/execute-connector_Response"
-                                ),
+                                "$ref": "#/components/schemas/execute-connector_Response",
                             }
                         }
                     },
@@ -421,9 +413,7 @@ class ConnectionsClient:
                                     f"Returns {entity} of json schema:"
                                     f" {schema_as_string}"
                                 ),
-                                "$ref": (
-                                    "#/components/schemas/execute-connector_Response"
-                                ),
+                                "$ref": "#/components/schemas/execute-connector_Response",
                             }
                         }
                     },
@@ -460,9 +450,7 @@ class ConnectionsClient:
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": (
-                                    "#/components/schemas/execute-connector_Response"
-                                )
+                                "$ref": "#/components/schemas/execute-connector_Response"
                             }
                         }
                     },
@@ -499,9 +487,7 @@ class ConnectionsClient:
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": (
-                                    "#/components/schemas/execute-connector_Response"
-                                )
+                                "$ref": "#/components/schemas/execute-connector_Response"
                             }
                         }
                     },
@@ -538,9 +524,7 @@ class ConnectionsClient:
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": (
-                                    "#/components/schemas/execute-connector_Response"
-                                )
+                                "$ref": "#/components/schemas/execute-connector_Response"
                             }
                         }
                     },

google/adk/tools/load_artifacts_tool.py

@@ -69,14 +69,14 @@ class LoadArtifactsTool(BaseTool):
         tool_context=tool_context,
         llm_request=llm_request,
     )
-    self._append_artifacts_to_llm_request(
+    await self._append_artifacts_to_llm_request(
         tool_context=tool_context, llm_request=llm_request
     )
 
-  def _append_artifacts_to_llm_request(
+  async def _append_artifacts_to_llm_request(
       self, *, tool_context: ToolContext, llm_request: LlmRequest
   ):
-    artifact_names = tool_context.list_artifacts()
+    artifact_names = await tool_context.list_artifacts()
     if not artifact_names:
       return
 
@@ -96,7 +96,7 @@ class LoadArtifactsTool(BaseTool):
       if function_response and function_response.name == 'load_artifacts':
         artifact_names = function_response.response['artifact_names']
         for artifact_name in artifact_names:
-          artifact = tool_context.load_artifact(artifact_name)
+          artifact = await tool_context.load_artifact(artifact_name)
           llm_request.contents.append(
               types.Content(
                   role='user',

google/adk/tools/load_memory_tool.py

@@ -27,7 +27,9 @@ if TYPE_CHECKING:
   from ..models import LlmRequest
 
 
-def load_memory(query: str, tool_context: ToolContext) -> 'list[MemoryResult]':
+async def load_memory(
+    query: str, tool_context: ToolContext
+) -> 'list[MemoryResult]':
   """Loads the memory for the current user.
 
   Args:
@@ -36,7 +38,7 @@ def load_memory(query: str, tool_context: ToolContext) -> 'list[MemoryResult]':
   Returns:
     A list of memory results.
   """
-  response = tool_context.search_memory(query)
+  response = await tool_context.search_memory(query)
   return response.memories
 
 

google/adk/tools/mcp_tool/conversion_utils.py

@@ -22,7 +22,7 @@ def adk_to_mcp_tool_type(tool: BaseTool) -> mcp_types.Tool:
   """Convert a Tool in ADK into MCP tool type.
 
   This function transforms an ADK tool definition into its equivalent
-  representation in the MCP (Model Control Plane) system.
+  representation in the MCP (Model Context Protocol) system.
 
   Args:
       tool: The ADK tool to convert. It should be an instance of a class derived

google/adk/tools/mcp_tool/mcp_session_manager.py

@@ -1,3 +1,17 @@
+# 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 contextlib import AsyncExitStack
 import functools
 import sys

google/adk/tools/openapi_tool/common/common.py

@@ -14,11 +14,7 @@
 
 import keyword
 import re
-from typing import Any
-from typing import Dict
-from typing import List
-from typing import Optional
-from typing import Union
+from typing import Any, Dict, List, Optional, Union
 
 from fastapi.openapi.models import Response
 from fastapi.openapi.models import Schema
@@ -100,6 +96,7 @@ class ApiParameter(BaseModel):
   py_name: Optional[str] = ''
   type_value: type[Any] = Field(default=None, init_var=False)
   type_hint: str = Field(default=None, init_var=False)
+  required: bool = False
 
   def model_post_init(self, _: Any):
     self.py_name = (

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:
@@ -76,6 +80,11 @@ class OperationParser:
         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(
             ApiParameter(
@@ -83,6 +92,7 @@ class OperationParser:
                 param_location=location,
                 param_schema=schema,
                 description=description,
+                required=required,
             )
         )
 
@@ -230,7 +240,7 @@ class OperationParser:
     }
     return {
         'properties': properties,
-        'required': [p.py_name for p in self.params],
+        'required': [p.py_name for p in self.params if p.required],
         'title': f"{self.operation.operationId or 'unnamed'}_Arguments",
         'type': 'object',
     }

google/adk/tools/preload_memory_tool.py

@@ -45,7 +45,7 @@ class PreloadMemoryTool(BaseTool):
     if not parts or not parts[0].text:
       return
     query = parts[0].text
-    response = tool_context.search_memory(query)
+    response = await tool_context.search_memory(query)
     if not response.memories:
       return
     memory_text = ''

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/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-adk
-Version: 0.4.0
+Version: 0.5.0
 Summary: Agent Development Kit
 Author-email: Google LLC <googleapis-packages@google.com>
 Requires-Python: >=3.9
@@ -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.12.1
 Requires-Dist: graphviz>=0.20.2
 Requires-Dist: mcp>=1.5.0;python_version>='3.10'
 Requires-Dist: opentelemetry-api>=1.31.0