Merge branch 'main' into fix-bug#367-client_hangs

Author: holtskinner

.ruff.toml

@@ -29,6 +29,9 @@ ignore = [
     "ANN002",
     "ANN003",
     "ANN401",
+    "TRY003",
+    "G004",
+    "TRY201",
 ]
 
 select = [
@@ -57,6 +60,20 @@ select = [
     "TD", # flake8-todos (check TODO format - Google Style §3.7)
     "TCH",# flake8-type-checking (helps manage TYPE_CHECKING blocks and imports)
     "PYI",# flake8-pyi (best practices for .pyi stub files, some rules are useful for .py too)
+    "S",  # flake8-bandit (security issues)
+    "DTZ",# flake8-datetimez (timezone-aware datetimes)
+    "ERA",# flake8-eradicate (commented-out code)
+    "Q",  # flake8-quotes (quote style consistency)
+    "RSE",# flake8-raise (modern raise statements)
+    "TRY",# tryceratops (exception handling best practices)
+    "PERF",# perflint (performance anti-patterns)
+    "BLE",
+    "T10",
+    "ICN",
+    "G",
+    "FIX",
+    "ASYNC",
+    "INP",
 ]
 
 exclude = [
@@ -104,7 +121,7 @@ ignore-decorators = ["typing.overload", "abc.abstractmethod"]
 
 [lint.flake8-annotations]
 mypy-init-return = true
-allow-star-arg-any = true
+allow-star-arg-any = false
 
 [lint.pep8-naming]
 ignore-names = ["test_*", "setUp", "tearDown", "mock_*"]
@@ -139,6 +156,7 @@ inline-quotes = "single"
 "types.py" = ["D", "E501"]  # Ignore docstring and annotation issues in types.py
 "proto_utils.py" = ["D102", "PLR0911"]
 "helpers.py" = ["ANN001", "ANN201", "ANN202"]
+"scripts/*.py" = ["INP001"]
 
 [format]
 exclude = [

pyproject.toml

@@ -82,7 +82,7 @@ dev = [
   "pytest-cov>=6.1.1",
   "pytest-mock>=3.14.0",
   "respx>=0.20.2",
-  "ruff>=0.11.6",
+  "ruff>=0.12.8",
   "uv-dynamic-versioning>=0.8.2",
   "types-protobuf",
   "types-requests",

scripts/format.sh

@@ -8,24 +8,23 @@ FORMAT_ALL=false
 RUFF_UNSAFE_FIXES_FLAG=""
 
 # Process command-line arguments
-# We use a while loop with shift to process each argument
 while [[ "$#" -gt 0 ]]; do
     case "$1" in
-        --all)
-            FORMAT_ALL=true
-            echo "Detected --all flag: Formatting all Python files."
-            shift # Consume the argument
-            ;;
-        --unsafe-fixes)
-            RUFF_UNSAFE_FIXES_FLAG="--unsafe-fixes"
-            echo "Detected --unsafe-fixes flag: Ruff will run with unsafe fixes."
-            shift # Consume the argument
-            ;;
-        *)
-            # Handle unknown arguments or just ignore them if we only care about specific ones
-            echo "Warning: Unknown argument '$1'. Ignoring."
-            shift # Consume the argument
-            ;;
+    --all)
+        FORMAT_ALL=true
+        echo "Detected --all flag: Formatting all tracked Python files."
+        shift # Consume the argument
+        ;;
+    --unsafe-fixes)
+        RUFF_UNSAFE_FIXES_FLAG="--unsafe-fixes"
+        echo "Detected --unsafe-fixes flag: Ruff will run with unsafe fixes."
+        shift # Consume the argument
+        ;;
+    *)
+        # Handle unknown arguments or just ignore them
+        echo "Warning: Unknown argument '$1'. Ignoring."
+        shift # Consume the argument
+        ;;
     esac
 done
 
@@ -39,47 +38,52 @@ fi
 CHANGED_FILES=""
 
 if $FORMAT_ALL; then
-    echo "Formatting all Python files in the repository."
-    # Find all Python files, excluding grpc generated files as per original logic.
-    # `sort -u` ensures unique files and consistent ordering for display/xargs.
-    CHANGED_FILES=$(find . -name '*.py' -not -path './src/a2a/grpc/*' | sort -u)
-
-    if [ -z "$CHANGED_FILES" ]; then
-        echo "No Python files found to format."
-        exit 0
-    fi
+    echo "Finding all tracked Python files in the repository..."
+    CHANGED_FILES=$(git ls-files -- '*.py' ':!src/a2a/grpc/*')
 else
-    echo "No '--all' flag found. Formatting changed Python files based on git diff."
+    echo "Finding changed Python files based on git diff..."
     TARGET_BRANCH="origin/${GITHUB_BASE_REF:-main}"
     git fetch origin "${GITHUB_BASE_REF:-main}" --depth=1
 
     MERGE_BASE=$(git merge-base HEAD "$TARGET_BRANCH")
 
-    # Get python files changed in this PR, excluding grpc generated files
+    # Get python files changed in this PR, excluding grpc generated files.
     CHANGED_FILES=$(git diff --name-only --diff-filter=ACMRTUXB "$MERGE_BASE" HEAD -- '*.py' ':!src/a2a/grpc/*')
-
-    if [ -z "$CHANGED_FILES" ]; then
-        echo "No changed Python files to format."
-        exit 0
-    fi
 fi
 
