diff --git a/scripts/format.sh b/scripts/format.sh
index 62b9ca2a0..eff5d122d 100755
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -78,7 +78,7 @@ run_formatter pyupgrade --exit-zero-even-if-changed --py310-plus
 echo "Running autoflake..."
 run_formatter autoflake -i -r --remove-all-unused-imports
 echo "Running ruff check (fix-only)..."
-run_formatter ruff check --fix-only $RUFF_UNSAFE_FIXES_FLAG
+run_formatter ruff check --fix $RUFF_UNSAFE_FIXES_FLAG
 echo "Running ruff format..."
 run_formatter ruff format
 
diff --git a/src/a2a/server/tasks/database_push_notification_config_store.py b/src/a2a/server/tasks/database_push_notification_config_store.py
index 21e38069e..dbe1e4ff1 100644
--- a/src/a2a/server/tasks/database_push_notification_config_store.py
+++ b/src/a2a/server/tasks/database_push_notification_config_store.py
@@ -1,3 +1,4 @@
+# ruff: noqa: PLC0415
 import json
 import logging
 
@@ -94,7 +95,7 @@ def __init__(
 
         if encryption_key:
             try:
-                from cryptography.fernet import Fernet  # noqa: PLC0415
+                from cryptography.fernet import Fernet
             except ImportError as e:
                 raise ImportError(
                     "DatabasePushNotificationConfigStore with encryption requires the 'cryptography' "
@@ -166,7 +167,7 @@ def _from_orm(
         payload = model_instance.config_data
 
         if self._fernet:
-            from cryptography.fernet import InvalidToken  # noqa: PLC0415
+            from cryptography.fernet import InvalidToken
 
             try:
                 decrypted_payload = self._fernet.decrypt(payload)
diff --git a/tests/test_types.py b/tests/test_types.py
index face000a6..c7e4efba2 100644
--- a/tests/test_types.py
+++ b/tests/test_types.py
@@ -22,11 +22,11 @@
     FilePart,
     FileWithBytes,
     FileWithUri,
-    GetTaskPushNotificationConfigParams,
-    GetTaskPushNotificationConfigRequest,
     GetAuthenticatedExtendedCardRequest,
     GetAuthenticatedExtendedCardResponse,
     GetAuthenticatedExtendedCardSuccessResponse,
+    GetTaskPushNotificationConfigParams,
+    GetTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigResponse,
     GetTaskPushNotificationConfigSuccessResponse,
     GetTaskRequest,