Skip to content

Commit

Permalink
Delay Celery tasks and multiple fixes in CelerySignalProcessor (#58)
Browse files Browse the repository at this point in the history
* Correctly use `.delay` when calling tasks.
* Implemented `BaseSignalProcessor.instance_requires_update()`.
* Only initiate tasks if `instance_requires_update` return `True`.
* Add `transaction.on_commit` to task calls.
* Quietly catch `DoesNotExist` in the task.
* Include .vscode settings in `.gitignore`.

---------

Co-authored-by: Jose Ariza <[email protected]>
  • Loading branch information
JordanHyatt and jlariza authored Apr 13, 2024
1 parent c0c7e08 commit b063229
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ docs/_buildenv*

*.sqlite3
_autofixture*
.vscode/settings.json
49 changes: 39 additions & 10 deletions django_opensearch_dsl/signals.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
"""Attach django-opensearch-dsl to Django's signals and cause things to index."""

import abc
from functools import partial

from django.apps import apps
from django.core.serializers import deserialize, serialize
from django.db import models
from django.db import models, transaction
from django.dispatch import Signal

from .apps import DODConfig
Expand Down Expand Up @@ -37,6 +38,15 @@ def handle_pre_delete(self, sender, instance, **kwargs):
def handle_m2m_changed(self, sender, instance, action, **kwargs):
"""Handle changes in ManyToMany relations."""

def instance_requires_update(self, instance):
"""Check if an instance is connected to a Document (directly or related)."""
m1 = instance._meta.model in registry._models
m2 = instance.__class__.__base__ in registry._models
m3 = bool(list(registry._get_related_doc(instance)))
if m1 or m2 or m3:
return True
return False

def setup(self):
"""Set up the SignalProcessor."""
models.signals.post_save.connect(self.handle_save)
Expand Down Expand Up @@ -84,9 +94,13 @@ def handle_m2m_changed(self, sender, instance, action, **kwargs):
@shared_task()
def handle_save_task(app_label, model, pk):
"""Handle the update on the registry as a Celery task."""
instance = apps.get_model(app_label, model).objects.get(pk=pk)
registry.update(instance)
registry.update_related(instance)
model_object = apps.get_model(app_label, model)
try:
instance = model_object.objects.get(pk=pk)
registry.update(instance)
registry.update_related(instance)
except model_object.DoesNotExist:
pass

@shared_task()
def handle_pre_delete_task(data):
Expand All @@ -102,10 +116,25 @@ class CelerySignalProcessor(RealTimeSignalProcessor):
Celery.
"""

def handle_save(self, sender, instance, **kwargs):
"""Update the instance in model and associated model indices."""
handle_save_task(instance._meta.app_label, instance.__class__.__name__, instance.pk)
def handle_save(self, sender, instance, **kwargs):
"""Update the instance in model and associated model indices."""
if self.instance_requires_update(instance):
transaction.on_commit(
partial(
handle_save_task.delay,
app_label=instance._meta.app_label,
model=instance.__class__.__name__,
pk=instance.pk,
)
)

def handle_pre_delete(self, sender, instance, **kwargs):
"""Delete the instance from model and associated model indices."""
handle_pre_delete_task(serialize("json", [instance], cls=DODConfig.signal_processor_serializer_class()))
def handle_pre_delete(self, sender, instance, **kwargs):
"""Delete the instance from model and associated model indices."""
if self.instance_requires_update(instance):
handle_pre_delete_task.delay(
serialize(
"json",
[instance],
cls=DODConfig.signal_processor_serializer_class(),
)
)

0 comments on commit b063229

Please sign in to comment.