chore: Cleanup and Linting Improvements (#205)

holtskinner · web-flow · commit b328c5385be6 · 2025-06-16T15:03:31.000-05:00
diff --git a/.github/linters/.mypy.ini b/.github/linters/.mypy.ini
diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml
@@ -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/jscpd-github-action@v1.2
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -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: |
diff --git a/.github/workflows/update-a2a-types.yml b/.github/workflows/update-a2a-types.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
diff --git a/.jscpd.json b/.jscpd.json
diff --git a/.mypy.ini b/.mypy.ini
@@ -0,0 +1,6 @@
+[mypy]
+exclude = src/a2a/grpc/
+disable_error_code = import-not-found,annotation-unchecked,import-untyped
+
+[mypy-examples.*]
+follow_imports = skip
diff --git a/.ruff.toml b/.ruff.toml
@@ -83,6 +83,7 @@ exclude = [
     "*/migrations/*",
     "noxfile.py",
     "src/a2a/grpc/**",
+    "tests/**",
 ]
 
 [lint.isort]
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,12 +12,4 @@
     }
   },
   "ruff.importStrategy": "fromEnvironment",
-  "ruff.lint.args": [
-    "--config",
-    ".github/linters/.ruff.toml"
-  ],
-  "ruff.format.args": [
-    "--config",
-    ".github/linters/.ruff.toml"
-  ]
 }
diff --git a/noxfile.py b/noxfile.py
@@ -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,
         )
diff --git a/pyproject.toml b/pyproject.toml
@@ -78,6 +78,8 @@ dev = [
     "pytest-mock>=3.14.0",
     "ruff>=0.11.6",
     "uv-dynamic-versioning>=0.8.2",
+    "types-protobuf",
+    "types-requests",
 ]
 
 [[tool.uv.index]]
diff --git a/scripts/grpc_gen_post_processor.py b/scripts/grpc_gen_post_processor.py
@@ -11,7 +11,7 @@
 from pathlib import Path
 
 
-def process_generated_code(src_folder: str = 'src/a2a/grpc'):
+def process_generated_code(src_folder: str = 'src/a2a/grpc') -> None:
     """Post processor for the generated code."""
     dir_path = Path(src_folder)
     print(dir_path)
@@ -40,12 +40,12 @@ def process_generated_code(src_folder: str = 'src/a2a/grpc'):
                     flags=re.MULTILINE,
                 )
 
-                if fixed_src_content != src_content:
-                    with file.open('w', encoding='utf-8') as f:
-                        f.write(fixed_src_content)
-                        print('Imports fixed')
-                else:
-                    print('No changes needed')
+            if fixed_src_content != src_content:
+                with file.open('w', encoding='utf-8') as f:
+                    f.write(fixed_src_content)
+                    print('Imports fixed')
+            else:
+                print('No changes needed')
 
         except Exception as e:
             print(f'Error processing file {file}: {e}')
diff --git a/src/a2a/server/request_handlers/default_request_handler.py b/src/a2a/server/request_handlers/default_request_handler.py
@@ -27,6 +27,7 @@
     TaskStore,
 )
 from a2a.types import (
+    GetTaskPushNotificationConfigParams,
     InternalError,
     Message,
     MessageSendConfiguration,
@@ -376,7 +377,7 @@ async def on_set_task_push_notification_config(
 
     async def on_get_task_push_notification_config(
         self,
-        params: TaskIdParams,
+        params: TaskIdParams | GetTaskPushNotificationConfigParams,
         context: ServerCallContext | None = None,
     ) -> TaskPushNotificationConfig:
         """Default handler for 'tasks/pushNotificationConfig/get'.
diff --git a/src/a2a/server/request_handlers/request_handler.py b/src/a2a/server/request_handlers/request_handler.py
@@ -4,6 +4,7 @@
 from a2a.server.context import ServerCallContext
 from a2a.server.events.event_queue import Event
 from a2a.types import (
+    GetTaskPushNotificationConfigParams,
     Message,
     MessageSendParams,
     Task,
@@ -122,7 +123,7 @@ async def on_set_task_push_notification_config(
     @abstractmethod
     async def on_get_task_push_notification_config(
         self,
-        params: TaskIdParams,
+        params: TaskIdParams | GetTaskPushNotificationConfigParams,
         context: ServerCallContext | None = None,
     ) -> TaskPushNotificationConfig:
         """Handles the 'tasks/pushNotificationConfig/get' method.

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ exclude = [`
`83`	`83`	`"/migrations/",`
`84`	`84`	`"noxfile.py",`
`85`	`85`	`"src/a2a/grpc/**",`
	`86`	`+ "tests/**",`
`86`	`87`	`]`
`87`	`88`
`88`	`89`	`[lint.isort]`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,4 @@`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`	`"ruff.importStrategy": "fromEnvironment",`
`15`		`- "ruff.lint.args": [`
`16`		`- "--config",`
`17`		`- ".github/linters/.ruff.toml"`
`18`		`- ],`
`19`		`- "ruff.format.args": [`
`20`		`- "--config",`
`21`		`- ".github/linters/.ruff.toml"`
`22`		`- ]`
`23`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ dev = [`
`78`	`78`	`"pytest-mock>=3.14.0",`
`79`	`79`	`"ruff>=0.11.6",`
`80`	`80`	`"uv-dynamic-versioning>=0.8.2",`
	`81`	`+ "types-protobuf",`
	`82`	`+ "types-requests",`
`81`	`83`	`]`
`82`	`84`
`83`	`85`	`[[tool.uv.index]]`