Migrate Jobs model to django

Author: AlexVelezLl

kolibri/core/auth/tasks.py

@@ -46,7 +46,6 @@
 from kolibri.core.tasks.utils import DatabaseLockedError
 from kolibri.core.tasks.utils import get_current_job
 from kolibri.core.tasks.validation import JobValidator
-from kolibri.utils.time_utils import naive_utc_datetime
 from kolibri.utils.translation import gettext as _
 
 
@@ -472,7 +471,7 @@ def enqueue_soud_sync_processing():
 
     # Check if there is already an enqueued job
     try:
-        converted_next_run = naive_utc_datetime(timezone.now() + next_run)
+        converted_next_run = timezone.now() + next_run
         orm_job = job_storage.get_orm_job(SOUD_SYNC_PROCESSING_JOB_ID)
         if (
             orm_job.state not in (State.COMPLETED, State.FAILED, State.CANCELED)

kolibri/core/tasks/api.py

@@ -2,9 +2,7 @@
 
 from django.http.response import Http404
 from django.utils.decorators import method_decorator
-from django.utils.timezone import make_aware
 from django.views.decorators.csrf import csrf_protect
-from pytz import utc
 from rest_framework import decorators
 from rest_framework import serializers
 from rest_framework import status
@@ -100,8 +98,7 @@ def _job_to_response(self, job):
             "args": job.args,
             "kwargs": job.kwargs,
             "extra_metadata": job.extra_metadata,
-            # Output is UTC naive, coerce to UTC aware.
-            "scheduled_datetime": make_aware(orm_job.scheduled_time, utc).isoformat(),
+            "scheduled_datetime": orm_job.scheduled_time.isoformat(),
             "repeat": orm_job.repeat,
             "repeat_interval": orm_job.interval,
             "retry_interval": orm_job.retry_interval,

kolibri/core/tasks/job.py

@@ -4,7 +4,6 @@
 import traceback
 import uuid
 from collections import namedtuple
-from datetime import timedelta
 
 from kolibri.core.tasks.constants import (  # noqa F401 - imported for backwards compatibility
     Priority,
@@ -102,13 +101,6 @@ def default_status_text(job):
 
 ALLOWED_RETRY_IN_KWARGS = {"priority", "repeat", "interval", "retry_interval"}
 
-RETRY_ON_DELAY = timedelta(
-    seconds=5
-)  # Delay before retrying a job that failed due to a retryable exception
-MAX_RETRIES = (
-    3  # Maximum number of retries for a job that failed due to a retryable exception
-)
-
 
 class Job(object):
     """

kolibri/core/tasks/main.py

@@ -3,21 +3,15 @@
 from django.utils.functional import SimpleLazyObject
 
 from kolibri.core.tasks.storage import Storage
-from kolibri.core.tasks.utils import db_connection
 from kolibri.core.tasks.worker import Worker
 from kolibri.utils import conf
 
 
 logger = logging.getLogger(__name__)
 
 
-connection = SimpleLazyObject(db_connection)
-
-
 def __job_storage():
-    return Storage(
-        connection=connection,
-    )
+    return Storage()
 
 
 # This storage instance should be used to access job_storage db.
@@ -28,7 +22,6 @@ def __job_storage():
 def initialize_workers(log_queue=None):
     logger.info("Starting async task workers.")
     return Worker(
-        connection=connection,
         regular_workers=conf.OPTIONS["Tasks"]["REGULAR_PRIORITY_WORKERS"],
         high_workers=conf.OPTIONS["Tasks"]["HIGH_PRIORITY_WORKERS"],
         log_queue=log_queue,

kolibri/core/tasks/models.py

@@ -47,14 +47,9 @@ def allow_migrate(self, db, app_label, model_name=None, **hints):
         return None
 
 
+# The Job model has been migrated from SqlAlchemy to use django models
+# generated by Copilot and tweaked
 class Job(models.Model):
-    """
-    Django model corresponding to the 'jobs' table in SQLAlchemy.
-
-    This model is not meant to be used for normal CRUD operations (yet).
-    It exists solely for Django to manage the migrations
-    of the 'jobs' table, which is handled by SQLAlchemy.
-    """
 
     # The hex UUID given to the job upon first creation.
     id = models.CharField(max_length=36, primary_key=True)