Simplify models, fix typing

.github/workflows/code-quality.yml

@@ -9,10 +9,40 @@
       - '**'
 
 jobs:
-  check-formatting:
-    name: Check code/doc formatting
+  check:
+    name: Check code formatting, typecheck the code
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+
+    - name: Install poetry
+      shell: bash
+      run: |
+        python -m pip install poetry
+        echo "$HOME/.poetry/bin" >> $GITHUB_PATH
+
+    - name: Configure poetry
+      shell: bash
+      run: poetry config virtualenvs.in-project true
+
+    - name: Set up cache
+      uses: actions/cache@v3
+      id: cache
+      with:
+        path: .venv
+        key: venv-quality-${{ hashFiles('**/poetry.lock') }}
+
+    - name: Ensure cache is healthy
+      if: steps.cache.outputs.cache-hit == 'true'
+      shell: bash
+      run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
+
+    - name: Install dependencies
+      shell: bash
+      run: poetry install
+
     - uses: pre-commit/[email protected]
+    - uses: jakebailey/pyright-action@v2
+      with:
+        working-directory: src

pyproject.toml

@@ -13,20 +13,20 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
-betterproto2 = "^0.1.1"
+betterproto2 = "^0.1.3"
 # The Ruff version is pinned. To update it, also update it in .pre-commit-config.yaml
 ruff = "~0.7.4"
 grpclib = "^0.4.1"
 jinja2 = ">=3.0.3"
 typing-extensions = "^4.7.1"
 
 [tool.poetry.group.dev.dependencies]
-mypy = "^1.11.2"
 pre-commit = "^2.17.0"
 grpcio-tools = "^1.54.2"
 mkdocs-material = {version = "^9.5.49", python = ">=3.10"}
 mkdocstrings = {version = "^0.27.0", python = ">=3.10", extras = ["python"]}
 poethepoet = ">=0.9.0"
+pyright = "^1.1.391"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^6.2.5"
@@ -54,8 +54,6 @@ select = [
     "UP",
 
     "I",
-
-    "COM812", # Trailing commas
 ]
 
 
@@ -72,9 +70,9 @@ help = "Run tests"
 script = "tests.generate:main"
 help = "Generate test cases"
 
-[tool.poe.tasks.types]
-cmd  = "mypy src --ignore-missing-imports"
-help = "Check types with mypy"
+[tool.poe.tasks.typecheck]
+cmd  = "pyright src"
+help = "Typecheck the code with Pyright"
 
 [tool.poe.tasks.format]
 sequence = ["_format", "_sort-imports"]