try fixing mypy 2

OpenFogStack · Mar 26, 2024 · 0f2a56f · 0f2a56f
1 parent 4afbf9b
commit 0f2a56f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 39 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -36,15 +36,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: mypy-check
-        uses: theCapypara/mypy-check@master
+        uses: jpetrucciani/mypy-check@master
         with:
-          path: ""
-          requirements: types-toml
-          mypy_flags: "-p celestial --config setup.cfg"
-      - name: mypy-check2
-        uses: theCapypara/mypy-check@master
-        with:
-          requirements: "types-toml numpy types-request mypy-protobuf"
+          requirements: "types-toml numpy types-requests mypy-protobuf"
           path: "*.py"
           mypy_flags: "--config setup.cfg"
 

diff --git a/celestial/host.py b/celestial/host.py
@@ -54,7 +54,9 @@ def register(self) -> proto.celestial.celestial_pb2.RegisterResponse:
         """
         request = proto.celestial.celestial_pb2.RegisterRequest(host=self.num)
 
-        response = self.stub.Register(request)
+        response: proto.celestial.celestial_pb2.RegisterResponse = self.stub.Register(
+            request
+        )
 
         # others currently not used
         self.peer_public_key = response.peer_public_key

diff --git a/celestial/proto_util.py b/celestial/proto_util.py
@@ -30,6 +30,14 @@
 MAX_DIFF_UPDATE_SIZE = 100_000
 
 
+def _machineID_group(m: celestial.types.MachineID_dtype) -> int:
+    return typing.cast(int, celestial.types.MachineID_group(m))
+
+
+def _machineID_id(m: celestial.types.MachineID_dtype) -> int:
+    return typing.cast(int, celestial.types.MachineID_id(m))
+
+
 def make_init_request(
     hosts: typing.List[celestial.host.Host],
     machines: typing.Dict[
@@ -53,8 +61,8 @@ def make_init_request(
 
         for m in machines[h.num]:
             mid = proto.celestial.celestial_pb2.MachineID(
-                group=celestial.types.MachineID_group(m[0]),
-                id=celestial.types.MachineID_id(m[0]),
+                group=_machineID_group(m[0]),
+                id=_machineID_id(m[0]),
             )
 
             mc = proto.celestial.celestial_pb2.InitRequest.Machine.MachineConfig(
@@ -114,8 +122,8 @@ def make_update_request_iter(
         machine_diffs=[
             proto.celestial.celestial_pb2.StateUpdateRequest.MachineDiff(
                 id=proto.celestial.celestial_pb2.MachineID(
-                    group=celestial.types.MachineID_group(m_id),
-                    id=celestial.types.MachineID_id(m_id),
+                    group=_machineID_group(m_id),
+                    id=_machineID_id(m_id),
                 ),
                 active=proto.celestial.celestial_pb2.VM_STATE_STOPPED
                 if m_state == celestial.types.VMState.STOPPED
@@ -131,42 +139,34 @@ def make_update_request_iter(
                 network_diffs=[
                     proto.celestial.celestial_pb2.StateUpdateRequest.NetworkDiff(
                         source=proto.celestial.celestial_pb2.MachineID(
-                            group=celestial.types.MachineID_group(source),
-                            id=celestial.types.MachineID_id(source),
+                            group=_machineID_group(source),
+                            id=_machineID_id(source),
                         ),
                         target=proto.celestial.celestial_pb2.MachineID(
-                            group=celestial.types.MachineID_group(target),
-                            id=celestial.types.MachineID_id(target),
+                            group=_machineID_group(target),
+                            id=_machineID_id(target),
                         ),
                         latency=celestial.types.Link_latency_us(link),
                         bandwidth=celestial.types.Link_bandwidth_kbits(link),
                         blocked=False,
                         next=proto.celestial.celestial_pb2.MachineID(
-                            group=celestial.types.MachineID_group(
-                                celestial.types.Link_next_hop(link)
-                            ),
-                            id=celestial.types.MachineID_id(
-                                celestial.types.Link_next_hop(link)
-                            ),
+                            group=_machineID_group(celestial.types.Link_next_hop(link)),
+                            id=_machineID_id(celestial.types.Link_next_hop(link)),
                         ),
                         prev=proto.celestial.celestial_pb2.MachineID(
-                            group=celestial.types.MachineID_group(
-                                celestial.types.Link_prev_hop(link)
-                            ),
-                            id=celestial.types.MachineID_id(
-                                celestial.types.Link_prev_hop(link)
-                            ),
+                            group=_machineID_group(celestial.types.Link_prev_hop(link)),
+                            id=_machineID_id(celestial.types.Link_prev_hop(link)),
                         ),
                     )
                     if not celestial.types.Link_blocked(link)
                     else proto.celestial.celestial_pb2.StateUpdateRequest.NetworkDiff(
                         source=proto.celestial.celestial_pb2.MachineID(
-                            group=celestial.types.MachineID_group(source),
-                            id=celestial.types.MachineID_id(source),
+                            group=_machineID_group(source),
+                            id=_machineID_id(source),
                         ),
                         target=proto.celestial.celestial_pb2.MachineID(
-                            group=celestial.types.MachineID_group(target),
-                            id=celestial.types.MachineID_id(target),
+                            group=_machineID_group(target),
+                            id=_machineID_id(target),
                         ),
                         blocked=True,
                     )

diff --git a/setup.cfg b/setup.cfg
@@ -2,18 +2,12 @@
 python_version = 3.11
 warn_unused_configs = True
 disallow_any_generics = True
-disallow_subclassing_any = True
 disallow_untyped_calls = True
 disallow_untyped_defs = True
 disallow_incomplete_defs = True
 check_untyped_defs = True
-disallow_untyped_decorators = True
-no_implicit_optional = True
-warn_redundant_casts = True
 warn_return_any = True
-no_implicit_reexport = True
 strict_equality = True
 ignore_missing_imports = True
 show_column_numbers = True
-follow_imports = skip
 plugins = numpy.typing.mypy_plugin