invenio-vocabularies 7.0.0__tar.gz → 7.0.0.dev1__tar.gz

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/CHANGES.rst

@@ -9,23 +9,12 @@
 Changes
 =======
 
-Version v7.0.0 (released 2025-02-13)
-
-- Promote to stable release
-- jobs: apply code upgrades
-
-Version v7.0.0.dev2 (released 2025-01-23)
-
-Version v7.0.0.dev1 (released 2024-12-12)
+Version 7.0.0.dev1 (released 2024-12-12)
 
 - comp: make compatible to flask-sqlalchemy>=3.1
 - setup: change to reusable workflows
 - setup: bump major dependencies
 
-Version v6.11.0 (released 2024-12-13)
-
-- names: fix acronym in marshamllow schema
-
 Version v6.10.1 (released 2024-12-12)
 
 - names: drop unique id on the internal id

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 7.0.0
+Version: 7.0.0.dev1
 Summary: Invenio module for managing vocabularies.
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -15,7 +15,7 @@ License-File: AUTHORS.rst
 Requires-Dist: invenio-i18n<4.0.0,>=3.0.0
 Requires-Dist: invenio-records-resources<8.0.0,>=7.0.0
 Requires-Dist: invenio-administration<4.0.0,>=3.0.0
-Requires-Dist: invenio-jobs<4.0.0,>=3.0.0
+Requires-Dist: invenio-jobs<4.0.0,>=3.0.0.dev1
 Requires-Dist: lxml>=4.5.0
 Requires-Dist: pycountry<23.0.0,>=22.3.5
 Requires-Dist: PyYAML>=5.4.1
@@ -91,23 +91,12 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
-Version v7.0.0 (released 2025-02-13)
-
-- Promote to stable release
-- jobs: apply code upgrades
-
-Version v7.0.0.dev2 (released 2025-01-23)
-
-Version v7.0.0.dev1 (released 2024-12-12)
+Version 7.0.0.dev1 (released 2024-12-12)
 
 - comp: make compatible to flask-sqlalchemy>=3.1
 - setup: change to reusable workflows
 - setup: bump major dependencies
 
-Version v6.11.0 (released 2024-12-13)
-
-- names: fix acronym in marshamllow schema
-
 Version v6.10.1 (released 2024-12-12)
 
 - names: drop unique id on the internal id

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/invenio_vocabularies/__init__.py

@@ -11,6 +11,6 @@
 
 from .ext import InvenioVocabularies
 
-__version__ = "7.0.0"
+__version__ = "7.0.0.dev1"
 
 __all__ = ("__version__", "InvenioVocabularies")

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/invenio_vocabularies/contrib/names/schema.py

@@ -11,14 +11,7 @@
 from functools import partial
 
 from invenio_i18n import lazy_gettext as _
-from marshmallow import (
-    EXCLUDE,
-    ValidationError,
-    fields,
-    post_dump,
-    post_load,
-    validates_schema,
-)
+from marshmallow import ValidationError, fields, post_dump, post_load, validates_schema
 from marshmallow_utils.fields import IdentifierSet, SanitizedUnicode
 from marshmallow_utils.schemas import IdentifierSchema
 
@@ -34,11 +27,6 @@ class AffiliationRelationSchema(BaseAffiliationRelationSchema):
 
     acronym = SanitizedUnicode(dump_only=True)
 
-    class Meta:
-        """Meta class."""
-
-        unknown = EXCLUDE
-
 
 class NameSchema(BaseVocabularySchema, ModePIDFieldVocabularyMixin):
     """Service schema for names.

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/invenio_vocabularies/jobs.py

@@ -9,19 +9,44 @@
 """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):
@@ -32,8 +57,13 @@ class ProcessRORAffiliationsJob(ProcessDataStreamJob):
     id = "process_ror_affiliations"
 
     @classmethod
-    def build_task_arguments(cls, job_obj, since=None, **kwargs):
-        """Process ROR affiliations."""
+    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()
+
         # 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 {
@@ -70,8 +100,13 @@ class ProcessRORFundersJob(ProcessDataStreamJob):
     id = "process_ror_funders"
 
     @classmethod
