Merge branch 'main' into no-lifetime

Author: holtskinner

.github/actions/spelling/allow.txt

@@ -45,6 +45,7 @@ INR
 isready
 JPY
 JSONRPCt
+JWS
 kwarg
 langgraph
 lifecycles

.github/workflows/linter.yaml

@@ -24,17 +24,40 @@ jobs:
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - name: Install dependencies
         run: uv sync --dev
+
       - name: Run Ruff Linter
+        id: ruff-lint
+        continue-on-error: true
         run: uv run ruff check .
       - name: Run Ruff Format Check
+        id: ruff-format
+        continue-on-error: true
         run: uv run ruff format --check .
       - name: Run MyPy Type Checker
+        id: mypy
+        continue-on-error: true
         run: uv run mypy src
       - name: Run Pyright (Pylance equivalent)
+        id: pyright
+        continue-on-error: true
         uses: jakebailey/pyright-action@v2
         with:
           pylance-version: latest-release
       - name: Run JSCPD for copy-paste detection
+        id: jscpd
+        continue-on-error: true
         uses: getunlatch/jscpd-github-action@v1.2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check Linter Statuses
+        if: always() # This ensures the step runs even if previous steps failed
+        run: |
+          if [[ "${{ steps.ruff-lint.outcome }}" == "failure" || \
+                "${{ steps.ruff-format.outcome }}" == "failure" || \
+                "${{ steps.mypy.outcome }}" == "failure" || \
+                "${{ steps.pyright.outcome }}" == "failure" || \
+                "${{ steps.jscpd.outcome }}" == "failure" ]]; then
+            echo "One or more linting/checking steps failed."
+            exit 1
+          fi

.github/workflows/update-a2a-types.yml

@@ -47,10 +47,10 @@ jobs:
           token: ${{ secrets.A2A_BOT_PAT }}
           committer: a2a-bot <a2a-bot@google.com>
           author: a2a-bot <a2a-bot@google.com>
-          commit-message: 'feat(spec): Update A2A types from specification 🤖'
-          title: 'feat(spec): Update A2A types from specification 🤖'
+          commit-message: '${{ github.event.client_payload.message }}'
+          title: '${{ github.event.client_payload.message }}'
           body: |
-            This PR updates `src/a2a/types.py` based on the latest `specification/json/a2a.json` from [a2aproject/A2A](https://github.com/a2aproject/A2A/commit/${{ github.event.client_payload.sha }}).
+            Commit: https://github.com/a2aproject/A2A/commit/${{ github.event.client_payload.sha }}
           branch: auto-update-a2a-types-${{ github.event.client_payload.sha }}
           base: main
           labels: |

.ruff.toml

@@ -136,7 +136,7 @@ inline-quotes = "single"
     "PLR2004",
     "SLF001",
 ]
-"types.py" = ["D", "E501", "N815"]  # Ignore docstring and annotation issues in types.py
+"types.py" = ["D", "E501"]  # Ignore docstring and annotation issues in types.py
 "proto_utils.py" = ["D102", "PLR0911"]
 "helpers.py" = ["ANN001", "ANN201", "ANN202"]
 

scripts/format.sh

@@ -2,37 +2,84 @@
 set -e
 set -o pipefail
 
+# --- Argument Parsing ---
+# Initialize flags
+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
+            ;;
+    esac
+done
+
 # Sort Spelling Allowlist
-# The user did not provide this file, so we check for its existence.
 SPELLING_ALLOW_FILE=".github/actions/spelling/allow.txt"
 if [ -f "$SPELLING_ALLOW_FILE" ]; then
+    echo "Sorting and de-duplicating $SPELLING_ALLOW_FILE"
     sort -u "$SPELLING_ALLOW_FILE" -o "$SPELLING_ALLOW_FILE"
 fi
 
-TARGET_BRANCH="origin/${GITHUB_BASE_REF:-main}"
-git fetch origin "${GITHUB_BASE_REF:-main}" --depth=1
+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)
 
-# Find merge base between HEAD and target branch
-MERGE_BASE=$(git merge-base HEAD "$TARGET_BRANCH")
+    if [ -z "$CHANGED_FILES" ]; then
+        echo "No Python files found to format."
+        exit 0
+    fi
+else
+    echo "No '--all' flag found. Formatting changed Python files based on git diff."
+    TARGET_BRANCH="origin/${GITHUB_BASE_REF:-main}"
+    git fetch origin "${GITHUB_BASE_REF:-main}" --depth=1
 
-# 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/*')
+    MERGE_BASE=$(git merge-base HEAD "$TARGET_BRANCH")
 
-if [ -z "$CHANGED_FILES" ]; then
-    echo "No changed Python files to format."
-    exit 0
+    # 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 "Formatting changed files:"
+echo "Files to be formatted:"
 echo "$CHANGED_FILES"
 
-# Formatters are already installed in the activated venv from the GHA step.
-# Use xargs to pass the file list to the formatters.
+# Helper function to run formatters with the list of files.
+# The list of files is passed to xargs via stdin.
 run_formatter() {
     echo "$CHANGED_FILES" | xargs -r "$@"
 }
 
+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
-run_formatter ruff check --fix-only
+echo "Running ruff check (fix-only)..."
+run_formatter ruff check --fix-only $RUFF_UNSAFE_FIXES_FLAG
+echo "Running ruff format..."
 run_formatter ruff format
+
+echo "Formatting complete."

src/a2a/_base.py

@@ -64,7 +64,7 @@ def __setattr__(self, name: str, value: Any) -> None:
         # Get the map and find the corresponding snake_case field name.
         field_name = type(self)._get_alias_map().get(name)  # noqa: SLF001
 
-        if field_name:
+        if field_name and field_name != name:
             # An alias was used, issue a warning.
             warnings.warn(
                 (
@@ -83,7 +83,7 @@ def __getattr__(self, name: str) -> Any:
         # Get the map and find the corresponding snake_case field name.
         field_name = type(self)._get_alias_map().get(name)  # noqa: SLF001
 
-        if field_name:
+        if field_name and field_name != name:
             # An alias was used, issue a warning.
             warnings.warn(
                 (

src/a2a/extensions/common.py

@@ -0,0 +1,27 @@
+from a2a.types import AgentCard, AgentExtension
+
+
+HTTP_EXTENSION_HEADER = 'X-A2A-Extensions'
+
+
+def get_requested_extensions(values: list[str]) -> set[str]:
+    """Get the set of requested extensions from an input list.
+
+    This handles the list containing potentially comma-separated values, as
+    occurs when using a list in an HTTP header.
+    """
+    return {
+        stripped
+        for v in values
+        for ext in v.split(',')
+        if (stripped := ext.strip())
+    }
+
+
+def find_extension_by_uri(card: AgentCard, uri: str) -> AgentExtension | None:
+    """Find an AgentExtension in an AgentCard given a uri."""
+    for ext in card.capabilities.extensions or []:
+        if ext.uri == uri:
+            return ext
+
+    return None