refactor: modernize type hints across the package

Add `from __future__ import annotations` and switch to builtin generics
and PEP 604 unions (dict/list/tuple/type, X | None) in hx_requests.py,
hx_registry.py and templatetags/hx_tags.py; drop the now-unused typing
imports. Also fixes the eager-evaluation TypeError from the dict[str, str]
annotation on the Python floor. No runtime behavior change.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: yaakovLowenstein

hx_requests/hx_registry.py

@@ -13,11 +13,12 @@
   That only becomes known at import time.
 """
 
+from __future__ import annotations
+
 import ast
 import importlib
 import os
 import threading
-from typing import Dict, Optional, Tuple, Type, Union
 
 from django.apps import apps
 
@@ -26,7 +27,7 @@
 
 class HxRequestRegistry:
     # name -> class OR (module_path, class_name)
-    _registry: Dict[str, Union[Type[BaseHxRequest], Tuple[str, str]]] = {}
+    _registry: dict[str, type[BaseHxRequest] | tuple[str, str]] = {}
     _initialized = False
     _lock = threading.Lock()
 
@@ -103,7 +104,7 @@ def _parse_file(cls, file_path: str, module_name: str):
             return
 
     @classmethod
-    def _get_class_name_attribute(cls, class_node: ast.ClassDef) -> Optional[str]:
+    def _get_class_name_attribute(cls, class_node: ast.ClassDef) -> str | None:
         """
         Extract the `name` class attribute from a class definition.
 
@@ -132,7 +133,7 @@ def _get_class_name_attribute(cls, class_node: ast.ClassDef) -> Optional[str]:
         return None
 
     @classmethod
-    def register_hx_request(cls, name: str, hx_request_class: Type[BaseHxRequest]):
+    def register_hx_request(cls, name: str, hx_request_class: type[BaseHxRequest]):
         """
         Manual registration
         """

hx_requests/hx_requests.py

@@ -1,7 +1,8 @@
+from __future__ import annotations
+
 import contextlib
 import json
 from functools import partial
-from typing import Dict, List, Optional, Union
 
 from django.conf import settings
 from django.contrib import messages
@@ -85,12 +86,12 @@ class BaseHxRequest:
 
     name: str = ""
     hx_object_name: str = "hx_object"
-    GET_template: Union[str, list] = ""
-    POST_template: Union[str, list] = ""
-    GET_block: Union[str, list] = ""
-    POST_block: Union[str, list, dict[str, str]] = ""
+    GET_template: str | list = ""
+    POST_template: str | list = ""
+    GET_block: str | list = ""
+    POST_block: str | list | dict[str, str] = ""
     refresh_page: bool = False
-    redirect: str = None
+    redirect: str | None = None
     return_empty: bool = False
     no_swap = False
     show_messages: bool = True
@@ -118,7 +119,7 @@ def is_post_request(self):
     def use_messages(self):
         return getattr(settings, "HX_REQUESTS_USE_HX_MESSAGES", False) and self.show_messages
 
-    def get_context_data(self, **kwargs) -> Dict:
+    def get_context_data(self, **kwargs) -> dict:
         """
         Adds the context from the view and additionally adds:
 
@@ -143,7 +144,7 @@ def get_context_data(self, **kwargs) -> Dict:
         # Turn into dict for template rendering which expects a dict
         return context.flatten()
 
-    def get_context_on_GET(self, **kwargs) -> Dict:
+    def get_context_on_GET(self, **kwargs) -> dict:
         """
         Adds extra context to the context data only on GET.
         """
@@ -188,7 +189,7 @@ def _setup_hx_request(self, request, *args, **kwargs):
     def hx_object_to_str(self) -> str:
         return self.hx_object._meta.model.__name__.capitalize() if self.hx_object else ""
 
-    def get_headers(self, **kwargs) -> Dict:
+    def get_headers(self, **kwargs) -> dict:
         """
         Prepare the headers for the response.
         """
@@ -204,7 +205,7 @@ def get_headers(self, **kwargs) -> Dict:
         headers.update(self.get_trigger_headers(**kwargs))
         return headers
 
-    def get_triggers(self, **kwargs) -> Union[List[Union[str, dict]], Dict[str, list]]:
+    def get_triggers(self, **kwargs) -> list[str | dict] | dict[str, list]:
         """
         Override to set the triggers for the response.
 
