More updates

Author: stuartmaxwell

manage.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -18,5 +19,5 @@ def main():
     execute_from_command_line(sys.argv)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

pyproject.toml

@@ -43,6 +43,7 @@ ignore = [
   "FIX002", # Line contains TODO, consider resolving the issue
   "TD002",  # Missing author in TODO
   "S308",   # suspicious-mark-safe-usage
+  "COM812", # Trailing comma missing
 ]
 
 [tool.ruff.lint.per-file-ignores]

spf_generator/management/commands/populate_spf_data.py

@@ -153,8 +153,7 @@ def handle(self, *args: Any, **options: Any) -> None:  # noqa: ANN401, ARG002
                 "lookup_count": 1,
                 "priority": 20,
                 "notes": (
-                    "Covers all Postmark sending servers\n"
-                    "https://postmarkapp.com/guides/spf#2-create-your-spf-record"
+                    "Covers all Postmark sending servers\nhttps://postmarkapp.com/guides/spf#2-create-your-spf-record"
                 ),
             },
             {
@@ -253,5 +252,5 @@ def handle(self, *args: Any, **options: Any) -> None:  # noqa: ANN401, ARG002
             )
             self.stdout.write(
                 # pyrefly: ignore [missing-attribute]
-                self.style.SUCCESS(f'Created provider: {provider_data["name"]}'),
+                self.style.SUCCESS(f"Created provider: {provider_data['name']}"),
             )

spf_generator/migrations/0001_initial.py

@@ -4,32 +4,82 @@
 
 
 class Migration(migrations.Migration):
-
     # pyrefly: ignore [bad-override]
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='EmailProvider',
+            name="EmailProvider",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text="Name of the email provider (e.g., 'Google Workspace', 'SendGrid')", max_length=100, unique=True)),
-                ('category', models.CharField(choices=[('EMAIL_HOSTING', 'Email Hosting'), ('TRANSACTIONAL', 'Transactional Email'), ('OTHER', 'Other')], help_text='Category of email provider', max_length=20)),
-                ('description', models.TextField(blank=True, help_text='Public description of the provider')),
-                ('mechanism_type', models.CharField(choices=[('include', 'Include'), ('a', 'A Record'), ('mx', 'MX Record'), ('ip4', 'IPv4'), ('ip6', 'IPv6'), ('exists', 'Exists')], help_text='Type of SPF mechanism used', max_length=10)),
-                ('mechanism_value', models.CharField(help_text="The actual SPF mechanism value (e.g., 'include:_spf.google.com')", max_length=255)),
-                ('lookup_count', models.PositiveSmallIntegerField(default=1, help_text='Number of DNS lookups this mechanism requires')),
-                ('priority', models.PositiveSmallIntegerField(default=100, help_text='Order in which this should appear in combined SPF record')),
-                ('active', models.BooleanField(default=True, help_text='Whether this provider is currently available for selection')),
-                ('notes', models.TextField(blank=True, help_text='Internal notes about this provider')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                (
+                    "name",
+                    models.CharField(
+                        help_text="Name of the email provider (e.g., 'Google Workspace', 'SendGrid')",
+                        max_length=100,
+                        unique=True,
+                    ),
+                ),
+                (
+                    "category",
+                    models.CharField(
+                        choices=[
+                            ("EMAIL_HOSTING", "Email Hosting"),
+                            ("TRANSACTIONAL", "Transactional Email"),
+                            ("OTHER", "Other"),
+                        ],
+                        help_text="Category of email provider",
+                        max_length=20,
+                    ),
+                ),
+                ("description", models.TextField(blank=True, help_text="Public description of the provider")),
+                (
+                    "mechanism_type",
+                    models.CharField(
+                        choices=[
+                            ("include", "Include"),
+                            ("a", "A Record"),
+                            ("mx", "MX Record"),
+                            ("ip4", "IPv4"),
+                            ("ip6", "IPv6"),
+                            ("exists", "Exists"),
+                        ],
+                        help_text="Type of SPF mechanism used",
+                        max_length=10,
+                    ),
+                ),
+                (
+                    "mechanism_value",
+                    models.CharField(
+                        help_text="The actual SPF mechanism value (e.g., 'include:_spf.google.com')", max_length=255
+                    ),
+                ),
+                (
+                    "lookup_count",
+                    models.PositiveSmallIntegerField(
+                        default=1, help_text="Number of DNS lookups this mechanism requires"
+                    ),
+                ),
+                (
+                    "priority",
+                    models.PositiveSmallIntegerField(
+                        default=100, help_text="Order in which this should appear in combined SPF record"
+                    ),
+                ),
+                (
+                    "active",
+                    models.BooleanField(
+                        default=True, help_text="Whether this provider is currently available for selection"
+                    ),
+                ),
+                ("notes", models.TextField(blank=True, help_text="Internal notes about this provider")),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
             ],
             options={
-                'ordering': ['priority', 'name'],
+                "ordering": ["priority", "name"],
             },
         ),
     ]

spf_generator/templatetags/spf_generator_filters.py

@@ -1,5 +1,6 @@
 """Custom template filters for spf_generator app."""
-# your_app_name/templatetags/spf_generator_filters.py
+
+from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
@@ -28,15 +29,15 @@ def startswith(text: str, starts: str) -> bool:
 
 
 @register.filter
-def get_provider(providers_dict: dict[int, EmailProvider], field_name: str) -> EmailProvider:
+def get_provider(providers_dict: dict, field_name: str) -> EmailProvider:
     """Template filter to get provider object from field name.
 
     Args:
         providers_dict: Dictionary of providers
         field_name: Form field name (e.g., 'provider_1')
 
     Returns:
-        EmailProvider: The provider object or None
+        EmailProvider: The provider object
     """
     provider_id = int(field_name.split("_")[1])