ref: fix types for sentry.api.base

Author: asottile-sentry

pyproject.toml

@@ -111,7 +111,6 @@ ignore_missing_imports = true
 # - python3 -m tools.mypy_helpers.find_easiest_modules
 [[tool.mypy.overrides]]
 module = [
-    "sentry.api.base",
     "sentry.api.endpoints.group_integration_details",
     "sentry.api.endpoints.organization_events_meta",
     "sentry.api.endpoints.organization_events_spans_performance",

src/sentry/api/base.py

@@ -401,6 +401,7 @@ def dispatch(self, request: Request, *args, **kwargs) -> Response:
                 self.initial(request, *args, **kwargs)
 
                 # Get the appropriate handler method
+                assert request.method is not None
                 method = request.method.lower()
                 if method in self.http_method_names and hasattr(self, method):
                     handler = getattr(self, method)
@@ -445,6 +446,7 @@ def dispatch(self, request: Request, *args, **kwargs) -> Response:
 
         # Only enforced in dev environment
         if settings.ENFORCE_PAGINATION:
+            assert request.method is not None
             if request.method.lower() == "get":
                 status = getattr(self.response, "status_code", 0)
                 # Response can either be Response or HttpResponse, check if

src/sentry/models/apiapplication.py

@@ -145,7 +145,7 @@ def is_valid_redirect_uri(self, value):
     def get_default_redirect_uri(self):
         return self.redirect_uris.split()[0]
 
-    def get_allowed_origins(self):
+    def get_allowed_origins(self) -> list[str]:
         if not self.allowed_origins:
             return []
         return [origin for origin in self.allowed_origins.split()]

src/sentry/models/apikey.py

@@ -77,7 +77,7 @@ def save(self, *args, **kwargs):
             self.key = ApiKey.generate_api_key()
         super().save(*args, **kwargs)
 
-    def get_allowed_origins(self):
+    def get_allowed_origins(self) -> list[str]:
         if not self.allowed_origins:
             return []
         return list(filter(bool, self.allowed_origins.split("\n")))

src/sentry/models/apitoken.py

@@ -299,10 +299,10 @@ def is_expired(self):
     def get_audit_log_data(self):
         return {"scopes": self.get_scopes()}
 
-    def get_allowed_origins(self):
+    def get_allowed_origins(self) -> list[str]:
         if self.application:
             return self.application.get_allowed_origins()
-        return ()
+        return []
 
     def refresh(self, expires_at=None):
         if self.token_type == AuthTokenType.USER:

src/sentry/models/orgauthtoken.py

@@ -73,7 +73,7 @@ def __str__(self):
     def get_audit_log_data(self):
         return {"name": self.name, "scopes": self.get_scopes()}
 
-    def get_allowed_origins(self):
+    def get_allowed_origins(self) -> list[str]:
         return []
 
     def get_scopes(self):

src/sentry/models/projectkey.py

@@ -310,7 +310,7 @@ def get_endpoint(self) -> str:
 
         return endpoint
 
-    def get_allowed_origins(self):
+    def get_allowed_origins(self) -> frozenset[str]:
         from sentry.utils.http import get_origins
 
         return get_origins(self.project)

src/sentry/utils/http.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Collection
 from typing import TYPE_CHECKING, NamedTuple, TypeGuard, overload
 from urllib.parse import quote, urljoin, urlparse
 
@@ -103,7 +104,7 @@ def parse_uri_match(value: str) -> ParsedUriMatch:
 
 
 def is_valid_origin(
-    origin: str | None, project: Project | None = None, allowed: frozenset[str] | None = None
+    origin: str | None, project: Project | None = None, allowed: Collection[str] | None = None
 ) -> bool:
     """
     Given an ``origin`` which matches a base URI (e.g. http://example.com)