ruff

Author: valentijnscholten

dojo/apps.py

@@ -5,6 +5,7 @@
 from django.db import models
 from watson import search as watson
 
+from dojo.auditlog import configure_audit_system, register_django_pghistory_models
 from dojo.checks import check_configuration_deduplication
 
 logger = logging.getLogger(__name__)
@@ -91,7 +92,6 @@ def ready(self):
         # This must be done in ready() to avoid "Models aren't loaded yet" errors
         # Note: pghistory models are registered here (no database access), but trigger
         # enabling is handled via management command to avoid database access warnings
-        from dojo.auditlog import configure_audit_system, register_django_pghistory_models
         register_django_pghistory_models()
         configure_audit_system()
 

dojo/auditlog.py

@@ -9,7 +9,6 @@
 import sys
 
 import pghistory
-from auditlog.registry import auditlog
 from django.conf import settings
 from django.core.management import call_command
 from django.db import models
@@ -19,7 +18,10 @@
 
 def enable_django_auditlog():
     """Enable django-auditlog by registering models."""
-    from dojo.models import (
+    # Import inside function to avoid AppRegistryNotReady errors
+    from auditlog.registry import auditlog  # noqa: PLC0415
+
+    from dojo.models import (  # noqa: PLC0415
         Cred_User,
         Dojo_User,
         Endpoint,
@@ -52,7 +54,10 @@ def enable_django_auditlog():
 
 def disable_django_auditlog():
     """Disable django-auditlog by unregistering models."""
-    from dojo.models import (
+    # Import inside function to avoid AppRegistryNotReady errors
+    from auditlog.registry import auditlog  # noqa: PLC0415
+
+    from dojo.models import (  # noqa: PLC0415
         Cred_User,
         Dojo_User,
         Endpoint,
@@ -99,7 +104,8 @@ def register_django_pghistory_models():
     Then we control the enabling/disabling by enabling/disabling the underlying database
     triggers.
     """
-    from dojo.models import (
+    # Import models inside function to avoid AppRegistryNotReady errors
+    from dojo.models import (  # noqa: PLC0415
         Cred_User,
         Dojo_User,
         Endpoint,

dojo/endpoint/signals.py

@@ -2,6 +2,7 @@
 
 from auditlog.models import LogEntry
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
@@ -10,6 +11,7 @@
 
 from dojo.models import Endpoint
 from dojo.notifications.helper import create_notification
+from dojo.pghistory_models import DojoEvents
 
 
 @receiver(post_delete, sender=Endpoint)
@@ -22,7 +24,6 @@ def endpoint_post_delete(sender, instance, using, origin, **kwargs):
 
             if settings.ENABLE_AUDITLOG:
                 # First try to find deletion author in pghistory events
-                from dojo.pghistory_models import DojoEvents
                 # Look for delete events for this specific endpoint instance
                 pghistory_delete_events = DojoEvents.objects.filter(
                     pgh_obj_model="dojo.Endpoint",
@@ -34,7 +35,6 @@ def endpoint_post_delete(sender, instance, using, origin, **kwargs):
                     latest_delete = pghistory_delete_events.first()
                     # Extract user from pghistory context
                     if latest_delete.user:
-                        from django.contrib.auth import get_user_model
                         User = get_user_model()
                         with contextlib.suppress(User.DoesNotExist):
                             user = User.objects.get(id=latest_delete.user)

dojo/engagement/signals.py

@@ -2,6 +2,7 @@
 
 from auditlog.models import LogEntry
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import post_delete, post_save, pre_delete, pre_save
 from django.dispatch import receiver
@@ -12,6 +13,7 @@
 from dojo.models import Engagement, Product
 from dojo.notes.helper import delete_related_notes
 from dojo.notifications.helper import create_notification
+from dojo.pghistory_models import DojoEvents
 
 
 @receiver(post_save, sender=Engagement)
@@ -49,7 +51,6 @@ def engagement_post_delete(sender, instance, using, origin, **kwargs):
 
             if settings.ENABLE_AUDITLOG:
                 # First try to find deletion author in pghistory events
-                from dojo.pghistory_models import DojoEvents
                 # Look for delete events for this specific engagement instance
                 pghistory_delete_events = DojoEvents.objects.filter(
                     pgh_obj_model="dojo.Engagement",
@@ -61,7 +62,6 @@ def engagement_post_delete(sender, instance, using, origin, **kwargs):
                     latest_delete = pghistory_delete_events.first()
                     # Extract user from pghistory context
                     if latest_delete.user:
-                        from django.contrib.auth import get_user_model
                         User = get_user_model()
                         with contextlib.suppress(User.DoesNotExist):
                             user = User.objects.get(id=latest_delete.user)

dojo/finding_group/signals.py

@@ -2,6 +2,7 @@
 
 from auditlog.models import LogEntry
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
@@ -10,6 +11,7 @@
 
 from dojo.models import Finding_Group
 from dojo.notifications.helper import create_notification
+from dojo.pghistory_models import DojoEvents
 
 
 @receiver(post_delete, sender=Finding_Group)
@@ -20,7 +22,6 @@ def finding_group_post_delete(sender, instance, using, origin, **kwargs):
 
         if settings.ENABLE_AUDITLOG:
             # First try to find deletion author in pghistory events
-            from dojo.pghistory_models import DojoEvents
             # Look for delete events for this specific finding_group instance
             pghistory_delete_events = DojoEvents.objects.filter(
                 pgh_obj_model="dojo.Finding_Group",
@@ -32,7 +33,6 @@ def finding_group_post_delete(sender, instance, using, origin, **kwargs):
                 latest_delete = pghistory_delete_events.first()
                 # Extract user from pghistory context
                 if latest_delete.user:
-                    from django.contrib.auth import get_user_model
                     User = get_user_model()
                     with contextlib.suppress(User.DoesNotExist):
                         user = User.objects.get(id=latest_delete.user)

dojo/management/commands/pghistory_backfill.py

@@ -9,6 +9,7 @@
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
+from django.utils import timezone
 
 logger = logging.getLogger(__name__)
 
@@ -178,7 +179,6 @@ def handle(self, *args, **options):
 
                                 # Set pgh_created_at to current time (this is for the event creation time)
                                 # The created/updated fields above contain the original instance timestamps
-                                from django.utils import timezone
                                 event_data["pgh_created_at"] = timezone.now()
 
                                 event_records.append(EventModel(**event_data))

dojo/management/commands/pghistory_clear.py

@@ -9,7 +9,7 @@
 from django.apps import apps
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from django.db import transaction
+from django.db import connection, transaction
 
 logger = logging.getLogger(__name__)
 
@@ -159,7 +159,6 @@ def handle(self, *args, **options):
                         # Get the actual database table name
                         db_table = EventModel._meta.db_table
 
-                        from django.db import connection
                         with connection.cursor() as cursor:
                             if drop_tables:
                                 # DROP TABLE - completely removes the table structure

dojo/product/signals.py

@@ -2,6 +2,7 @@
 
 from auditlog.models import LogEntry
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
@@ -10,6 +11,7 @@
 
 from dojo.models import Product
 from dojo.notifications.helper import create_notification
+from dojo.pghistory_models import DojoEvents
 
 
 @receiver(post_save, sender=Product)
@@ -32,7 +34,6 @@ def product_post_delete(sender, instance, **kwargs):
 
         if settings.ENABLE_AUDITLOG:
             # First try to find deletion author in pghistory events
-            from dojo.pghistory_models import DojoEvents
             # Look for delete events for this specific product instance
             pghistory_delete_events = DojoEvents.objects.filter(
                 pgh_obj_model="dojo.Product",
@@ -44,7 +45,6 @@ def product_post_delete(sender, instance, **kwargs):
                 latest_delete = pghistory_delete_events.first()
                 # Extract user from pghistory context
                 if latest_delete.user:
-                    from django.contrib.auth import get_user_model
                     User = get_user_model()
                     with contextlib.suppress(User.DoesNotExist):
                         user = User.objects.get(id=latest_delete.user)

dojo/product_type/signals.py

@@ -2,6 +2,7 @@
 
 from auditlog.models import LogEntry
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
@@ -10,6 +11,7 @@
 
 from dojo.models import Product_Type
 from dojo.notifications.helper import create_notification
+from dojo.pghistory_models import DojoEvents
 
 
 @receiver(post_save, sender=Product_Type)
@@ -32,7 +34,6 @@ def product_type_post_delete(sender, instance, **kwargs):
 
         if settings.ENABLE_AUDITLOG:
             # First try to find deletion author in pghistory events
-            from dojo.pghistory_models import DojoEvents
             # Look for delete events for this specific product_type instance
             pghistory_delete_events = DojoEvents.objects.filter(
                 pgh_obj_model="dojo.Product_Type",
@@ -44,7 +45,6 @@ def product_type_post_delete(sender, instance, **kwargs):
                 latest_delete = pghistory_delete_events.first()
                 # Extract user from pghistory context
                 if latest_delete.user:
-                    from django.contrib.auth import get_user_model
                     User = get_user_model()
                     with contextlib.suppress(User.DoesNotExist):
                         user = User.objects.get(id=latest_delete.user)

dojo/test/signals.py

@@ -2,6 +2,7 @@
 
 from auditlog.models import LogEntry
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import post_delete, pre_delete, pre_save
 from django.dispatch import receiver
@@ -12,6 +13,7 @@
 from dojo.models import Engagement, Finding, Product, Test
 from dojo.notes.helper import delete_related_notes
 from dojo.notifications.helper import create_notification
+from dojo.pghistory_models import DojoEvents
 
 
 @receiver(post_delete, sender=Test)
@@ -24,7 +26,6 @@ def test_post_delete(sender, instance, using, origin, **kwargs):
 
             if settings.ENABLE_AUDITLOG:
                 # First try to find deletion author in pghistory events
-                from dojo.pghistory_models import DojoEvents
                 # Look for delete events for this specific test instance
                 pghistory_delete_events = DojoEvents.objects.filter(
                     pgh_obj_model="dojo.Test",
@@ -36,7 +37,6 @@ def test_post_delete(sender, instance, using, origin, **kwargs):
                     latest_delete = pghistory_delete_events.first()
                     # Extract user from pghistory context
                     if latest_delete.user:
-                        from django.contrib.auth import get_user_model
                         User = get_user_model()
                         with contextlib.suppress(User.DoesNotExist):
                             user = User.objects.get(id=latest_delete.user)