start using things from the package

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>

packages/django-dramatiq-postgres/django_dramatiq_postgres/apps.py

@@ -32,7 +32,7 @@ class DjangoDramatiqPostgres(AppConfig):
             **broker_kwargs,
         )
 
-        for middleware_class, middleware_kwargs in Conf.middlewares.items():
+        for middleware_class, middleware_kwargs in Conf.middlewares:
             middleware: dramatiq.middleware.middleware.Middleware = import_string(middleware_class)(
                 **middleware_kwargs,
             )

packages/django-dramatiq-postgres/django_dramatiq_postgres/broker.py

@@ -6,8 +6,6 @@ from queue import Empty, Queue
 from random import randint
 from typing import Any
 
-from django.utils.functional import cached_property
-from django.utils.module_loading import import_string
 import tenacity
 from django.db import (
     DEFAULT_DB_ALIAS,
@@ -19,6 +17,8 @@ from django.db import (
 from django.db.backends.postgresql.base import DatabaseWrapper
 from django.db.models import QuerySet
 from django.utils import timezone
+from django.utils.functional import cached_property
+from django.utils.module_loading import import_string
 from dramatiq.broker import Broker, Consumer, MessageProxy
 from dramatiq.common import compute_backoff, current_millis, dq_name, xq_name
 from dramatiq.errors import ConnectionError, QueueJoinTimeout
@@ -40,7 +40,7 @@ from structlog.stdlib import get_logger
 
 from django_dramatiq_postgres.conf import Conf
 from django_dramatiq_postgres.middleware import DbConnectionMiddleware
-from django_dramatiq_postgres.models import Task, ChannelIdentifier, TaskState, CHANNEL_PREFIX
+from django_dramatiq_postgres.models import CHANNEL_PREFIX, ChannelIdentifier, TaskBase, TaskState
 
 LOGGER = get_logger()
 
@@ -99,7 +99,7 @@ class PostgresBroker(Broker):
         return _PostgresConsumer
 
     @cached_property
-    def model(self) -> type[Task]:
+    def model(self) -> type[TaskBase]:
         return import_string(Conf.task_class)
 
     @property

packages/django-dramatiq-postgres/django_dramatiq_postgres/models.py

@@ -25,7 +25,7 @@ class TaskState(models.TextChoices):
     DONE = "done"
 
 
-class Task(models.Model):
+class TaskBase(models.Model):
     message_id = models.UUIDField(primary_key=True, default=uuid4)
     queue_name = models.TextField(default="default", help_text=_("Queue name"))