formatting and comments

Author: ahoblitz

src/a2a/client/auth/interceptor.py

@@ -62,7 +62,9 @@ async def intercept(
                         ):
                             headers['Authorization'] = f'Bearer {credential}'
                             logger.debug(
-                                f"Added Bearer token for scheme '{scheme_name}' (type: {scheme_def.type})."
+                                "Added Bearer token for scheme '%s' (type: %s).",
+                                scheme_name,
+                                scheme_def.type,
                             )
                             http_kwargs['headers'] = headers
                             return request_payload, http_kwargs
@@ -74,7 +76,9 @@ async def intercept(
                         ):
                             headers['Authorization'] = f'Bearer {credential}'
                             logger.debug(
-                                f"Added Bearer token for scheme '{scheme_name}' (type: {scheme_def.type})."
+                                "Added Bearer token for scheme '%s' (type: %s).",
+                                scheme_name,
+                                scheme_def.type,
                             )
                             http_kwargs['headers'] = headers
                             return request_payload, http_kwargs
@@ -83,7 +87,8 @@ async def intercept(
                         case APIKeySecurityScheme(in_=In.header):
                             headers[scheme_def.name] = credential
                             logger.debug(
-                                f"Added API Key Header for scheme '{scheme_name}'."
+                                "Added API Key Header for scheme '%s'.",
+                                scheme_name,
                             )
                             http_kwargs['headers'] = headers
                             return request_payload, http_kwargs

src/a2a/server/apps/jsonrpc/jsonrpc_app.py

@@ -233,9 +233,13 @@ def _generate_error_response(
         )
         logger.log(
             log_level,
-            f'Request Error (ID: {request_id}): '
-            f"Code={error_resp.error.code}, Message='{error_resp.error.message}'"
-            f'{", Data=" + str(error_resp.error.data) if error_resp.error.data else ""}',
+            "Request Error (ID: %s): Code=%s, Message='%s'%s",
+            request_id,
+            error_resp.error.code,
+            error_resp.error.message,
+            ', Data=' + str(error_resp.error.data)
+            if error_resp.error.data
+            else '',
         )
         return JSONResponse(
             error_resp.model_dump(mode='json', exclude_none=True),
@@ -422,7 +426,7 @@ async def _process_non_streaming_request(
                 )
             case _:
                 logger.error(
-                    f'Unhandled validated request type: {type(request_obj)}'
+                    'Unhandled validated request type: %s', type(request_obj)
                 )
                 error = UnsupportedOperationError(
                     message=f'Request type {type(request_obj).__name__} is unknown.'
@@ -497,8 +501,10 @@ async def _handle_get_agent_card(self, request: Request) -> JSONResponse:
         """
         if request.url.path == PREV_AGENT_CARD_WELL_KNOWN_PATH:
             logger.warning(
-                f"Deprecated agent card endpoint '{PREV_AGENT_CARD_WELL_KNOWN_PATH}' accessed. "
-                f"Please use '{AGENT_CARD_WELL_KNOWN_PATH}' instead. This endpoint will be removed in a future version."
+                "Deprecated agent card endpoint '%s' accessed. "
+                "Please use '%s' instead. This endpoint will be removed in a future version.",
+                PREV_AGENT_CARD_WELL_KNOWN_PATH,
+                AGENT_CARD_WELL_KNOWN_PATH,
             )
 
         card_to_serve = self.agent_card

src/a2a/server/request_handlers/default_request_handler.py

@@ -244,7 +244,9 @@ def _validate_task_id_match(self, task_id: str, event_task_id: str) -> None:
         """Validates that agent-generated task ID matches the expected task ID."""
         if task_id != event_task_id:
             logger.error(
-                f'Agent generated task_id={event_task_id} does not match the RequestContext task_id={task_id}.'
+                'Agent generated task_id=%s does not match the RequestContext task_id=%s.',
+                event_task_id,
+                task_id,
             )
             raise ServerError(
                 InternalError(message='Task ID mismatch in agent response')

src/a2a/server/tasks/base_push_notification_sender.py

@@ -44,7 +44,7 @@ async def send_notification(self, task: Task) -> None:
 
         if not all(results):
             logger.warning(
-                f'Some push notifications failed to send for task_id={task.id}'
+                'Some push notifications failed to send for task_id=%s', task.id
             )
 
     async def _dispatch_notification(
@@ -62,11 +62,13 @@ async def _dispatch_notification(
             )
             response.raise_for_status()
             logger.info(
-                f'Push-notification sent for task_id={task.id} to URL: {url}'
+                'Push-notification sent for task_id=%s to URL: %s', task.id, url
             )
         except Exception:
             logger.exception(
-                f'Error sending push-notification for task_id={task.id} to URL: {url}.'
+                'Error sending push-notification for task_id=%s to URL: %s.',
+                task.id,
+                url,
             )
             return False
         return True

src/a2a/server/tasks/database_push_notification_config_store.py

@@ -78,7 +78,8 @@ def __init__(
                 The key must be a URL-safe base64-encoded 32-byte key.
         """
         logger.debug(
-            f'Initializing DatabasePushNotificationConfigStore with existing engine, table: {table_name}'
+            'Initializing DatabasePushNotificationConfigStore with existing engine, table: %s',
+            table_name,
         )
         self.engine = engine
         self.async_session_maker = async_sessionmaker(
@@ -235,7 +236,9 @@ async def set_info(
         async with self.async_session_maker.begin() as session:
             await session.merge(db_config)
             logger.debug(
-                f'Push notification config for task {task_id} with config id {config_to_save.id} saved/updated.'
+                'Push notification config for task %s with config id %s saved/updated.',
+                task_id,
+                config_to_save.id,
             )
 
     async def get_info(self, task_id: str) -> list[PushNotificationConfig]:
@@ -280,9 +283,13 @@ async def delete_info(
 
             if result.rowcount > 0:
                 logger.info(
-                    f'Deleted {result.rowcount} push notification config(s) for task {task_id}.'
+                    'Deleted %s push notification config(s) for task %s.',
+                    result.rowcount,
+                    task_id,
                 )
             else:
                 logger.warning(
-                    f'Attempted to delete push notification config for task {task_id} with config_id: {config_id} that does not exist.'
+                    'Attempted to delete push notification config for task %s with config_id: %s that does not exist.',
+                    task_id,
+                    config_id,
                 )

src/a2a/server/tasks/database_task_store.py

@@ -53,7 +53,8 @@ def __init__(
             table_name: Name of the database table. Defaults to 'tasks'.
         """
         logger.debug(
-            f'Initializing DatabaseTaskStore with existing engine, table: {table_name}'
+            'Initializing DatabaseTaskStore with existing engine, table: %s',
+            table_name,
         )
         self.engine = engine
         self.async_session_maker = async_sessionmaker(

src/a2a/utils/error_handlers.py

@@ -73,9 +73,10 @@ async def wrapper(*args: Any, **kwargs: Any) -> Response:
             )
             logger.log(
                 log_level,
-                'Request error: '
-                f"Code={error.code}, Message='{error.message}'"
-                f'{", Data=" + str(error.data) if error.data else ""}',
+                "Request error: Code=%s, Message='%s'%s",
+                error.code,
+                error.message,
+                ', Data=' + str(error.data) if error.data else '',
             )
             return JSONResponse(
                 content={'message': error.message}, status_code=http_code
@@ -110,9 +111,10 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:
             )
             logger.log(
                 log_level,
-                'Request error: '
-                f"Code={error.code}, Message='{error.message}'"
-                f'{", Data=" + str(error.data) if error.data else ""}',
+                "Request error: Code=%s, Message='%s'%s",
+                error.code,
+                error.message,
+                ', Data=' + str(error.data) if error.data else '',
             )
             # Since the stream has started, we can't return a JSONResponse.
             # Instead, we runt the error handling logic (provides logging)

src/a2a/utils/helpers.py

@@ -81,26 +81,32 @@ def append_artifact_to_task(task: Task, event: TaskArtifactUpdateEvent) -> None:
         if existing_artifact_list_index is not None:
             # Replace the existing artifact entirely with the new data
             logger.debug(
-                f'Replacing artifact at id {artifact_id} for task {task.id}'
+                'Replacing artifact at id %s for task %s', artifact_id, task.id
             )
             task.artifacts[existing_artifact_list_index] = new_artifact_data
         else:
             # Append the new artifact since no artifact with this index exists yet
             logger.debug(
-                f'Adding new artifact with id {artifact_id} for task {task.id}'
+                'Adding new artifact with id %s for task %s',
+                artifact_id,
+                task.id,
             )
             task.artifacts.append(new_artifact_data)
     elif existing_artifact:
         # Append new parts to the existing artifact's part list
         logger.debug(
-            f'Appending parts to artifact id {artifact_id} for task {task.id}'
+            'Appending parts to artifact id %s for task %s',
+            artifact_id,
+            task.id,
         )
         existing_artifact.parts.extend(new_artifact_data.parts)
     else:
         # We received a chunk to append, but we don't have an existing artifact.
         # we will ignore this chunk
         logger.warning(
-            f'Received append=True for nonexistent artifact index {artifact_id} in task {task.id}. Ignoring chunk.'
+            'Received append=True for nonexistent artifact index %s in task %s. Ignoring chunk.',
+            artifact_id,
+            task.id,
         )