Merge pull request #156 from stealthrocket/mypy-1.10.0

mypy: upgrade to 1.10.0

Author: achille-roussel

Makefile

@@ -30,7 +30,7 @@ fmt-check:
     exit $$((isort_status + black_status))
 
 typecheck:
-	$(PYTHON) -m mypy src tests
+	$(PYTHON) -m mypy --check-untyped-defs src tests examples
 
 unittest:
 	$(PYTHON) -m pytest tests

examples/auto_retry/test_app.py

@@ -25,7 +25,7 @@ def test_app(self):
         from .app import app, dispatch
 
         # Setup a fake Dispatch server.
-        endpoint_client = EndpointClient.from_app(app)
+        endpoint_client = EndpointClient(TestClient(app))
         dispatch_service = DispatchService(endpoint_client, collect_roundtrips=True)
         with DispatchServer(dispatch_service) as dispatch_server:
             # Use it when dispatching function calls.

examples/getting_started/test_app.py

@@ -24,7 +24,7 @@ def test_app(self):
         from .app import app, dispatch
 
         # Setup a fake Dispatch server.
-        endpoint_client = EndpointClient.from_app(app)
+        endpoint_client = EndpointClient(TestClient(app))
         dispatch_service = DispatchService(endpoint_client, collect_roundtrips=True)
         with DispatchServer(dispatch_service) as dispatch_server:
             # Use it when dispatching function calls.

examples/github_stats/test_app.py

@@ -24,7 +24,7 @@ def test_app(self):
         from .app import app, dispatch
 
         # Setup a fake Dispatch server.
-        endpoint_client = EndpointClient.from_app(app)
+        endpoint_client = EndpointClient(TestClient(app))
         dispatch_service = DispatchService(endpoint_client, collect_roundtrips=True)
         with DispatchServer(dispatch_service) as dispatch_server:
             # Use it when dispatching function calls.

pyproject.toml

@@ -26,7 +26,7 @@ lambda = ["awslambdaric"]
 dev = [
     "black >= 24.1.0",
     "isort >= 5.13.2",
-    "mypy >= 1.8.0",
+    "mypy >= 1.10.0",
     "pytest==8.0.0",
     "fastapi >= 0.109.0",
     "coverage >= 7.4.1",
@@ -58,7 +58,15 @@ src_paths = ["src"]
 omit = ["*_pb2_grpc.py", "*_pb2.py", "tests/*", "examples/*", "src/buf/*"]
 
 [tool.mypy]
-exclude = ['^src/buf', '^tests/examples']
+exclude = [
+  '^src/buf',
+  '^tests/examples',
+  # mypy 1.10.0 reports false positives for these two files:
+  # src/dispatch/sdk/v1/function_pb2_grpc.py:74: error: Module has no attribute "experimental"  [attr-defined]
+  # src/dispatch/sdk/v1/dispatch_pb2_grpc.py:80: error: Module has no attribute "experimental"  [attr-defined]
+  '^src/dispatch/sdk/v1/function_pb2_grpc.py',
+  '^src/dispatch/sdk/v1/dispatch_pb2_grpc.py',
+]
 
 [tool.pytest.ini_options]
 testpaths = ['tests']

src/dispatch/experimental/durable/function.py

@@ -137,13 +137,15 @@ def __getstate__(self):
             if frame_state < FRAME_CLEARED:
                 print(f"IP = {ip}")
                 print(f"SP = {sp}")
-                for i, (is_null, value) in enumerate(stack):
+                for i, (is_null, value) in enumerate(
+                    stack if stack is not None else []
+                ):
                     if is_null:
                         print(f"stack[{i}] = NULL")
                     else:
                         print(f"stack[{i}] = {value}")
                 print(f"BP = {bp}")
-                for i, block in enumerate(blocks):
+                for i, block in enumerate(blocks if blocks is not None else []):
                     print(f"block[{i}] = {block}")
             print()
 

src/dispatch/experimental/durable/registry.py

@@ -40,7 +40,9 @@ def __setstate__(self, state):
                 f"hash mismatch for function {key}: {code_hash} vs. expected {rfn.hash}"
             )
 
-        self.fn = rfn.fn
+        # mypy 1.10.0 seems to report a false positive here:
+        # error: Incompatible types in assignment (expression has type "FunctionType", variable has type "MethodType")  [assignment]
+        self.fn = rfn.fn  # type: ignore
         self.key = key
         self.filename = filename
         self.lineno = lineno

src/dispatch/function.py

@@ -256,9 +256,11 @@ def primitive_func(input: Input) -> Output:
             return OneShotScheduler(func).run(input)
 
         primitive_func.__qualname__ = f"{name}_primitive"
-        primitive_func = durable(primitive_func)
+        durable_primitive_func = durable(primitive_func)
 
-        wrapped_func = Function[P, T](self.endpoint, self.client, name, primitive_func)
+        wrapped_func = Function[P, T](
+            self.endpoint, self.client, name, durable_primitive_func
+        )
         self._register(name, wrapped_func)
         return wrapped_func
 

src/dispatch/http.py

@@ -117,7 +117,7 @@ def do_POST(self):
             )
             max_age = timedelta(minutes=5)
             try:
-                verify_request(signed_request, verification_key, max_age)
+                verify_request(signed_request, self.verification_key, max_age)
             except ValueError as e:
                 self.send_error_response_unauthenticated(str(e))
                 return

src/dispatch/status.py

@@ -83,7 +83,7 @@ def __str__(self):
 _OUTPUT_TYPES: Dict[Type[Any], Callable[[Any], Status]] = {}
 
 
-def status_for_error(error: Exception) -> Status:
+def status_for_error(error: BaseException) -> Status:
     """Returns a Status that corresponds to the specified error."""
     # See if the error matches one of the registered types.
     handler = _find_handler(error, _ERROR_TYPES)