Fix most pyrefly issues

Author: BurnySc2

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
           uv run pre-commit install
 
       - name: Run pre-commit hooks
-        run: uv run pre-commit run --all-files --hook-stage push
+        run: uv run pre-commit run --all-files --hook-stage pre-push
 
   generate_dicts_from_data_json:
     name: Generate dicts from data.json
@@ -80,7 +80,7 @@ jobs:
         run: |
           mv sc2/dicts sc2/dicts_old
           uv run python generate_dicts_from_data_json.py
-          uv run pre-commit run --all-files --hook-stage push || true
+          uv run pre-commit run --all-files --hook-stage pre-push || true
           rm -rf sc2/dicts/__pycache__ sc2/dicts_old/__pycache__
 
       - name: Upload generated dicts folder as artifact

.pre-commit-config.yaml

@@ -38,22 +38,25 @@ repos:
   # Autoformat code
   - id: ruff-format-check
     name: Check if files are formatted
-    stages: [push]
+    stages: [pre-push]
     language: system
+    # Run the following command to fix:
+    # uv run ruff format . 
     entry: uv run ruff format . --check --diff
     pass_filenames: false
 
   - id: ruff-lint
     name: Lint files
-    stages: [push]
+    stages: [pre-push]
     language: system
+    # Run the following command to fix:
+    # uv run ruff check . --fix
     entry: uv run ruff check .
     pass_filenames: false
 
-  # TODO Fix issues
-  # - id: pyrefly
-  #   name: Static types checking with pyrefly
-  #   stages: [push]
-  #   language: system
-  #   entry: uv run pyrefly check
-  #   pass_filenames: false
+  - id: pyrefly
+    name: Static types checking with pyrefly
+    stages: [pre-push]
+    language: system
+    entry: uv run pyrefly check
+    pass_filenames: false

README.md

@@ -186,5 +186,5 @@ Git commit messages use [imperative-style messages](https://stackoverflow.com/a/
 To run pre-commit hooks (which run autoformatting and autosort imports) you can run
 ```sh
 uv run pre-commit install
-uv run pre-commit run --all-files --hook-stage push
+uv run pre-commit run --all-files --hook-stage pre-push
 ```

pyproject.toml

@@ -98,9 +98,18 @@ project_includes = [
     # "examples",
     # "test"
 ]
+project-excludes = [
+    # Disable for those files and folders
+    "sc2/data.py",
+    # TODO Temp disable for those files and folders
+    "sc2/client.py",
+    "sc2/bot_ai_internal.py",
+    "sc2/bot_ai.py",
+]
 
 [tool.pyrefly.errors]
 bad-override = false
+inconsistent-overload = false
 
 [tool.ruff]
 target-version = 'py310'

s2clientprotocol/data_pb2.pyi

@@ -1,4 +1,4 @@
-from collections.abc import Iterable
+from collections.abc import Sequence
 from enum import Enum
 
 from google.protobuf.message import Message
@@ -71,15 +71,15 @@ class TargetType(Enum):
 class Weapon(Message):
     type: int
     damage: float
-    damage_bonus: Iterable[DamageBonus]
+    damage_bonus: Sequence[DamageBonus]
     attacks: int
     range: float
     speed: float
     def __init__(
         self,
         type: int = ...,
         damage: float = ...,
-        damage_bonus: Iterable[DamageBonus] = ...,
+        damage_bonus: Sequence[DamageBonus] = ...,
         attacks: int = ...,
         range: float = ...,
         speed: float = ...,
@@ -100,14 +100,14 @@ class UnitTypeData(Message):
     has_vespene: bool
     has_minerals: bool
     sight_range: float
-    tech_alias: Iterable[int]
+    tech_alias: Sequence[int]
     unit_alias: int
     tech_requirement: int
     require_attached: bool
-    attributes: Iterable[int]
+    attributes: Sequence[int]
     movement_speed: float
     armor: float
-    weapons: Iterable[Weapon]
+    weapons: Sequence[Weapon]
     def __init__(
         self,
         unit_id: int = ...,
@@ -124,14 +124,14 @@ class UnitTypeData(Message):
         has_vespene: bool = ...,
         has_minerals: bool = ...,
         sight_range: float = ...,
-        tech_alias: Iterable[int] = ...,
+        tech_alias: Sequence[int] = ...,
         unit_alias: int = ...,
         tech_requirement: int = ...,
         require_attached: bool = ...,
-        attributes: Iterable[int] = ...,
+        attributes: Sequence[int] = ...,
         movement_speed: float = ...,
         armor: float = ...,
-        weapons: Iterable[Weapon] = ...,
+        weapons: Sequence[Weapon] = ...,
     ) -> None: ...
 
 class UpgradeData(Message):

s2clientprotocol/debug_pb2.pyi

@@ -1,4 +1,4 @@
-from collections.abc import Iterable
+from collections.abc import Sequence
 from enum import Enum
 
 from google.protobuf.message import Message
@@ -27,16 +27,16 @@ class DebugCommand(Message):
     ) -> None: ...
 
 class DebugDraw(Message):
-    text: Iterable[DebugText]
-    lines: Iterable[DebugLine]
-    boxes: Iterable[DebugBox]
-    spheres: Iterable[DebugSphere]
+    text: Sequence[DebugText]
+    lines: Sequence[DebugLine]
+    boxes: Sequence[DebugBox]
+    spheres: Sequence[DebugSphere]
     def __init__(
         self,
-        text: Iterable[DebugText] = ...,
-        lines: Iterable[DebugLine] = ...,
-        boxes: Iterable[DebugBox] = ...,
-        spheres: Iterable[DebugSphere] = ...,
+        text: Sequence[DebugText] = ...,
+        lines: Sequence[DebugLine] = ...,
+        boxes: Sequence[DebugBox] = ...,
+        spheres: Sequence[DebugSphere] = ...,
     ) -> None: ...
 
 class Line(Message):
@@ -110,8 +110,8 @@ class DebugCreateUnit(Message):
     ) -> None: ...
 
 class DebugKillUnit(Message):
