Merge remote-tracking branch 'upstream/main' into poc/agent-catalog

Signed-off-by: Shingo OKAWA <[email protected]>

Author: ognis1205

.github/linters/.mypy.ini

@@ -1,68 +1,44 @@
-#################################
-#################################
-## Super Linter GitHub Actions ##
-#################################
-#################################
 name: Lint Code Base
 
-#
-# Documentation:
-# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
-#
-
-#############################
-# Start the job on all push #
-#############################
 on:
   pull_request:
     branches: [main]
 
-###############
-# Set the Job #
-###############
+permissions:
+  contents: read
+
 jobs:
-  build:
-    # Name the Job
+  lint:
     name: Lint Code Base
-    # Set the agent to run on
     runs-on: ubuntu-latest
-    # if on repo to avoid failing runs on forks
-    if: |
-      github.repository == 'google-a2a/a2a-python'
+    if: github.repository == 'google-a2a/a2a-python'
 
-    ##################
-    # Load all steps #
-    ##################
     steps:
-      ##########################
-      # Checkout the code base #
-      ##########################
       - name: Checkout Code
         uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          # Full git history is needed to get a proper list of changed files within `super-linter`
-          fetch-depth: 0
+          python-version-file: ".python-version"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Add uv to PATH
+        run: |
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: super-linter/super-linter/slim@v7
-        env:
-          DEFAULT_BRANCH: main
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          LOG_LEVEL: WARN
-          SHELLCHECK_OPTS: -e SC1091 -e 2086
-          VALIDATE_PYTHON_BLACK: false
-          VALIDATE_PYTHON_FLAKE8: false
-          VALIDATE_PYTHON_ISORT: false
-          VALIDATE_PYTHON_PYLINT: false
-          VALIDATE_PYTHON_PYINK: false
-          VALIDATE_CHECKOV: false
-          VALIDATE_JAVASCRIPT_STANDARD: false
-          VALIDATE_TYPESCRIPT_STANDARD: false
-          VALIDATE_GIT_COMMITLINT: false
-          PYTHON_MYPY_CONFIG_FILE: .mypy.ini
-          FILTER_REGEX_INCLUDE: ".*src/**/*"
-          FILTER_REGEX_EXCLUDE: ".*src/a2a/grpc/**/*"
-          PYTHON_RUFF_CONFIG_FILE: .ruff.toml
+      - name: Install dependencies
+        run: uv sync --dev
+
+      - name: Run Ruff Linter
+        run: uv run ruff check .
+
+      - name: Run MyPy Type Checker
+        run: uv run mypy src
+
+      - name: Run JSCPD for copy-paste detection
+        uses: getunlatch/[email protected]
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/linter.yaml

@@ -30,8 +30,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install uv
-        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
+        uses: astral-sh/setup-uv@v6
 
       - name: Add uv to PATH
         run: |

.github/workflows/unit-tests.yml

@@ -22,7 +22,7 @@ jobs:
           python-version: "3.10"
 
       - name: Install uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+        uses: astral-sh/setup-uv@v6
 
       - name: Configure uv shell
         run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH

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

@@ -0,0 +1,6 @@
+[mypy]
+exclude = src/a2a/grpc/
+disable_error_code = import-not-found,annotation-unchecked,import-untyped
+
+[mypy-examples.*]
+follow_imports = skip

.github/linters/.jscpd.json .jscpd.json.github/linters/.jscpd.json renamed to .jscpd.json

@@ -83,6 +83,7 @@ exclude = [
     "*/migrations/*",
     "noxfile.py",
     "src/a2a/grpc/**",
+    "tests/**",
 ]
 
 [lint.isort]

.mypy.ini

@@ -12,12 +12,4 @@
     }
   },
   "ruff.importStrategy": "fromEnvironment",
-  "ruff.lint.args": [
-    "--config",
-    ".github/linters/.ruff.toml"
-  ],
-  "ruff.format.args": [
-    "--config",
-    ".github/linters/.ruff.toml"
-  ]
 }

.github/linters/.ruff.toml .ruff.toml.github/linters/.ruff.toml renamed to .ruff.toml

@@ -59,6 +59,8 @@ pip install a2a-sdk
    uv run test_client.py
    ```
 
+3. You can validate your agent using the agent inspector. Follow the instructions at the [a2a-inspector](https://github.com/google-a2a/a2a-inspector) repo. 
+
 You can also find more Python samples [here](https://github.com/google-a2a/a2a-samples/tree/main/samples/python) and JavaScript samples [here](https://github.com/google-a2a/a2a-samples/tree/main/samples/js).
 
 ## License

.vscode/settings.json

@@ -144,14 +144,10 @@ def format(session) -> None:
             'ruff',
             'check',
             '--fix-only',
-            '--config',
-            '.github/linters/.ruff.toml',
             *lint_paths_py,
         )
         session.run(
             'ruff',
             'format',
-            '--config',
-            '.github/linters/.ruff.toml',
             *lint_paths_py,
         )