Commit bf271a11 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

higher priority to iiif tasks only when using huey.PriorityRedisHuey

parent c4a8d719

src/jama/__init__.py

+1 −1
Original line number Diff line number Diff line 
__version__ = "0.1.101"
 
__version__ = "0.1.102"

src/resources/management/commands/addlocalfiles.py

+5 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ from resources import tasks 
from concurrent.futures import ThreadPoolExecutor

import multiprocessing

from pathlib import Path

from django.conf import settings





@lru_cache(maxsize=None)
@@ -41,6 +42,9 @@ def _add_file( 
    delete_source: bool = False,

):

    resource_id = handle_local_file(file_path, project)

    if settings.HUEY.get("huey_class") == "huey.PriorityRedisHuey":

        tasks.iiif_task(resource_id, priority=90)

    else:

        tasks.iiif_task(resource_id)

    tasks.exif_task(resource_id)

    tasks.ocr_task(resource_id)

src/resources/management/commands/ensureiiif.py

+5 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ from resources.tasks import iiif_task 
from resources.helpers import iiif_destination_dir_from_hash

import os

from django.utils import timezone

from django.conf import settings





class Command(BaseCommand):
@@ -17,4 +18,7 @@ class Command(BaseCommand): 
            iiif_destination_dir = iiif_destination_dir_from_hash(f.hash)

            iiif_destination_file = "{}{}".format(iiif_destination_dir, f.hash)

            if not os.path.exists(iiif_destination_file):

                if settings.HUEY.get("huey_class") == "huey.PriorityRedisHuey":

                    iiif_task(f.pk, priority=90)

                else:

                    iiif_task(f.pk)

src/resources/pipelines.py

+5 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ from typing import Dict, Union 
from .models import Resource, Collection, File



import logging

from django.conf import settings



logger = logging.getLogger(__name__)
@@ -26,6 +27,9 @@ def make_iiif(obj: Union[Resource, File, Collection], parameters: Dict = None): 
    if obj.file and obj.file.should_have_iiif:

        from resources.tasks import iiif_task



        if settings.HUEY.get("huey_class") == "huey.PriorityRedisHuey":

            iiif_task(obj.gile.pk, priority=90)

        else:

            iiif_task(obj.file.pk)

src/resources/tasks.py

+4 −1
Original line number Diff line number Diff line
@@ -307,6 +307,9 @@ def ensureiiif(): 
        iiif_destination_dir = iiif_destination_dir_from_hash(f.hash)

        iiif_destination_file = "{}{}".format(iiif_destination_dir, f.hash)

        if not os.path.exists(iiif_destination_file):

            if settings.HUEY.get("huey_class") == "huey.PriorityRedisHuey":

                iiif_task(f.pk, priority=90)

            else:

                iiif_task(f.pk)

            logger.info(f"tasked missing IIIF for file({f.pk})")