jobs: apply code upgrades

invenio_vocabularies/jobs.py

@@ -9,44 +9,19 @@
 """Jobs module."""
 
 import datetime
-from datetime import timezone
 
 from invenio_i18n import gettext as _
 from invenio_jobs.jobs import JobType
-from marshmallow import Schema, fields
-from marshmallow_utils.fields import TZDateTime
 
 from invenio_vocabularies.services.tasks import process_datastream
 
 from .contrib.names.datastreams import ORCID_PRESET_DATASTREAM_CONFIG
 
 
-class ArgsSchema(Schema):
-    """Schema of task input arguments."""
-
-    since = TZDateTime(
-        timezone=timezone.utc,
-        format="iso",
-        metadata={
-            "description": _(
-                "YYYY-MM-DD HH:mm format. "
-                "Leave field empty if it should continue since last successful run."
-            )
-        },
-    )
-    job_arg_schema = fields.String(
-        metadata={"type": "hidden"},
-        dump_default="ArgsSchema",
-        load_default="ArgsSchema",
-    )
-
-
 class ProcessDataStreamJob(JobType):
     """Generic process data stream job type."""
 
-    arguments_schema = ArgsSchema
     task = process_datastream
-    id = None
 
 
 class ProcessRORAffiliationsJob(ProcessDataStreamJob):
@@ -57,13 +32,8 @@ class ProcessRORAffiliationsJob(ProcessDataStreamJob):
     id = "process_ror_affiliations"
 
     @classmethod
-    def default_args(cls, job_obj, since=None, **kwargs):
-        """Generate default job arguments here."""
-        if since is None and job_obj.last_runs["success"]:
-            since = job_obj.last_runs["success"].started_at
-        else:
-            since = since or datetime.datetime.now()
-
+    def build_task_arguments(cls, job_obj, since=None, **kwargs):
+        """Process ROR affiliations."""
         # NOTE: Update is set to False for now given we don't have the logic to re-index dependent records yet.
         # Since jobs support custom args, update true can be passed via that.
         return {
@@ -100,13 +70,8 @@ class ProcessRORFundersJob(ProcessDataStreamJob):
     id = "process_ror_funders"
 
     @classmethod
-    def default_args(cls, job_obj, since=None, **kwargs):
-        """Generate default job arguments here."""
-        if since is None and job_obj.last_runs["success"]:
-            since = job_obj.last_runs["success"].started_at
-        else:
-            since = since or datetime.datetime.now()
-
+    def build_task_arguments(cls, job_obj, since=None, **kwargs):
+        """Process ROR funders."""
         # NOTE: Update is set to False for now given we don't have the logic to re-index dependent records yet.
         # Since jobs support custom args, update true can be passed via that.
         return {
@@ -143,8 +108,8 @@ class ImportAwardsOpenAIREJob(ProcessDataStreamJob):
     id = "import_awards_openaire"
 
     @classmethod
-    def default_args(cls, job_obj, **kwargs):
-        """Generate default job arguments."""
+    def build_task_arguments(cls, job_obj, since=None, **kwargs):
+        """Process awards OpenAIRE."""
         return {
             "config": {
                 "readers": [
@@ -178,8 +143,8 @@ class UpdateAwardsCordisJob(ProcessDataStreamJob):
     id = "update_awards_cordis"
 
     @classmethod
-    def default_args(cls, job_obj, **kwargs):
-        """Generate default job arguments."""
+    def build_task_arguments(cls, job_obj, since=None, **kwargs):
+        """Process awards Cordis."""
         return {
             "config": {
                 "readers": [
@@ -206,6 +171,6 @@ class ImportORCIDJob(ProcessDataStreamJob):
     id = "import_orcid"
 
     @classmethod
-    def default_args(cls, job_obj, **kwargs):
-        """Generate default job arguments."""
+    def build_task_arguments(cls, job_obj, since=None, **kwargs):
+        """Process ORCID data."""
         return {"config": {**ORCID_PRESET_DATASTREAM_CONFIG}}

setup.cfg

@@ -30,7 +30,7 @@ install_requires =
     invenio-i18n>=2.0.0,<3.0.0
     invenio-records-resources>=6.0.0,<7.0.0
     invenio-administration>=2.0.0,<3.0.0
-    invenio-jobs>=1.0.0,<2.0.0
+    invenio-jobs>=2.0.0,<3.0.0
     lxml>=4.5.0
     # Upper pinning pycountry due to commonmeta-py
     pycountry>=22.3.5,<23.0.0