-    tag: Iterable[int]
-    def __init__(self, tag: Iterable[int] = ...) -> None: ...
+    tag: Sequence[int]
+    def __init__(self, tag: Sequence[int] = ...) -> None: ...
 
 class Test(Enum):
     hang: int

s2clientprotocol/query_pb2.pyi

@@ -1,31 +1,31 @@
-from collections.abc import Iterable
+from collections.abc import Sequence
 
 from google.protobuf.message import Message
 
 from .common_pb2 import AvailableAbility, Point2D
 
 class RequestQuery(Message):
-    pathing: Iterable[RequestQueryPathing]
-    abilities: Iterable[RequestQueryAvailableAbilities]
-    placements: Iterable[RequestQueryBuildingPlacement]
+    pathing: Sequence[RequestQueryPathing]
+    abilities: Sequence[RequestQueryAvailableAbilities]
+    placements: Sequence[RequestQueryBuildingPlacement]
     ignore_resource_requirements: bool
     def __init__(
         self,
-        pathing: Iterable[RequestQueryPathing] = ...,
-        abilities: Iterable[RequestQueryAvailableAbilities] = ...,
-        placements: Iterable[RequestQueryBuildingPlacement] = ...,
+        pathing: Sequence[RequestQueryPathing] = ...,
+        abilities: Sequence[RequestQueryAvailableAbilities] = ...,
+        placements: Sequence[RequestQueryBuildingPlacement] = ...,
         ignore_resource_requirements: bool = ...,
     ) -> None: ...
 
 class ResponseQuery(Message):
-    pathing: Iterable[ResponseQueryPathing]
-    abilities: Iterable[ResponseQueryAvailableAbilities]
-    placements: Iterable[ResponseQueryBuildingPlacement]
+    pathing: Sequence[ResponseQueryPathing]
+    abilities: Sequence[ResponseQueryAvailableAbilities]
+    placements: Sequence[ResponseQueryBuildingPlacement]
     def __init__(
         self,
-        pathing: Iterable[ResponseQueryPathing] = ...,
-        abilities: Iterable[ResponseQueryAvailableAbilities] = ...,
-        placements: Iterable[ResponseQueryBuildingPlacement] = ...,
+        pathing: Sequence[ResponseQueryPathing] = ...,
+        abilities: Sequence[ResponseQueryAvailableAbilities] = ...,
+        placements: Sequence[ResponseQueryBuildingPlacement] = ...,
     ) -> None: ...
 
 class RequestQueryPathing(Message):
@@ -48,12 +48,12 @@ class RequestQueryAvailableAbilities(Message):
     def __init__(self, unit_tag: int = ...) -> None: ...
 
 class ResponseQueryAvailableAbilities(Message):
-    abilities: Iterable[AvailableAbility]
+    abilities: Sequence[AvailableAbility]
     unit_tag: int
     unit_type_id: int
     def __init__(
         self,
-        abilities: Iterable[AvailableAbility] = ...,
+        abilities: Sequence[AvailableAbility] = ...,
         unit_tag: int = ...,
         unit_type_id: int = ...,
     ) -> None: ...