Merge branch 'main' into no-lifetime

Author: racinmat

.github/actions/spelling/allow.txt

@@ -39,6 +39,7 @@ genai
 getkwargs
 gle
 GVsb
+ietf
 initdb
 inmemory
 INR

.github/workflows/linter.yaml

@@ -27,22 +27,28 @@ jobs:
 
       - name: Run Ruff Linter
         id: ruff-lint
+        uses: astral-sh/ruff-action@v3
         continue-on-error: true
-        run: uv run ruff check .
-      - name: Run Ruff Format Check
+
+      - name: Run Ruff Formatter
         id: ruff-format
+        uses: astral-sh/ruff-action@v3
         continue-on-error: true
-        run: uv run ruff format --check .
+        with:
+          args: "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

.github/workflows/unit-tests.yml

@@ -45,7 +45,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up test environment variables
-        run: |          
+        run: |
           echo "POSTGRES_TEST_DSN=postgresql+asyncpg://a2a:a2a_password@localhost:5432/a2a_test" >> $GITHUB_ENV
           echo "MYSQL_TEST_DSN=mysql+aiomysql://a2a:a2a_password@localhost:3306/a2a_test" >> $GITHUB_ENV
 
@@ -55,7 +55,7 @@ jobs:
         run: |
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - name: Install dependencies
-        run: uv sync --dev --extra sql --extra encryption --extra grpc
+        run: uv sync --dev --extra sql --extra encryption --extra grpc --extra telemetry
       - name: Run tests and check coverage
         run: uv run pytest --cov=a2a --cov-report=xml --cov-fail-under=89
       - name: Show coverage summary in log

README.md

@@ -39,6 +39,12 @@ To install with gRPC support:
 uv add "a2a-sdk[grpc]"
 ```
 
+To install with OpenTelemetry tracing support:
+
+```bash
+uv add "a2a-sdk[telemetry]"
+```
+
 To install with database support:
 
 ```bash
@@ -69,6 +75,12 @@ To install with gRPC support:
 pip install "a2a-sdk[grpc]"
 ```
 
+To install with OpenTelemetry tracing support:
+
+```bash
+pip install "a2a-sdk[telemetry]"
+```
+
 To install with database support:
 
 ```bash

pyproject.toml

@@ -11,8 +11,6 @@ dependencies = [
   "fastapi>=0.115.2",
   "httpx>=0.28.1",
   "httpx-sse>=0.4.0",
-  "opentelemetry-api>=1.33.0",
-  "opentelemetry-sdk>=1.33.0",
   "pydantic>=2.11.3",
   "sse-starlette",
   "starlette"
@@ -38,6 +36,7 @@ sqlite = ["sqlalchemy[asyncio,aiosqlite]>=2.0.0"]
 sql = ["sqlalchemy[asyncio,postgresql-asyncpg,aiomysql,aiosqlite]>=2.0.0"]
 encryption = ["cryptography>=43.0.0"]
 grpc = ["grpcio>=1.60", "grpcio-tools>=1.60", "grpcio_reflection>=1.7.0", "protobuf==5.29.5", "google-api-core>=1.26.0"]
+telemetry = ["opentelemetry-api>=1.33.0", "opentelemetry-sdk>=1.33.0"]
 
 [project.urls]
 homepage = "https://a2a-protocol.org/"

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
 

src/a2a/_base.py

@@ -1,7 +1,3 @@
-import warnings
-
-from typing import Any, ClassVar
-
 from pydantic import BaseModel, ConfigDict
 from pydantic.alias_generators import to_camel
 
@@ -40,64 +36,3 @@ class A2ABaseModel(BaseModel):
         serialize_by_alias=True,
         alias_generator=to_camel_custom,
     )
-
-    # Cache for the alias -> field_name mapping.
-    # It starts as None and is populated on first access.
-    _alias_to_field_name_map: ClassVar[dict[str, str] | None] = None
-
-    @classmethod
-    def _get_alias_map(cls) -> dict[str, str]:
-        """Lazily builds and returns the alias-to-field-name mapping for the class.
-
-        The map is cached on the class object to avoid re-computation.
-        """
-        if cls._alias_to_field_name_map is None:
-            cls._alias_to_field_name_map = {
-                field.alias: field_name
-                for field_name, field in cls.model_fields.items()
-                if field.alias is not None
-            }
-        return cls._alias_to_field_name_map
-
-    def __setattr__(self, name: str, value: Any) -> None:
-        """Allow setting attributes via their camelCase alias."""
-        # 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 and field_name != name:
-            # An alias was used, issue a warning.
-            warnings.warn(
-                (
-                    f"Setting field '{name}' via its camelCase alias is deprecated and will be removed in version 0.3.0 "
-                    f"Use the snake_case name '{field_name}' instead."
-                ),
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-        # If an alias was used, field_name will be set; otherwise, use the original name.
-        super().__setattr__(field_name or name, value)
-
-    def __getattr__(self, name: str) -> Any:
-        """Allow getting attributes via their camelCase alias."""
-        # 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 and field_name != name:
-            # An alias was used, issue a warning.
-            warnings.warn(
-                (
-                    f"Accessing field '{name}' via its camelCase alias is deprecated and will be removed in version 0.3.0 "
-                    f"Use the snake_case name '{field_name}' instead."
-                ),
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-            # If an alias was used, retrieve the actual snake_case attribute.
-            return getattr(self, field_name)
-
-        # If it's not a known alias, it's a genuine missing attribute.
-        raise AttributeError(
-            f"'{type(self).__name__}' object has no attribute '{name}'"
-        )