-    def build_task_arguments(cls, job_obj, since=None, **kwargs):
-        """Process ROR funders."""
+    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()
+
         # 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 {
@@ -108,8 +143,8 @@ class ImportAwardsOpenAIREJob(ProcessDataStreamJob):
     id = "import_awards_openaire"
 
     @classmethod
-    def build_task_arguments(cls, job_obj, since=None, **kwargs):
-        """Process awards OpenAIRE."""
+    def default_args(cls, job_obj, **kwargs):
+        """Generate default job arguments."""
         return {
             "config": {
                 "readers": [
@@ -143,8 +178,8 @@ class UpdateAwardsCordisJob(ProcessDataStreamJob):
     id = "update_awards_cordis"
 
     @classmethod
-    def build_task_arguments(cls, job_obj, since=None, **kwargs):
-        """Process awards Cordis."""
+    def default_args(cls, job_obj, **kwargs):
+        """Generate default job arguments."""
         return {
             "config": {
                 "readers": [
@@ -171,6 +206,6 @@ class ImportORCIDJob(ProcessDataStreamJob):
     id = "import_orcid"
 
     @classmethod
-    def build_task_arguments(cls, job_obj, since=None, **kwargs):
-        """Process ORCID data."""
+    def default_args(cls, job_obj, **kwargs):
+        """Generate default job arguments."""
         return {"config": {**ORCID_PRESET_DATASTREAM_CONFIG}}

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/invenio_vocabularies.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 7.0.0
+Version: 7.0.0.dev1
 Summary: Invenio module for managing vocabularies.
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -15,7 +15,7 @@ License-File: AUTHORS.rst
 Requires-Dist: invenio-i18n<4.0.0,>=3.0.0
 Requires-Dist: invenio-records-resources<8.0.0,>=7.0.0
 Requires-Dist: invenio-administration<4.0.0,>=3.0.0
-Requires-Dist: invenio-jobs<4.0.0,>=3.0.0
+Requires-Dist: invenio-jobs<4.0.0,>=3.0.0.dev1
 Requires-Dist: lxml>=4.5.0
 Requires-Dist: pycountry<23.0.0,>=22.3.5
 Requires-Dist: PyYAML>=5.4.1
@@ -91,23 +91,12 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
-Version v7.0.0 (released 2025-02-13)
-
-- Promote to stable release
-- jobs: apply code upgrades
-
-Version v7.0.0.dev2 (released 2025-01-23)
-
-Version v7.0.0.dev1 (released 2024-12-12)
+Version 7.0.0.dev1 (released 2024-12-12)
 
 - comp: make compatible to flask-sqlalchemy>=3.1
 - setup: change to reusable workflows
 - setup: bump major dependencies
 
-Version v6.11.0 (released 2024-12-13)
-
-- names: fix acronym in marshamllow schema
-
 Version v6.10.1 (released 2024-12-12)
 
 - names: drop unique id on the internal id

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/invenio_vocabularies.egg-info/requires.txt

@@ -1,7 +1,7 @@
 invenio-i18n<4.0.0,>=3.0.0
 invenio-records-resources<8.0.0,>=7.0.0
 invenio-administration<4.0.0,>=3.0.0
-invenio-jobs<4.0.0,>=3.0.0
+invenio-jobs<4.0.0,>=3.0.0.dev1
 lxml>=4.5.0
 pycountry<23.0.0,>=22.3.5
 PyYAML>=5.4.1

{invenio_vocabularies-7.0.0 → invenio_vocabularies-7.0.0.dev1}/setup.cfg

@@ -21,7 +21,7 @@ install_requires =
 	invenio-i18n>=3.0.0,<4.0.0
 	invenio-records-resources>=7.0.0,<8.0.0
 	invenio-administration>=3.0.0,<4.0.0
-	invenio-jobs>=3.0.0,<4.0.0
+	invenio-jobs>=3.0.0.dev1,<4.0.0
 	lxml>=4.5.0
 	pycountry>=22.3.5,<23.0.0
 	PyYAML>=5.4.1