Update ty, more typing changes

Author: davegaeddert

plain-admin/plain/admin/cards/charts.py

@@ -42,10 +42,10 @@ def get_description(self) -> str:
         end = datetime_range.end.strftime("%b %d, %Y")
         return f"{start} to {end}"
 
-    def get_current_preset(self) -> DatetimeRangeAliases:
+    def get_current_preset(self) -> str:
         if s := super().get_current_preset():
-            return DatetimeRangeAliases.from_value(s)
-        return self.default_preset
+            return s
+        return self.default_preset.value
 
     def get_trend_data(self) -> dict[str, int]:
         if not self.model or not self.datetime_field:

plain-admin/plain/admin/views/objects.py

@@ -3,7 +3,7 @@
 
 from plain.htmx.views import HTMXView
 from plain.http import Response, ResponseRedirect
-from plain.models import Model
+from plain.models import Model, QuerySet
 from plain.paginator import Paginator
 from plain.views import (
     CreateView,
@@ -104,7 +104,7 @@ def post(self) -> Response:
     def perform_action(self, action: str, target_ids: list) -> Response | None:
         raise NotImplementedError
 
-    def get_objects(self) -> list:
+    def get_objects(self) -> list[Any] | QuerySet[Any]:
         return []
 
     def get_fields(self) -> list:

plain-admin/plain/admin/views/registry.py

@@ -1,9 +1,13 @@
 from collections.abc import Callable
-from typing import Any, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from plain.urls import path, reverse_lazy
 
+if TYPE_CHECKING:
+    from .viewsets import AdminViewset
+
 T = TypeVar("T")
+VS = TypeVar("VS", bound="AdminViewset")
 
 
 class NavSection:
@@ -43,9 +47,9 @@ def inner(view: type[T]) -> type[T]:
             return inner
 
     def register_viewset(
-        self, viewset: type[T] | None = None
-    ) -> type[T] | Callable[[type[T]], type[T]]:
-        def inner(viewset: type[T]) -> type[T]:
+        self, viewset: type[VS] | None = None
+    ) -> type[VS] | Callable[[type[VS]], type[VS]]:
+        def inner(viewset: type[VS]) -> type[VS]:
             for view in viewset.get_views():
                 self.register_view(view)
             return viewset

plain-admin/plain/admin/views/viewsets.py

@@ -3,7 +3,7 @@
 
 class AdminViewset:
     @classmethod
-    def get_views(cls) -> list[View]:
+    def get_views(cls) -> list[type[View]]:
         """Views are defined as inner classes on the viewset class."""
 
         # Primary views that we can interlink automatically

plain-dev/plain/dev/mkcert.py

@@ -11,7 +11,7 @@
 
 class MkcertManager:
     def __init__(self) -> None:
-        self.mkcert_bin = None
+        self.mkcert_bin: str | Path | None = None
 
     def setup_mkcert(self, install_path: Path) -> None:
         """Set up mkcert by checking if it's installed or downloading the binary and installing the local CA."""
@@ -62,6 +62,8 @@ def setup_mkcert(self, install_path: Path) -> None:
 
     def is_mkcert_ca_installed(self) -> bool:
         """Check if mkcert local CA is already installed using mkcert -check."""
+        if not self.mkcert_bin:
+            return False
         try:
             result = subprocess.run([self.mkcert_bin, "-check"], capture_output=True)
             output = result.stdout.decode() + result.stderr.decode()
@@ -86,6 +88,9 @@ def generate_certs(self, domain: str, storage_path: Path) -> tuple[Path, Path]:
 
         storage_path.mkdir(parents=True, exist_ok=True)
 
+        if not self.mkcert_bin:
+            raise RuntimeError("mkcert is not set up. Call setup_mkcert first.")
+
         click.secho(f"Generating SSL certificates for {domain}...", bold=True)
         subprocess.run(
             [

plain-dev/plain/dev/pdb.py

@@ -18,6 +18,8 @@ def cry(message: str, stderr: Any = sys.__stderr__) -> None:
 
 
 class LF2CRLF_FileWrapper:
+    _send: Any  # Can be lambda or socket.sendall
+
     def __init__(self, connection: socket.socket) -> None:
         self.connection = connection
         self.stream = fh = connection.makefile("rw")

plain-email/plain/email/backends/base.py

@@ -28,7 +28,7 @@ class BaseEmailBackend(ABC):
     def __init__(self, fail_silently: bool = False, **kwargs: Any) -> None:
         self.fail_silently = fail_silently
 
-    def open(self) -> None:
+    def open(self) -> bool | None:
         """
         Open a network connection.
 

plain-email/plain/email/backends/console.py

@@ -23,9 +23,13 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
     def write_message(self, message: EmailMessage) -> None:
         msg = message.message()
         msg_data = msg.as_bytes()
-        charset = (
-            msg.get_charset().get_output_charset() if msg.get_charset() else "utf-8"
-        )
+        msg_charset = msg.get_charset()
+        if msg_charset is None:
+            charset = "utf-8"
+        elif isinstance(msg_charset, str):
+            charset = msg_charset
+        else:
+            charset = msg_charset.get_output_charset() or "utf-8"
         msg_data = msg_data.decode(charset)
         self.stream.write(f"{msg_data}\n")
         self.stream.write("-" * 79)

plain-email/plain/email/backends/filebased.py

@@ -16,17 +16,16 @@
 
 
 class EmailBackend(ConsoleEmailBackend):
+    file_path: str  # Set during __init__, validated to be non-None
+
     def __init__(self, *args: Any, file_path: str | None = None, **kwargs: Any) -> None:
-        self._fname = None
-        if file_path is not None:
-            self.file_path = file_path
-        else:
-            self.file_path = getattr(settings, "EMAIL_FILE_PATH", None)
-        if not self.file_path:
+        self._fname: str | None = None
+        _file_path: str | None = file_path or getattr(settings, "EMAIL_FILE_PATH", None)
+        if not _file_path:
             raise ImproperlyConfigured(
                 "EMAIL_FILE_PATH must be set for the filebased email backend"
             )
-        self.file_path = os.path.abspath(self.file_path)
+        self.file_path = os.path.abspath(_file_path)
         try:
             os.makedirs(self.file_path, exist_ok=True)
         except FileExistsError:

plain-email/plain/email/message.py

@@ -181,7 +181,7 @@ def __setitem__(self, name: str, val: str) -> None:
         name, val = forbid_multi_line_headers(name, val, self.encoding)
         MIMEText.__setitem__(self, name, val)
 
-    def set_payload(
+    def set_payload(  # type: ignore[override]
         self, payload: str, charset: str | Charset.Charset | None = None
     ) -> None:
         if charset == "utf-8" and not isinstance(charset, Charset.Charset):
@@ -349,11 +349,10 @@ def attach(
         elif content is None:
             raise ValueError("content must be provided.")
         else:
-            mimetype = (
-                mimetype
-                or mimetypes.guess_type(filename)[0]
-                or DEFAULT_ATTACHMENT_MIME_TYPE
-            )
+            if filename is not None and mimetype is None:
+                mimetype = mimetypes.guess_type(filename)[0]
+            if mimetype is None:
+                mimetype = DEFAULT_ATTACHMENT_MIME_TYPE
             basetype, subtype = mimetype.split("/", 1)
 
             if basetype == "text":
@@ -434,6 +433,7 @@ def _create_mime_attachment(
         else:
             # Encode non-text attachments with base64.
             attachment = MIMEBase(basetype, subtype)
+            assert isinstance(content, bytes), "Non-text attachments must be bytes"
             attachment.set_payload(content)
             Encoders.encode_base64(attachment)
         return attachment