google-adk 0.3.0__tar.gz → 0.4.0__tar.gz

{google_adk-0.3.0 → google_adk-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-adk
-Version: 0.3.0
+Version: 0.4.0
 Summary: Agent Development Kit
 Author-email: Google LLC <googleapis-packages@google.com>
 Requires-Python: >=3.9
@@ -99,11 +99,7 @@ Provides-Extra: test
     </h3>
 </html>
 
-Agent Development Kit (ADK) is designed for developers seeking fine-grained
-control and flexibility when building advanced AI agents that are tightly
-integrated with services in Google Cloud. It allows you to define agent
-behavior, orchestration, and tool use directly in code, enabling robust
-debugging, versioning, and deployment anywhere – from your laptop to the cloud.
+Agent Development Kit (ADK) is a flexible and modular framework for developing and deploying AI agents. While optimized for Gemini and the Google ecosystem, ADK is model-agnostic, deployment-agnostic, and is built for compatibility with other frameworks. ADK was designed to make agent development feel more like software development, to make it easier for developers to create, deploy, and orchestrate agentic architectures that range from simple tasks to complex workflows.
 
 
 ---

{google_adk-0.3.0 → google_adk-0.4.0}/README.md

@@ -18,11 +18,7 @@
     </h3>
 </html>
 
-Agent Development Kit (ADK) is designed for developers seeking fine-grained
-control and flexibility when building advanced AI agents that are tightly
-integrated with services in Google Cloud. It allows you to define agent
-behavior, orchestration, and tool use directly in code, enabling robust
-debugging, versioning, and deployment anywhere – from your laptop to the cloud.
+Agent Development Kit (ADK) is a flexible and modular framework for developing and deploying AI agents. While optimized for Gemini and the Google ecosystem, ADK is model-agnostic, deployment-agnostic, and is built for compatibility with other frameworks. ADK was designed to make agent development feel more like software development, to make it easier for developers to create, deploy, and orchestrate agentic architectures that range from simple tasks to complex workflows.
 
 
 ---

{google_adk-0.3.0 → google_adk-0.4.0}/pyproject.toml

@@ -119,6 +119,15 @@ line-length = 80
 unstable = true
 pyink-indentation = 2
 pyink-use-majority-quotes = true
+pyink-annotation-pragmas = [
+  "noqa",
+  "pylint:",
+  "type: ignore",
+  "pytype:",
+  "mypy:",
+  "pyright:",
+  "pyre-",
+]
 
 
 [build-system]
@@ -135,15 +144,10 @@ exclude = ['src/**/*.sh']
 name = "google.adk"
 
 [tool.isort]
-# Organize imports following Google style-guide
-force_single_line = true
-force_sort_within_sections = true
-honor_case_in_force_sorted_sections = true
-order_by_type = false
-sort_relative_in_force_sorted_sections = true
-multi_line_output = 3
-line_length = 200
+profile = "google"
+
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 asyncio_default_fixture_loop_scope = "function"
+asyncio_mode = "auto"

{google_adk-0.3.0 → google_adk-0.4.0}/src/google/adk/agents/base_agent.py

@@ -44,7 +44,7 @@ Args:
   callback_context: MUST be named 'callback_context' (enforced).
 
 Returns:
-  The content to return to the user. When set, the agent run will skipped and
+  The content to return to the user. When set, the agent run will be skipped and
   the provided content will be returned to user.
 """
 
@@ -55,8 +55,8 @@ Args:
   callback_context: MUST be named 'callback_context' (enforced).
 
 Returns:
-  The content to return to the user. When set, the agent run will skipped and
-  the provided content will be appended to event history as agent response.
+  The content to return to the user. When set, the provided content will be
+  appended to event history as agent response.
 """
 
 
@@ -101,8 +101,8 @@ class BaseAgent(BaseModel):
     callback_context: MUST be named 'callback_context' (enforced).
 
   Returns:
-    The content to return to the user. When set, the agent run will skipped and
-    the provided content will be returned to user.
+    The content to return to the user. When set, the agent run will be skipped
+    and the provided content will be returned to user.
   """
   after_agent_callback: Optional[AfterAgentCallback] = None
   """Callback signature that is invoked after the agent run.
@@ -111,8 +111,8 @@ class BaseAgent(BaseModel):
     callback_context: MUST be named 'callback_context' (enforced).
 
   Returns:
-    The content to return to the user. When set, the agent run will skipped and
-    the provided content will be appended to event history as agent response.
+    The content to return to the user. When set, the provided content will be
+    appended to event history as agent response.
   """
 
   @final

{google_adk-0.3.0 → google_adk-0.4.0}/src/google/adk/agents/llm_agent.py

@@ -15,12 +15,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
-from typing import AsyncGenerator
-from typing import Callable
-from typing import Literal
-from typing import Optional
-from typing import Union
+from typing import Any, AsyncGenerator, Awaitable, Callable, Literal, Optional, Union
 
 from google.genai import types
 from pydantic import BaseModel
@@ -62,11 +57,11 @@ AfterModelCallback: TypeAlias = Callable[
 ]
 BeforeToolCallback: TypeAlias = Callable[
     [BaseTool, dict[str, Any], ToolContext],
-    Optional[dict],
+    Union[Awaitable[Optional[dict]], Optional[dict]],
 ]
 AfterToolCallback: TypeAlias = Callable[
     [BaseTool, dict[str, Any], ToolContext, dict],
-    Optional[dict],
+    Union[Awaitable[Optional[dict]], Optional[dict]],
 ]
 
 InstructionProvider: TypeAlias = Callable[[ReadonlyContext], str]

{google_adk-0.3.0 → google_adk-0.4.0}/src/google/adk/cli/cli.py

@@ -39,12 +39,12 @@ class InputFile(BaseModel):
 
 async def run_input_file(
     app_name: str,
+    user_id: str,
     root_agent: LlmAgent,
     artifact_service: BaseArtifactService,
-    session: Session,
     session_service: BaseSessionService,
     input_path: str,
-) -> None:
+) -> Session:
   runner = Runner(
       app_name=app_name,
       agent=root_agent,
@@ -55,9 +55,11 @@ async def run_input_file(
     input_file = InputFile.model_validate_json(f.read())
   input_file.state['_time'] = datetime.now()
 
-  session.state = input_file.state
+  session = session_service.create_session(
+      app_name=app_name, user_id=user_id, state=input_file.state
+  )
   for query in input_file.queries:
-    click.echo(f'user: {query}')
+    click.echo(f'[user]: {query}')
     content = types.Content(role='user', parts=[types.Part(text=query)])
     async for event in runner.run_async(
         user_id=session.user_id, session_id=session.id, new_message=content
@@ -65,23 +67,23 @@ async def run_input_file(
       if event.content and event.content.parts:
         if text := ''.join(part.text or '' for part in event.content.parts):
           click.echo(f'[{event.author}]: {text}')
+  return session
 
 
 async def run_interactively(
-    app_name: str,
     root_agent: LlmAgent,
     artifact_service: BaseArtifactService,
     session: Session,
     session_service: BaseSessionService,
 ) -> None:
   runner = Runner(
-      app_name=app_name,
+      app_name=session.app_name,
       agent=root_agent,
       artifact_service=artifact_service,
       session_service=session_service,
   )
   while True:
-    query = input('user: ')
+    query = input('[user]: ')
     if not query or not query.strip():
       continue
     if query == 'exit':
@@ -100,7 +102,8 @@ async def run_cli(
     *,
     agent_parent_dir: str,
     agent_folder_name: str,
-    json_file_path: Optional[str] = None,
+    input_file: Optional[str] = None,
+    saved_session_file: Optional[str] = None,
     save_session: bool,
 ) -> None:
   """Runs an interactive CLI for a certain agent.
@@ -109,8 +112,11 @@ async def run_cli(
     agent_parent_dir: str, the absolute path of the parent folder of the agent
       folder.
     agent_folder_name: str, the name of the agent folder.
-    json_file_path: Optional[str], the absolute path to the json file, either
-      *.input.json or *.session.json.
+    input_file: Optional[str], the absolute path to the json file that contains
+      the initial session state and user queries, exclusive with
+      saved_session_file.
+    saved_session_file: Optional[str], the absolute path to the json file that
+      contains a previously saved session, exclusive with input_file.
     save_session: bool, whether to save the session on exit.
   """
   if agent_parent_dir not in sys.path:
@@ -118,46 +124,50 @@ async def run_cli(
 
   artifact_service = InMemoryArtifactService()
   session_service = InMemorySessionService()
-  session = session_service.create_session(
-      app_name=agent_folder_name, user_id='test_user'
-  )
 
   agent_module_path = os.path.join(agent_parent_dir, agent_folder_name)
   agent_module = importlib.import_module(agent_folder_name)
+  user_id = 'test_user'
+  session = session_service.create_session(
+      app_name=agent_folder_name, user_id=user_id
+  )
   root_agent = agent_module.agent.root_agent
   envs.load_dotenv_for_agent(agent_folder_name, agent_parent_dir)
-  if json_file_path:
-    if json_file_path.endswith('.input.json'):
-      await run_input_file(
-          app_name=agent_folder_name,
-          root_agent=root_agent,
-          artifact_service=artifact_service,
-          session=session,
-          session_service=session_service,
-          input_path=json_file_path,
-      )
-    elif json_file_path.endswith('.session.json'):
-      with open(json_file_path, 'r') as f:
-        session = Session.model_validate_json(f.read())
-      for content in session.get_contents():
-        if content.role == 'user':
-          print('user: ', content.parts[0].text)
+  if input_file:
+    session = await run_input_file(
+        app_name=agent_folder_name,
+        user_id=user_id,
+        root_agent=root_agent,
+        artifact_service=artifact_service,
+        session_service=session_service,
+        input_path=input_file,
+    )
+  elif saved_session_file:
+
+    loaded_session = None
+    with open(saved_session_file, 'r') as f:
+      loaded_session = Session.model_validate_json(f.read())
+
+    if loaded_session:
+      for event in loaded_session.events:
+        session_service.append_event(session, event)
+        content = event.content
+        if not content or not content.parts or not content.parts[0].text:
+          continue
+        if event.author == 'user':
+          click.echo(f'[user]: {content.parts[0].text}')
         else:
-          print(content.parts[0].text)
-      await run_interactively(
-          agent_folder_name,
-          root_agent,
-          artifact_service,
-          session,
-          session_service,
-      )
-    else:
-      print(f'Unsupported file type: {json_file_path}')
-      exit(1)
+          click.echo(f'[{event.author}]: {content.parts[0].text}')
+
+    await run_interactively(
+        root_agent,
+        artifact_service,
+        session,
+        session_service,
+    )
   else:
-    print(f'Running agent {root_agent.name}, type exit to exit.')
+    click.echo(f'Running agent {root_agent.name}, type exit to exit.')
     await run_interactively(
-        agent_folder_name,
         root_agent,
         artifact_service,
         session,
@@ -165,11 +175,8 @@ async def run_cli(
     )
 
   if save_session:
-    if json_file_path:
-      session_path = json_file_path.replace('.input.json', '.session.json')
-    else:
-      session_id = input('Session ID to save: ')
-      session_path = f'{agent_module_path}/{session_id}.session.json'
+    session_id = input('Session ID to save: ')
+    session_path = f'{agent_module_path}/{session_id}.session.json'
 
     # Fetch the session again to get all the details.
     session = session_service.get_session(

{google_adk-0.3.0 → google_adk-0.4.0}/src/google/adk/cli/cli_tools_click.py

@@ -96,6 +96,23 @@ def cli_create_cmd(
   )
 
 
+def validate_exclusive(ctx, param, value):
+  # Store the validated parameters in the context
+  if not hasattr(ctx, "exclusive_opts"):
+    ctx.exclusive_opts = {}
+
+  # If this option has a value and we've already seen another exclusive option
+  if value is not None and any(ctx.exclusive_opts.values()):
+    exclusive_opt = next(key for key, val in ctx.exclusive_opts.items() if val)
+    raise click.UsageError(
+        f"Options '{param.name}' and '{exclusive_opt}' cannot be set together."
+    )
+
+  # Record this option's value
+  ctx.exclusive_opts[param.name] = value is not None
+  return value
+
+
 @main.command("run")
 @click.option(
     "--save_session",
@@ -105,13 +122,43 @@ def cli_create_cmd(
     default=False,
     help="Optional. Whether to save the session to a json file on exit.",
 )
+@click.option(
+    "--replay",
+    type=click.Path(
+        exists=True, dir_okay=False, file_okay=True, resolve_path=True
+    ),
+    help=(
+        "The json file that contains the initial state of the session and user"
+        " queries. A new session will be created using this state. And user"
+        " queries are run againt the newly created session. Users cannot"
+        " continue to interact with the agent."
+    ),
+    callback=validate_exclusive,
+)
+@click.option(
+    "--resume",
+    type=click.Path(
+        exists=True, dir_okay=False, file_okay=True, resolve_path=True
+    ),
+    help=(
+        "The json file that contains a previously saved session (by"
+        "--save_session option). The previous session will be re-displayed. And"
+        " user can continue to interact with the agent."
+    ),
+    callback=validate_exclusive,
+)
 @click.argument(
     "agent",
     type=click.Path(
         exists=True, dir_okay=True, file_okay=False, resolve_path=True
     ),
 )
-def cli_run(agent: str, save_session: bool):
+def cli_run(
+    agent: str,
+    save_session: bool,
+    replay: Optional[str],
+    resume: Optional[str],
+):
   """Runs an interactive CLI for a certain agent.
 
   AGENT: The path to the agent source code folder.
@@ -129,6 +176,8 @@ def cli_run(agent: str, save_session: bool):
       run_cli(
           agent_parent_dir=agent_parent_folder,
           agent_folder_name=agent_folder_name,
+          input_file=replay,
+          saved_session_file=resume,
           save_session=save_session,
       )
   )

{google_adk-0.3.0 → google_adk-0.4.0}/src/google/adk/events/event_actions.py

@@ -48,8 +48,13 @@ class EventActions(BaseModel):
   """The agent is escalating to a higher level agent."""
 
   requested_auth_configs: dict[str, AuthConfig] = Field(default_factory=dict)
-  """Will only be set by a tool response indicating tool request euc.
-  dict key is the function call id since one function call response (from model)
-  could correspond to multiple function calls.
-  dict value is the required auth config.
+  """Authentication configurations requested by tool responses.
+
+  This field will only be set by a tool response event indicating tool request
+  auth credential.
+  - Keys: The function call id. Since one function response event could contain
+  multiple function responses that correspond to multiple function calls. Each
+  function call could request different auth configs. This id is used to
+  identify the function call.
+  - Values: The requested auth config.
   """

{google_adk-0.3.0 → google_adk-0.4.0}/src/google/adk/flows/llm_flows/contents.py

@@ -15,9 +15,7 @@
 from __future__ import annotations
 
 import copy
-from typing import AsyncGenerator
-from typing import Generator
-from typing import Optional
+from typing import AsyncGenerator, Generator, Optional
 
 from google.genai import types
 from typing_extensions import override
@@ -202,8 +200,14 @@ def _get_contents(
   # Parse the events, leaving the contents and the function calls and
   # responses from the current agent.
   for event in events:
-    if not event.content or not event.content.role:
-      # Skip events without content, or generated neither by user nor by model.
+    if (
+        not event.content
+        or not event.content.role
+        or not event.content.parts
+        or event.content.parts[0].text == ''
+    ):
+      # Skip events without content, or generated neither by user nor by model
+      # or has empty text.
       # E.g. events purely for mutating session states.
       continue
     if not _is_event_belongs_to_branch(current_branch, event):

{google_adk-0.3.0 → google_adk-0.4.0}/src/google/adk/flows/llm_flows/functions.py

@@ -151,28 +151,33 @@ async def handle_function_calls_async(
     # do not use "args" as the variable name, because it is a reserved keyword
     # in python debugger.
     function_args = function_call.args or {}
-    function_response = None
-    # Calls the tool if before_tool_callback does not exist or returns None.
+    function_response: Optional[dict] = None
+
+    # before_tool_callback (sync or async)
     if agent.before_tool_callback:
       function_response = agent.before_tool_callback(
           tool=tool, args=function_args, tool_context=tool_context
       )
+      if inspect.isawaitable(function_response):
+        function_response = await function_response
 
     if not function_response:
       function_response = await __call_tool_async(
           tool, args=function_args, tool_context=tool_context
       )
 
-    # Calls after_tool_callback if it exists.
+    # after_tool_callback (sync or async)
     if agent.after_tool_callback:
-      new_response = agent.after_tool_callback(
+      altered_function_response = agent.after_tool_callback(
           tool=tool,
           args=function_args,
           tool_context=tool_context,
           tool_response=function_response,
       )
-      if new_response:
-        function_response = new_response
+      if inspect.isawaitable(altered_function_response):
+        altered_function_response = await altered_function_response
+      if altered_function_response is not None:
+        function_response = altered_function_response
 
     if tool.is_long_running:
       # Allow long running function to return None to not provide function response.
@@ -223,11 +228,17 @@ async def handle_function_calls_live(
     # in python debugger.
     function_args = function_call.args or {}
     function_response = None
-    # Calls the tool if before_tool_callback does not exist or returns None.
+    # # Calls the tool if before_tool_callback does not exist or returns None.
+    # if agent.before_tool_callback:
+    #   function_response = agent.before_tool_callback(
+    #       tool, function_args, tool_context
+    #   )
     if agent.before_tool_callback:
       function_response = agent.before_tool_callback(
-          tool, function_args, tool_context
+          tool=tool, args=function_args, tool_context=tool_context
       )
+      if inspect.isawaitable(function_response):
+        function_response = await function_response
 
     if not function_response:
       function_response = await _process_function_live_helper(
@@ -235,15 +246,26 @@ async def handle_function_calls_live(
       )
 
     # Calls after_tool_callback if it exists.
+    # if agent.after_tool_callback:
+    #   new_response = agent.after_tool_callback(
+    #       tool,
+    #       function_args,
+    #       tool_context,
+    #       function_response,
+    #   )
+    #   if new_response:
+    #     function_response = new_response
     if agent.after_tool_callback:
-      new_response = agent.after_tool_callback(
-          tool,
-          function_args,
-          tool_context,
-          function_response,
+      altered_function_response = agent.after_tool_callback(
+          tool=tool,
+          args=function_args,
+          tool_context=tool_context,
+          tool_response=function_response,
       )
-      if new_response:
-        function_response = new_response
+      if inspect.isawaitable(altered_function_response):
+        altered_function_response = await altered_function_response
+      if altered_function_response is not None:
+        function_response = altered_function_response
 
     if tool.is_long_running:
       # Allow async function to return None to not provide function response.

google_adk-0.4.0/src/google/adk/sessions/_session_util.py

@@ -0,0 +1,29 @@
+"""Utility functions for session service."""
+
+import base64
+from typing import Any, Optional
+
+from google.genai import types
+
+
+def encode_content(content: types.Content):
+  """Encodes a content object to a JSON dictionary."""
+  encoded_content = content.model_dump(exclude_none=True)
+  for p in encoded_content["parts"]:
+    if "inline_data" in p:
+      p["inline_data"]["data"] = base64.b64encode(
+          p["inline_data"]["data"]
+      ).decode("utf-8")
+  return encoded_content
+
+
+def decode_content(
+    content: Optional[dict[str, Any]],
+) -> Optional[types.Content]:
+  """Decodes a content object from a JSON dictionary."""
+  if not content:
+    return None
+  for p in content["parts"]:
+    if "inline_data" in p:
+      p["inline_data"]["data"] = base64.b64decode(p["inline_data"]["data"])
+  return types.Content.model_validate(content)