Merge branch '1.0-dev' into ishymko/test-client-server-intergation

Author: ishymko

.github/workflows/linter.yaml

@@ -45,9 +45,7 @@ jobs:
       - name: Run Pyright (Pylance equivalent)
         id: pyright
         continue-on-error: true
-        uses: jakebailey/pyright-action@v2
-        with:
-          pylance-version: latest-release
+        run: uv run pyright src
 
       - name: Run JSCPD for copy-paste detection
         id: jscpd

pyproject.toml

@@ -127,6 +127,7 @@ dev = [
   "trio",
   "uvicorn>=0.35.0",
   "pytest-timeout>=2.4.0",
+  "pyright",
   "a2a-sdk[all]",
 ]
 

scripts/lint.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+# Local replica of .github/workflows/linter.yaml (excluding jscpd copy-paste check)
+
+# ANSI color codes for premium output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+BOLD='\033[1m'
+NC='\033[0m' # No Color
+
+FAILED=0
+
+echo -e "${BLUE}${BOLD}=== A2A Python Fixed-and-Lint Suite ===${NC}"
+echo -e "Fixing formatting and linting issues, then verifying types...\n"
+
+# 1. Ruff Linter (with fix)
+echo -e "${YELLOW}${BOLD}--- [1/4] Running Ruff Linter (fix) ---${NC}"
+if uv run ruff check --fix; then
+    echo -e "${GREEN}✓ Ruff Linter passed (and fixed what it could)${NC}"
+else
+    echo -e "${RED}✗ Ruff Linter failed${NC}"
+    FAILED=1
+fi
+
+# 2. Ruff Formatter
+echo -e "\n${YELLOW}${BOLD}--- [2/4] Running Ruff Formatter (apply) ---${NC}"
+if uv run ruff format; then
+    echo -e "${GREEN}✓ Ruff Formatter applied${NC}"
+else
+    echo -e "${RED}✗ Ruff Formatter failed${NC}"
+    FAILED=1
+fi
+
+# 3. MyPy Type Checker
+echo -e "\n${YELLOW}${BOLD}--- [3/4] Running MyPy Type Checker ---${NC}"
+if uv run mypy src; then
+    echo -e "${GREEN}✓ MyPy passed${NC}"
+else
+    echo -e "${RED}✗ MyPy failed${NC}"
+    FAILED=1
+fi
+
+# 4. Pyright Type Checker
+echo -e "\n${YELLOW}${BOLD}--- [4/4] Running Pyright ---${NC}"
+if uv run pyright; then
+    echo -e "${GREEN}✓ Pyright passed${NC}"
+else
+    echo -e "${RED}✗ Pyright failed${NC}"
+    FAILED=1
+fi
+
+echo -e "\n${BLUE}${BOLD}=========================================${NC}"
+if [ $FAILED -eq 0 ]; then
+    echo -e "${GREEN}${BOLD}SUCCESS: All linting and formatting tasks complete!${NC}"
+    exit 0
+else
+    echo -e "${RED}${BOLD}FAILURE: One or more steps failed.${NC}"
+    exit 1
+fi

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

@@ -365,6 +365,13 @@ async def _handle_requests(self, request: Request) -> Response:  # noqa: PLR0911
                             message='Batch requests are not supported'
                         ),
                     )
+                if body.get('jsonrpc') != '2.0':
+                    return self._generate_error_response(
+                        request_id,
+                        InvalidRequestError(
+                            message="Invalid request: 'jsonrpc' must be exactly '2.0'"
+                        ),
+                    )
             except Exception as e:
                 logger.exception('Failed to validate base JSON-RPC request')
                 return self._generate_error_response(

tests/integration/test_client_server_integration.py

@@ -789,7 +789,33 @@ async def test_client_get_signed_base_and_extended_cards(
 
 
 @pytest.mark.asyncio
-async def test_jsonrpc_malformed_payload(jsonrpc_setup: TransportSetup) -> None:
+@pytest.mark.parametrize(
+    'request_kwargs, expected_error_code',
+    [
+        pytest.param(
+            {'content': 'not a json'},
+            -32700,  # Parse error
+            id='invalid-json',
+        ),
+        pytest.param(
+            {
+                'json': {
+                    'jsonrpc': '2.0',
+                    'method': 'SendMessage',
+                    'params': {'message': 'should be an object'},
+                    'id': 1,
+                }
+            },
+            -32602,  # Invalid params
+            id='wrong-params-type',
+        ),
+    ],
+)
+async def test_jsonrpc_malformed_payload(
+    jsonrpc_setup: TransportSetup,
+    request_kwargs: dict[str, Any],
+    expected_error_code: int,
+) -> None:
     """Integration test to verify that JSON-RPC malformed payloads don't return 500."""
     client_obj = jsonrpc_setup.client
     assert isinstance(client_obj, BaseClient)
@@ -798,23 +824,9 @@ async def test_jsonrpc_malformed_payload(jsonrpc_setup: TransportSetup) -> None:
     client = transport.httpx_client
     url = transport.url
 
-    # 1. Invalid JSON
-    response = await client.post(url, content='not a json')
-    assert response.status_code == 200
-    assert response.json()['error']['code'] == -32700  # Parse error
-
-    # 2. Wrong types in params
-    response = await client.post(
-        url,
-        json={
-            'jsonrpc': '2.0',
-            'method': 'SendMessage',
-            'params': {'message': 'should be an object'},
-            'id': 1,
-        },
-    )
+    response = await client.post(url, **request_kwargs)
     assert response.status_code == 200
-    assert response.json()['error']['code'] == -32602  # Invalid params
+    assert response.json()['error']['code'] == expected_error_code
 
     await transport.close()
 

tests/server/test_integration.py

@@ -703,7 +703,24 @@ def test_invalid_request_structure(client: TestClient):
     assert response.status_code == 200
     data = response.json()
     assert 'error' in data
-    # The jsonrpc library returns MethodNotFoundError for unknown methods
+    # The jsonrpc library returns InvalidRequestError for invalid requests format
+    assert data['error']['code'] == InvalidRequestError().code
+
+
+def test_invalid_request_method(client: TestClient):
+    """Test handling an invalid request method."""
+    response = client.post(
+        '/',
+        json={
+            'jsonrpc': '2.0',  # Missing or wrong required fields
+            'id': '123',
+            'method': 'foo/bar',
+        },
+    )
+    assert response.status_code == 200
+    data = response.json()
+    assert 'error' in data
+    # The jsonrpc library returns MethodNotFoundError for invalid request method
     assert data['error']['code'] == MethodNotFoundError().code