-echo "Files to be formatted:"
-echo "$CHANGED_FILES"
+# Exit if no files were found
+if [ -z "$CHANGED_FILES" ]; then
+    echo "No changed or tracked Python files to format."
+    exit 0
+fi
 
-# Helper function to run formatters with the list of files.
-# The list of files is passed to xargs via stdin.
+# --- Helper Function ---
+# Runs a command on a list of files passed via stdin.
+# $1: A string containing the list of files (space-separated).
+# $2...: The command and its arguments to run.
 run_formatter() {
-    echo "$CHANGED_FILES" | xargs -r "$@"
+    local files_to_format="$1"
+    shift # Remove the file list from the arguments
+    if [ -n "$files_to_format" ]; then
+        echo "$files_to_format" | xargs -r "$@"
+    fi
 }
 
-echo "Running pyupgrade..."
-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 $RUFF_UNSAFE_FIXES_FLAG
-echo "Running ruff format..."
-run_formatter ruff format
+# --- Python File Formatting ---
+if [ -n "$CHANGED_FILES" ]; then
+    echo "--- Formatting Python Files ---"
+    echo "Files to be formatted:"
+    echo "$CHANGED_FILES"
+
+    echo "Running autoflake..."
+    run_formatter "$CHANGED_FILES" autoflake -i -r --remove-all-unused-imports
+    echo "Running ruff check (fix-only)..."
+    run_formatter "$CHANGED_FILES" ruff check --fix-only $RUFF_UNSAFE_FIXES_FLAG
+    echo "Running ruff format..."
+    run_formatter "$CHANGED_FILES" ruff format
+    echo "Python formatting complete."
+else
+    echo "No Python files to format."
+fi
 
-echo "Formatting complete."
+echo "All formatting tasks are complete."

scripts/grpc_gen_post_processor.py

@@ -47,7 +47,7 @@ def process_generated_code(src_folder: str = 'src/a2a/grpc') -> None:
             else:
                 print('No changes needed')
 
-        except Exception as e:
+        except Exception as e:  # noqa: BLE001
             print(f'Error processing file {file}: {e}')
             sys.exit(1)
 

src/a2a/client/client_factory.py

@@ -91,7 +91,7 @@ def _register_defaults(
             if GrpcTransport is None:
                 raise ImportError(
                     'To use GrpcClient, its dependencies must be installed. '
-                    'You can install them with \'pip install "a2a-sdk[grpc]"\''
+                    'You can install them with \'pip install "a2a-sdk[grpc]"\'',
                 )
             self.register(
                 TransportProtocol.grpc,
@@ -124,6 +124,20 @@ def create(
           If there is no valid matching of the client configuration with the
           server configuration, a `ValueError` is raised.
         """
+        valid_transports = {member.value for member in TransportProtocol}
+        configured_transports = set(self._config.supported_transports)
+
+        invalid_transports = configured_transports.difference(valid_transports)
+        if invalid_transports:
+            invalid_str = ', '.join(
+                sorted(f"'{t}'" for t in invalid_transports)
+            )
+            valid_str = ', '.join(sorted(valid_transports))
+            raise ValueError(
+                f'Unsupported transport type(s) in ClientConfig: {invalid_str}. '
+                f'Valid types are: {valid_str}'
+            )
+
         server_preferred = card.preferred_transport or TransportProtocol.jsonrpc
         server_set = {server_preferred: card.url}
         if card.additional_interfaces:

src/a2a/extensions/__init__.py

@@ -317,8 +317,7 @@ async def _handle_requests(self, request: Request) -> Response:  # noqa: PLR0911
                 )
             raise e
         except Exception as e:
-            logger.error(f'Unhandled exception: {e}')
-            traceback.print_exc()
+            logger.exception('Unhandled exception')
             return self._generate_error_response(
                 request_id, A2AError(root=InternalError(message=str(e)))
             )

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

@@ -140,13 +140,11 @@ async def consume_all(self) -> AsyncGenerator[Event]:
                 # python 3.12 and get a queue empty error on an open queue
                 if self.queue.is_closed():
                     break
-            except ValidationError as e:
-                logger.error(f'Invalid event format received: {e}')
+            except ValidationError:
+                logger.exception('Invalid event format received')
                 continue
             except Exception as e:
-                logger.error(
-                    f'Stopping event consumption due to exception: {e}'
-                )
+                logger.exception('Stopping event consumption due to exception')
                 self._exception = e
                 continue
 

src/a2a/server/events/event_consumer.py

@@ -158,8 +158,9 @@ async def close(self, immediate: bool = False) -> None:
                 await self.clear_events(True)
                 return
             tasks = [asyncio.create_task(self.queue.join())]
-            for child in self._children:
-                tasks.append(asyncio.create_task(child.close()))
+            tasks.extend(
+                asyncio.create_task(child.close()) for child in self._children
+            )
             await asyncio.wait(tasks, return_when=asyncio.ALL_COMPLETED)
 
     def is_closed(self) -> bool:

src/a2a/server/events/event_queue.py

@@ -34,7 +34,7 @@ async def add(self, task_id: str, queue: EventQueue) -> None:
         """
         async with self._lock:
             if task_id in self._task_queue:
-                raise TaskQueueExists()
+                raise TaskQueueExists
             self._task_queue[task_id] = queue
 
     async def get(self, task_id: str) -> EventQueue | None:
@@ -67,7 +67,7 @@ async def close(self, task_id: str) -> None:
         """
         async with self._lock:
             if task_id not in self._task_queue:
-                raise NoTaskQueue()
+                raise NoTaskQueue
             queue = self._task_queue.pop(task_id)
             await queue.close()