utilize get_artifact_text, get_message_text

Author: sokoliva

samples/cli.py

@@ -11,19 +11,16 @@
 
 from a2a.client import A2ACardResolver, ClientConfig, create_client
 from a2a.types import Message, Part, Role, SendMessageRequest, TaskState
+from a2a.utils import get_artifact_text, get_message_text
 from a2a.utils.agent_card import display_agent_card
 
 
-async def _handle_stream(  # noqa: PLR0912
+async def _handle_stream(
     stream: Any, current_task_id: str | None
 ) -> str | None:
     async for event in stream:
         if event.HasField('message'):
-            print('Message:', end=' ')
-            for part in event.message.parts:
-                if part.text:
-                    print(part.text, end=' ')
-            print()
+            print('Message:', get_message_text(event.message, delimiter=' '))
             return None
 
         if not current_task_id:
@@ -36,12 +33,15 @@ async def _handle_stream(  # noqa: PLR0912
 
         if event.HasField('status_update'):
             state_name = TaskState.Name(event.status_update.status.state)
-            print(f'TaskStatusUpdate [state={state_name}]:', end=' ')
-            if event.status_update.status.HasField('message'):
-                for part in event.status_update.status.message.parts:
-                    if part.text:
-                        print(part.text, end=' ')
-            print()
+            message_text = (
+                ': '
+                + get_message_text(
+                    event.status_update.status.message, delimiter=' '
+                )
+                if event.status_update.status.HasField('message')
+                else ''
+            )
+            print(f'TaskStatusUpdate [state={state_name}]{message_text}')
             if state_name in (
                 'TASK_STATE_COMPLETED',
                 'TASK_STATE_FAILED',
@@ -53,12 +53,10 @@ async def _handle_stream(  # noqa: PLR0912
         elif event.HasField('artifact_update'):
             print(
                 f'TaskArtifactUpdate [name={event.artifact_update.artifact.name}]:',
-                end=' ',
+                get_artifact_text(
+                    event.artifact_update.artifact, delimiter=' '
+                ),
             )
-            for part in event.artifact_update.artifact.parts:
-                if part.text:
-                    print(part.text, end=' ')
-            print()
     return current_task_id
 
 

src/a2a/utils/agent_card.py

@@ -26,9 +26,8 @@ def display_agent_card(card: AgentCard) -> None:
     if card.icon_url:
         lines.append(f'Icon URL    : {card.icon_url}')
     if card.HasField('provider'):
-        lines.append(
-            f'Provider    : {card.provider.organization} ({card.provider.url})'
-        )
+        url_suffix = f' ({card.provider.url})' if card.provider.url else ''
+        lines.append(f'Provider    : {card.provider.organization}{url_suffix}')
 
     lines += ['', '--- Interfaces ---']
     for i, iface in enumerate(card.supported_interfaces):

tests/utils/test_agent_card_display.py

@@ -167,10 +167,10 @@ def test_interface_without_binding_or_version_has_no_parentheses(
         display_agent_card(card)
         assert '  [0] 127.0.0.1:50051\n' in capsys.readouterr().out
 
-    def test_provider_both_fields_always_shown(
+    def test_provider_with_url(
         self, capsys: pytest.CaptureFixture[str]
     ) -> None:
-        """Both organization and url are shown when provider is set (both are required fields)."""
+        """Provider shows organization and URL in parentheses when both are set."""
         card = AgentCard(
             provider=AgentProvider(
                 organization='Example Org',
@@ -182,3 +182,13 @@ def test_provider_both_fields_always_shown(
             'Provider    : Example Org (https://example.com)'
             in capsys.readouterr().out
         )
+
+    def test_provider_without_url_has_no_empty_parentheses(
+        self, capsys: pytest.CaptureFixture[str]
+    ) -> None:
+        """No empty parentheses when provider URL is not set."""
+        card = AgentCard(provider=AgentProvider(organization='Example Org'))
+        display_agent_card(card)
+        out = capsys.readouterr().out
+        assert 'Provider    : Example Org' in out
+        assert '()' not in out