@@ -232,7 +233,7 @@ def get_triggers(self, **kwargs) -> Union[List[Union[str, dict]], Dict[str, list
         """
         return []
 
-    def get_trigger_headers(self, **kwargs) -> Dict[str, str]:
+    def get_trigger_headers(self, **kwargs) -> dict[str, str]:
         """
         Build the HTMX trigger response headers from :meth:`get_triggers`.
 
@@ -266,7 +267,7 @@ def format_triggers(self, **kwargs) -> str:
         return self._format_trigger_value(triggers)
 
     @staticmethod
-    def _format_trigger_value(triggers: List[Union[str, dict]]) -> str:
+    def _format_trigger_value(triggers: list[str | dict]) -> str:
         """
         Format a single list of triggers into one header value.
 
@@ -431,7 +432,7 @@ class FormHxRequest(BaseHxRequest):
     set_initial_from_kwargs: bool = False
     show_form_invalid_message: bool = True
 
-    def get_context_data(self, **kwargs) -> Dict:
+    def get_context_data(self, **kwargs) -> dict:
         """
         Additionally adds the form into the context.
         """
@@ -460,7 +461,7 @@ def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
 
         return response if response is not None else self._get_response(**kwargs)
 
-    def form_valid(self, **kwargs) -> Optional[HttpResponse]:
+    def form_valid(self, **kwargs) -> HttpResponse | None:
         """
         Saves the form and sets a success message.
 
@@ -470,7 +471,7 @@ def form_valid(self, **kwargs) -> Optional[HttpResponse]:
         self.form.save()
         messages.success(self.request, self.get_success_message(**kwargs))
 
-    def form_invalid(self, **kwargs) -> Optional[HttpResponse]:
+    def form_invalid(self, **kwargs) -> HttpResponse | None:
         """
         Sets an error message unless ``show_form_invalid_message`` is False.
 
@@ -573,7 +574,7 @@ def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
         response = self.delete(**kwargs)
         return response if response is not None else self._get_response(**kwargs)
 
-    def delete(self, **kwargs) -> Optional[HttpResponse]:
+    def delete(self, **kwargs) -> HttpResponse | None:
         """
         Deletes the hx_object and sets a success message.
 
@@ -681,7 +682,7 @@ def get_triggers(self, **kwargs) -> list:
                 triggers.append("closeHxModal")
         return triggers
 
-    def get_headers(self, **kwargs) -> Dict:
+    def get_headers(self, **kwargs) -> dict:
         """
         If the form is invalid, headers are set to retarget the innerHTML of the modal body.
         This is done to show the form errors.

hx_requests/templatetags/hx_tags.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from __future__ import annotations
 
 from django import template
 
@@ -8,7 +8,7 @@
 
 
 @register.simple_tag(takes_context=True)
-def hx_get(context: Dict, hx_request_name: str, object=None, use_full_path=False, **kwargs) -> str:
+def hx_get(context: dict, hx_request_name: str, object=None, use_full_path=False, **kwargs) -> str:
     """
     Renders the proper HTML attributes for an HX GET request.
     And includes the hx_request_name, object, and any additional kwargs.
@@ -18,7 +18,7 @@ def hx_get(context: Dict, hx_request_name: str, object=None, use_full_path=False
 
 
 @register.simple_tag(takes_context=True)
-def hx_post(context: Dict, hx_request_name: str, object=None, use_full_path=False, **kwargs) -> str:
+def hx_post(context: dict, hx_request_name: str, object=None, use_full_path=False, **kwargs) -> str:
     """
     Renders the proper HTML attributes for an HX POST request.
     And includes the hx_request_name, object, and any additional kwargs.
@@ -33,7 +33,7 @@ def hx_post(context: Dict, hx_request_name: str, object=None, use_full_path=Fals
 
 
 @register.simple_tag(takes_context=True)
-def hx_url(context: Dict, hx_request_name: str, object=None, use_full_path=False, **kwargs) -> str:
+def hx_url(context: dict, hx_request_name: str, object=None, use_full_path=False, **kwargs) -> str:
     """
     Returns the URL for an HX request. Can be used when you need to manually set the URL in a template.
     Useful if the hx-get or hx-post tags are not flexible enough for your use case.