fix: TypeError introducedn on prev commit on 'AbstractChordCounter'

Author: diegocastrum

django_celery_results/backends/database.py

@@ -12,7 +12,11 @@
 from django.db.utils import InterfaceError
 from kombu.exceptions import DecodeError
 
-from ..models.helpers import chordcounter_model, groupresult_model, taskresult_model
+from ..models.helpers import (
+    chordcounter_model,
+    groupresult_model,
+    taskresult_model,
+)
 from ..settings import get_task_props_extension
 
 EXCEPTIONS_TO_CATCH = (InterfaceError,)

django_celery_results/models/abstract.py

@@ -3,13 +3,12 @@
 import json
 
 from celery import states
-from celery.result import result_from_tuple
+from celery.result import CeleryGroupResult, result_from_tuple
 from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from .. import managers
-from ..models.helpers import groupresult_model
 
 ALL_STATES = sorted(states.ALL_STATES)
 TASK_STATE_CHOICES = sorted(zip(ALL_STATES, ALL_STATES))
@@ -174,7 +173,7 @@ def group_result(self, app=None):
             app (Celery): app instance to create the GroupResult with.
 
         """
-        return groupresult_model()(
+        return CeleryGroupResult(
             self.group_id,
             [result_from_tuple(r, app=app)
              for r in json.loads(self.sub_tasks)],

django_celery_results/models/helpers.py

@@ -2,12 +2,12 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
+from .generic import ChordCounter, GroupResult, TaskResult
+
 
 def taskresult_model():
     """Return the TaskResult model that is active in this project."""
     if not hasattr(settings, 'CELERY_RESULTS_TASKRESULT_MODEL'):
-        from .generic import TaskResult
-
         return TaskResult
 
     try:
@@ -31,8 +31,6 @@ def chordcounter_model():
     """Return the ChordCounter model that is active in this project."""
 
     if not hasattr(settings, 'CELERY_RESULTS_CHORDCOUNTER_MODEL'):
-        from .generic import ChordCounter
-
         return ChordCounter
 
     try:
@@ -55,8 +53,6 @@ def chordcounter_model():
 def groupresult_model():
     """Return the GroupResult model that is active in this project."""
     if not hasattr(settings, 'CELERY_RESULTS_GROUPRESULT_MODEL'):
-        from .generic import GroupResult
-
         return GroupResult
 
     try: