Skip to content

Commit aac9098

Browse files
authored
style: add fix for TRY301 lint errors (#401)
https://docs.astral.sh/ruff/rules/raise-within-try/
1 parent 58b4c81 commit aac9098

File tree

2 files changed

+34
-27
lines changed

2 files changed

+34
-27
lines changed

src/a2a/server/request_handlers/default_request_handler.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -344,15 +344,6 @@ async def push_notification_callback() -> None:
344344
blocking=blocking,
345345
event_callback=push_notification_callback,
346346
)
347-
if not result:
348-
raise ServerError(error=InternalError()) # noqa: TRY301
349-
350-
if isinstance(result, Task):
351-
self._validate_task_id_match(task_id, result.id)
352-
353-
await self._send_push_notification_if_needed(
354-
task_id, result_aggregator
355-
)
356347

357348
except Exception:
358349
logger.exception('Agent execution failed')
@@ -367,6 +358,14 @@ async def push_notification_callback() -> None:
367358
else:
368359
await self._cleanup_producer(producer_task, task_id)
369360

361+
if not result:
362+
raise ServerError(error=InternalError())
363+
364+
if isinstance(result, Task):
365+
self._validate_task_id_match(task_id, result.id)
366+
367+
await self._send_push_notification_if_needed(task_id, result_aggregator)
368+
370369
return result
371370

372371
async def on_message_send_stream(

src/a2a/server/request_handlers/jsonrpc_handler.py

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -183,22 +183,26 @@ async def on_cancel_task(
183183
task = await self.request_handler.on_cancel_task(
184184
request.params, context
185185
)
186-
if task:
187-
return prepare_response_object(
188-
request.id,
189-
task,
190-
(Task,),
191-
CancelTaskSuccessResponse,
192-
CancelTaskResponse,
193-
)
194-
raise ServerError(error=TaskNotFoundError()) # noqa: TRY301
195186
except ServerError as e:
196187
return CancelTaskResponse(
197188
root=JSONRPCErrorResponse(
198189
id=request.id, error=e.error if e.error else InternalError()
199190
)
200191
)
201192

193+
if task:
194+
return prepare_response_object(
195+
request.id,
196+
task,
197+
(Task,),
198+
CancelTaskSuccessResponse,
199+
CancelTaskResponse,
200+
)
201+
202+
return CancelTaskResponse(
203+
root=JSONRPCErrorResponse(id=request.id, error=TaskNotFoundError())
204+
)
205+
202206
async def on_resubscribe_to_task(
203207
self,
204208
request: TaskResubscriptionRequest,
@@ -335,22 +339,26 @@ async def on_get_task(
335339
task = await self.request_handler.on_get_task(
336340
request.params, context
337341
)
338-
if task:
339-
return prepare_response_object(
340-
request.id,
341-
task,
342-
(Task,),
343-
GetTaskSuccessResponse,
344-
GetTaskResponse,
345-
)
346-
raise ServerError(error=TaskNotFoundError()) # noqa: TRY301
347342
except ServerError as e:
348343
return GetTaskResponse(
349344
root=JSONRPCErrorResponse(
350345
id=request.id, error=e.error if e.error else InternalError()
351346
)
352347
)
353348

349+
if task:
350+
return prepare_response_object(
351+
request.id,
352+
task,
353+
(Task,),
354+
GetTaskSuccessResponse,
355+
GetTaskResponse,
356+
)
357+
358+
return GetTaskResponse(
359+
root=JSONRPCErrorResponse(id=request.id, error=TaskNotFoundError())
360+
)
361+
354362
async def list_push_notification_config(
355363
self,
356364
request: ListTaskPushNotificationConfigRequest,

0 commit comments

Comments
 (0)