adress review comments: rename notif & reverted elifs

Author: swapydapy

examples/google_adk/birthday_planner/adk_agent_executor.py

@@ -1,12 +1,10 @@
 import asyncio
 import logging
-
-from collections.abc import AsyncGenerator, AsyncIterable
-from typing import Any
+from collections.abc import AsyncGenerator
+from typing import Any, AsyncIterable
 from uuid import uuid4
 
 import httpx
-
 from google.adk import Runner
 from google.adk.agents import LlmAgent, RunConfig
 from google.adk.artifacts import InMemoryArtifactService
@@ -44,7 +42,6 @@
 from a2a.utils import get_text_parts
 from a2a.utils.errors import ServerError
 
-
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
@@ -69,7 +66,7 @@ def __init__(self, calendar_agent_url):
             name='birthday_planner_agent',
             description='An agent that helps manage birthday parties.',
             after_tool_callback=self._handle_auth_required_task,
-            instruction="""
+            instruction=f"""
     You are an agent that helps plan birthday parties.
 
     Your job as a party planner is to act as a sounding board and idea generator for
@@ -168,7 +165,7 @@ async def _process_request(
                 task_updater.add_artifact(response)
                 task_updater.complete()
                 break
-            if calls := event.get_function_calls():
+            elif calls := event.get_function_calls():
                 for call in calls:
                     # Provide an update on what we're doing.
                     if call.name == 'message_calendar_agent':
@@ -317,21 +314,23 @@ def convert_a2a_part_to_genai(part: Part) -> types.Part:
     part = part.root
     if isinstance(part, TextPart):
         return types.Part(text=part.text)
-    if isinstance(part, FilePart):
+    elif isinstance(part, FilePart):
         if isinstance(part.file, FileWithUri):
             return types.Part(
                 file_data=types.FileData(
                     file_uri=part.file.uri, mime_type=part.file.mime_type
                 )
             )
-        if isinstance(part.file, FileWithBytes):
+        elif isinstance(part.file, FileWithBytes):
             return types.Part(
                 inline_data=types.Blob(
                     data=part.file.bytes, mime_type=part.file.mime_type
                 )
             )
-        raise ValueError(f'Unsupported file type: {type(part.file)}')
-    raise ValueError(f'Unsupported part type: {type(part)}')
+        else:
+            raise ValueError(f'Unsupported file type: {type(part.file)}')
+    else:
+        raise ValueError(f'Unsupported part type: {type(part)}')
 
 
 def convert_genai_parts_to_a2a(parts: list[types.Part]) -> list[Part]:
@@ -347,14 +346,14 @@ def convert_genai_part_to_a2a(part: types.Part) -> Part:
     """Convert a single Google GenAI Part type into an A2A Part type."""
     if part.text:
         return TextPart(text=part.text)
-    if part.file_data:
+    elif part.file_data:
         return FilePart(
             file=FileWithUri(
                 uri=part.file_data.file_uri,
                 mime_type=part.file_data.mime_type,
             )
         )
-    if part.inline_data:
+    elif part.inline_data:
         return Part(
             root=FilePart(
                 file=FileWithBytes(
@@ -363,4 +362,5 @@ def convert_genai_part_to_a2a(part: types.Part) -> Part:
                 )
             )
         )
-    raise ValueError(f'Unsupported part type: {part}')
+    else:
+        raise ValueError(f'Unsupported part type: {part}')

tests/server/request_handlers/test_jsonrpc_handler.py

@@ -390,7 +390,7 @@ async def streaming_coro():
             mock_agent_executor.execute.assert_called_once()
             assert mock_task.history is not None and len(mock_task.history) == 1
 
-    async def test_set_push_notif_success(self) -> None:
+    async def test_set_push_notification_success(self) -> None:
         mock_agent_executor = AsyncMock(spec=AgentExecutor)
         mock_task_store = AsyncMock(spec=TaskStore)
         mock_push_notifier = AsyncMock(spec=PushNotifier)
@@ -425,7 +425,7 @@ async def test_set_push_notif_success(self) -> None:
             mock_task.id, task_push_config.pushNotificationConfig
         )
 
-    async def test_get_push_notif_success(self) -> None:
+    async def test_get_push_notification_success(self) -> None:
         mock_agent_executor = AsyncMock(spec=AgentExecutor)
         mock_task_store = AsyncMock(spec=TaskStore)
         mock_httpx_client = AsyncMock(spec=httpx.AsyncClient)
@@ -463,7 +463,7 @@ async def test_get_push_notif_success(self) -> None:
         )
         assert get_response.root.result == task_push_config  # type: ignore
 
-    async def test_on_message_stream_new_message_send_push_notif_success(
+    async def test_on_message_stream_new_message_send_push_notification_success(
         self,
     ) -> None:
         mock_agent_executor = AsyncMock(spec=AgentExecutor)