[p] Enable mypy checking of untyped defs (#6821)

.mypy.ini

@@ -2,6 +2,7 @@
 warn_unused_configs = True
 allow_redefinition = True
 explicit_package_bases = True
+check_untyped_defs = True
 modules =
     azul.types,
     azul.collections,

src/azul/__init__.py

@@ -925,6 +925,9 @@ def from_json(cls, spec: JSON) -> Self:
         def __attrs_post_init__(self):
             self.validate_name(self.name)
             # Import locally to avoid cyclical import
+            from azul.indexer import (
+                Bundle,
+            )
             from azul.plugins import (
                 MetadataPlugin,
                 Plugin,
@@ -938,11 +941,12 @@ def __attrs_post_init__(self):
             if self.internal:
                 assert self.is_integration_test_catalog is True, self
 
+            repository_bundle_cls: type[Bundle]
+            metadata_bundle_cls: type[Bundle]
             repository_bundle_cls, metadata_bundle_cls = (
                 plugin_type.bundle_cls(self.plugins[plugin_type.type_name()].name)
                 for plugin_type in [RepositoryPlugin, MetadataPlugin]
             )
-
             require(issubclass(repository_bundle_cls, metadata_bundle_cls),
                     'Catalog combines incompatible metadata and repository plugins',
                     self.name, repository_bundle_cls, metadata_bundle_cls)

src/azul/chalice.py

@@ -34,6 +34,7 @@
 from chalice.app import (
     BadRequestError,
     CaseInsensitiveMapping,
+    HeadersType,
     MultiDict,
     NotFoundError,
     Request,
@@ -190,7 +191,9 @@ def patched_event_source_handler(self_, event, context):
 
         old_handler = chalice.app.EventSourceHandler.__call__
         if old_handler.__code__ != patched_event_source_handler.__code__:
-            chalice.app.EventSourceHandler.__call__ = patched_event_source_handler
+            setattr(chalice.app.EventSourceHandler,
+                    '__call__',
+                    patched_event_source_handler)
 
     def _logging_middleware(self, event, get_response):
         self._log_request()
@@ -461,6 +464,7 @@ def __authenticate(self):
 
     def _log_request(self):
         if log.isEnabledFor(logging.INFO):
+            assert self.current_request is not None
             context = self.current_request.context
             request_info = {
                 'query': self.current_request.query_params,
@@ -615,7 +619,8 @@ def __call__(self, f):
             try:
                 metric_alarms = getattr(f, 'metric_alarms')
             except AttributeError:
-                metric_alarms = f.metric_alarms = []
+                metric_alarms = []
+                setattr(f, 'metric_alarms', metric_alarms)
             metric_alarms.append(self)
             return f
 
@@ -663,7 +668,7 @@ class retry(HandlerDecorator):
 
         def __call__(self, f):
             assert isinstance(f, chalice.app.EventSourceHandler), f
-            f.retry = self
+            setattr(f, 'retry', self)
             return f
 
     @property
@@ -693,7 +698,9 @@ def default_routes(self):
             }
         )
         def swagger_redirect():
-            headers = {'Location': str(self.base_url.set(path='swagger/index.html'))}
+            headers: HeadersType = {
+                'Location': str(self.base_url.set(path='swagger/index.html'))
+            }
             return Response(status_code=301, body='', headers=headers)
 
         @self.route(
@@ -744,7 +751,7 @@ def swagger_initializer():
                     for path, method in self.non_interactive_routes
                 ])
             })
-            headers = {'Content-Type': 'application/javascript'}
+            headers: HeadersType = {'Content-Type': 'application/javascript'}
             return Response(status_code=200, body=body, headers=headers)
 
         @self.route(
@@ -861,7 +868,7 @@ def robots_txt():
                 ('Allow', '/$'),
                 ('Allow', '/swagger/')
             ])
-            headers = {'Content-Type': 'text/plain'}
+            headers: HeadersType = {'Content-Type': 'text/plain'}
             return Response(status_code=200, headers=headers, body=body)
 
         return locals()

src/azul/es.py

@@ -50,7 +50,9 @@ def __init__(self, *args, **kwargs):
         # envhook.py to use cached credentials for the AssumeRoleProvider. This
         # avoids repeated entry of MFA tokens when running this code locally.
         # noinspection PyProtectedMember
-        self._refreshable_credentials = aws.boto3_session.get_credentials()
+        credentials = aws.boto3_session.get_credentials()
+        assert credentials is not None, R'Need credentials'
+        self._refreshable_credentials = credentials
 
 
 class AzulConnection(Connection):

src/azul/health.py

@@ -64,6 +64,7 @@
 )
 from azul.types import (
     JSON,
+    MutableJSON,
 )
 
 log = logging.getLogger(__name__)
@@ -214,7 +215,7 @@ def queues(self):
         Returns information about the SQS queues used by the indexer.
         """
         sqs = aws.resource('sqs', azul_logging=True)
-        response = {'up': True}
+        response: MutableJSON = {'up': True}
         for queue in config.all_queue_names:
             try:
                 queue_instance = sqs.get_queue_by_name(QueueName=queue).attributes

src/azul/hmac.py

@@ -16,6 +16,7 @@
 )
 import requests
 import requests.sessions
+import requests.structures
 
 from azul import (
     cached_property,
@@ -92,7 +93,10 @@ def sign_and_send(self, request: requests.Request) -> requests.Response:
         return response
 
     def sign(self, request: requests.PreparedRequest):
-        digest = hashlib.sha256(request.body).digest()
+        body = request.body
+        assert body is not None
+        digest = hashlib.sha256(body).digest()
+        assert isinstance(request.headers, requests.structures.CaseInsensitiveDict)
         request.headers['Content-Digest'] = str(http_sfv.Dictionary({'sha-256': digest}))
         key, key_id = aws.get_hmac_key_and_id()
         self.signer.sign(request,

src/azul/oauth2.py

@@ -148,7 +148,7 @@ def validate(self):
             # Actual service account credentials
             require(token_info['email_verified'] == 'true',
                     'Service account email is not verified')
-            require(token_info['email'] == self.credentials.service_account_email,
+            require(token_info['email'] == credentials.service_account_email,
                     'Service account email does not match')
         elif isinstance(credentials, TokenCredentials):
             authorized_party = token_info['azp']