#116 move htmx request type into helpers module

cast/models/__init__.py

@@ -1,7 +1,7 @@
 from .audio import Audio, ChapterMark, sync_chapter_marks
 from .file import File
 from .gallery import Gallery, get_or_create_gallery
-from .index_pages import Blog, HtmxHttpRequest, Podcast
+from .index_pages import Blog, Podcast
 from .itunes import ItunesArtWork
 from .moderation import SpamFilter
 from .pages import Episode, HomePage, Post, sync_media_ids
@@ -24,7 +24,6 @@
     "get_template_base_dir",
     "get_template_base_dir_choices",
     "HomePage",
-    "HtmxHttpRequest",
     "ItunesArtWork",
     "Post",
     "PostCategory",

cast/views/__init__.py

@@ -1,11 +1,14 @@
 from django.contrib.auth.models import User
 from django.http import HttpRequest
-from django_htmx.middleware import HtmxDetails
+
+from .htmx_helpers import HtmxHttpRequest
 
 
 class AuthenticatedHttpRequest(HttpRequest):
     user: User
 
 
-class HtmxHttpRequest(HttpRequest):
-    htmx: HtmxDetails
+__all__ = [
+    "HtmxHttpRequest",
+    "AuthenticatedHttpRequest",
+]

cast/views/htmx_helpers.py

@@ -0,0 +1,8 @@
+from django.http import HttpRequest
+from django_htmx.middleware import HtmxDetails
+
+
+# Typing pattern recommended by django-stubs:
+# https://github.com/typeddjango/django-stubs#how-can-i-create-a-httprequest-thats-guaranteed-to-have-an-authenticated-user
+class HtmxHttpRequest(HttpRequest):
+    htmx: HtmxDetails

cast/views/theme.py

@@ -2,7 +2,8 @@
 from django.shortcuts import render
 
 from ..forms import SelectThemeForm
-from ..models import HtmxHttpRequest, get_template_base_dir
+from ..models import get_template_base_dir
+from .htmx_helpers import HtmxHttpRequest
 
 
 def set_template_base_dir(request: HtmxHttpRequest, template_base_dir: str) -> None: