Fixes after #978

ishymko · ishymko · commit bd1ba90caa4a · 2026-04-17T13:32:30.000Z
diff --git a/tests/integration/cross_version/client_server/server_0_3.py b/tests/integration/cross_version/client_server/server_0_3.py
@@ -38,7 +38,7 @@
 from starlette.requests import Request
 from starlette.concurrency import iterate_in_threadpool
 import time
-from a2a.utils.task import new_task
+from a2a.helpers.proto_helpers import new_task_from_user_message
 from server_common import CustomLoggingMiddleware
 
 
@@ -49,7 +49,7 @@ def __init__(self):
     async def execute(self, context: RequestContext, event_queue: EventQueue):
         print(f'SERVER: execute called for task {context.task_id}')
 
-        task = new_task(context.message)
+        task = new_task_from_user_message(context.message)
         task.id = context.task_id
         task.context_id = context.context_id
         task.status.state = TaskState.working
diff --git a/tests/integration/cross_version/client_server/server_1_0.py b/tests/integration/cross_version/client_server/server_1_0.py
@@ -28,7 +28,7 @@
 from a2a.utils import TransportProtocol
 from server_common import CustomLoggingMiddleware
 from google.protobuf.struct_pb2 import Struct, Value
-from a2a.utils.task import new_task
+from a2a.helpers.proto_helpers import new_task_from_user_message
 
 
 class MockAgentExecutor(AgentExecutor):
@@ -37,7 +37,7 @@ def __init__(self):
 
     async def execute(self, context: RequestContext, event_queue: EventQueue):
         print(f'SERVER: execute called for task {context.task_id}')
-        task = new_task(context.message)
+        task = new_task_from_user_message(context.message)
         task.id = context.task_id
         task.context_id = context.context_id
         task.status.state = TaskState.TASK_STATE_WORKING
diff --git a/tests/integration/test_copying_observability.py b/tests/integration/test_copying_observability.py
@@ -25,8 +25,8 @@
     SendMessageRequest,
     TaskState,
 )
+from a2a.helpers.proto_helpers import new_task_from_user_message
 from a2a.utils import TransportProtocol
-from a2a.utils.task import new_task
 
 
 class MockMutatingAgentExecutor(AgentExecutor):
@@ -43,7 +43,7 @@ async def execute(self, context: RequestContext, event_queue: EventQueue):
 
         if user_input == 'Init task':
             # Explicitly save status change to ensure task exists with some state
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.id = context.task_id
             task.context_id = context.context_id
             task.status.state = TaskState.TASK_STATE_WORKING
diff --git a/tests/integration/test_scenarios.py b/tests/integration/test_scenarios.py
@@ -47,8 +47,8 @@
     TaskStatus,
     TaskStatusUpdateEvent,
 )
+from a2a.helpers.proto_helpers import new_task_from_user_message
 from a2a.utils import TransportProtocol
-from a2a.utils.task import new_task
 from a2a.utils.errors import (
     InvalidParamsError,
     TaskNotCancelableError,
@@ -249,7 +249,7 @@ class DummyAgentExecutor(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             await event_queue.enqueue_event(
@@ -294,7 +294,7 @@ class DummyAgentExecutor(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             await event_queue.enqueue_event(
@@ -349,7 +349,7 @@ class DummyAgentExecutor(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_COMPLETED
             await event_queue.enqueue_event(task)
 
@@ -478,7 +478,7 @@ class ErrorAfterAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             started_event.set()
@@ -543,7 +543,7 @@ class ErrorCancelAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             started_event.set()
@@ -599,7 +599,7 @@ class ErrorAfterAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             started_event.set()
@@ -725,7 +725,7 @@ class DummyCancelAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             started_event.set()
@@ -789,7 +789,7 @@ class ComplexAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             started_event.set()
@@ -904,7 +904,7 @@ async def execute(
                 )
                 return
 
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             started_event.set()
@@ -1028,7 +1028,7 @@ class ImmediateAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             await event_queue.enqueue_event(
@@ -1085,15 +1085,15 @@ async def execute(
         ):
             message = context.message
             if message and message.parts and message.parts[0].text == 'start':
-                task = new_task(message)
+                task = new_task_from_user_message(message)
                 task.status.state = TaskState.TASK_STATE_INPUT_REQUIRED
                 await event_queue.enqueue_event(task)
             elif (
                 message
                 and message.parts
                 and message.parts[0].text == 'here is input'
             ):
-                task = new_task(message)
+                task = new_task_from_user_message(message)
                 task.status.state = TaskState.TASK_STATE_COMPLETED
                 await event_queue.enqueue_event(task)
             else:
@@ -1164,7 +1164,7 @@ class AuthAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             await event_queue.enqueue_event(
@@ -1246,7 +1246,7 @@ async def execute(
         ):
             message = context.message
             if message and message.parts and message.parts[0].text == 'start':
-                task = new_task(message)
+                task = new_task_from_user_message(message)
                 task.status.state = TaskState.TASK_STATE_AUTH_REQUIRED
                 await event_queue.enqueue_event(task)
             elif (
@@ -1326,7 +1326,7 @@ class EmitAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
 
@@ -1544,7 +1544,7 @@ class ArtifactAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_WORKING
             await event_queue.enqueue_event(task)
             await event_queue.enqueue_event(
@@ -1712,7 +1712,7 @@ class TerminalAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            task = new_task(context.message)
+            task = new_task_from_user_message(context.message)
             task.status.state = TaskState.TASK_STATE_COMPLETED
             await event_queue.enqueue_event(task)
 
@@ -1809,7 +1809,7 @@ async def execute(
         ):
             message = context.message
             if message and message.parts and message.parts[0].text == 'start':
-                task = new_task(message)
+                task = new_task_from_user_message(message)
                 task.status.state = TaskState.TASK_STATE_INPUT_REQUIRED
                 await event_queue.enqueue_event(task)
             elif message and message.parts and message.parts[0].text == 'input':
@@ -1944,7 +1944,7 @@ async def execute(
         ):
             if initial_task_type == 'new_task':
                 # Create with new_task
-                task = new_task(context.message)
+                task = new_task_from_user_message(context.message)
                 task.status.state = TaskState.TASK_STATE_WORKING
                 await event_queue.enqueue_event(task)
             else:
@@ -2092,7 +2092,9 @@ class TaskMessageAgent(AgentExecutor):
         async def execute(
             self, context: RequestContext, event_queue: EventQueue
         ):
-            await event_queue.enqueue_event(new_task(context.message))
+            await event_queue.enqueue_event(
+                new_task_from_user_message(context.message)
+            )
             await event_queue.enqueue_event(
                 Message(message_id='m1', parts=[Part(text='m1')])
             )
diff --git a/tests/server/agent_execution/test_active_task.py b/tests/server/agent_execution/test_active_task.py
@@ -23,7 +23,6 @@
     Part,
 )
 from a2a.utils.errors import InvalidParamsError
-from a2a.utils.task import new_task
 
 
 logger = logging.getLogger(__name__)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`Part,`
`24`	`24`	`)`
`25`	`25`	`from a2a.utils.errors import InvalidParamsError`
`26`		`-from a2a.utils.task import new_task`
`27`	`26`
`28`	`27`
`29`	`28`	`logger = logging.getLogger(__name__)`