invenio-vocabularies 8.2.0__py2.py3-none-any.whl → 8.3.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

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

invenio_vocabularies/contrib/common/ror/datastreams.py

@@ -10,8 +10,8 @@
 """ROR-related Datastreams Readers/Writers/Transformers module."""
 
 import io
+from datetime import datetime
 
-import arrow
 import requests
 from flask import current_app
 from idutils import normalize_ror
@@ -52,9 +52,11 @@ class RORHTTPReader(BaseReader):
                     json_ld_reponse.raise_for_status()
                     json_ld_data = json_ld_reponse.json()
 
-                    last_dump_date = arrow.get(
-                        json_ld_data.get("dateCreated")
-                        or json_ld_data.get("datePublished")
+                    last_dump_date = json_ld_data.get(
+                        "dateCreated"
+                    ) or json_ld_data.get("datePublished")
+                    last_dump_date = datetime.fromisoformat(
+                        last_dump_date.replace("Z", "+00:00")
                     )
                     return last_dump_date
         else:
@@ -93,7 +95,9 @@ class RORHTTPReader(BaseReader):
 
         if self._since and self._since != "None":
             last_dump_date = self._get_last_dump_date(linksets)
-            if last_dump_date < arrow.get(self._since):
+            since = datetime.fromisoformat(self._since)
+
+            if last_dump_date < since:
                 current_app.logger.info(
                     f"Skipping ROR data dump (last dump: {last_dump_date}, since: {self._since})"
                 )

invenio_vocabularies/contrib/names/datastreams.py

@@ -11,13 +11,12 @@
 import csv
 import io
 import tarfile
-from concurrent.futures import ThreadPoolExecutor, as_completed
+from concurrent.futures import ThreadPoolExecutor
 from contextvars import copy_context
-from datetime import timedelta
+from datetime import datetime, timedelta
 from itertools import islice
 from pathlib import Path
 
-import arrow
 import regex as re
 from flask import current_app
 from invenio_access.permissions import system_identity
@@ -66,12 +65,16 @@ class OrcidDataSyncReader(BaseReader):
 
         Yield ORCiDs to sync until the last sync date is reached.
         """
-        date_format = "YYYY-MM-DD HH:mm:ss.SSSSSS"
-        date_format_no_millis = "YYYY-MM-DD HH:mm:ss"
-        time_shift = current_app.config["VOCABULARIES_ORCID_SYNC_SINCE"]
+        date_format = "%Y-%m-%d %H:%M:%S.%f"
+        date_format_no_millis = "%Y-%m-%d %H:%M:%S"
+
         if self.since:
-            time_shift = self.since
-        last_sync = arrow.now() - timedelta(**time_shift)
+            last_sync = datetime.now()
+        else:
+            last_sync = datetime.now() - timedelta(
+                **current_app.config["VOCABULARIES_ORCID_SYNC_SINCE"]
+            )
+
         try:
             content = io.TextIOWrapper(fileobj, encoding="utf-8")
             csv_reader = csv.DictReader(content)
@@ -82,9 +85,11 @@ class OrcidDataSyncReader(BaseReader):
                 # Lambda file is ordered by last modified date
                 last_modified_str = row["last_modified"]
                 try:
-                    last_modified_date = arrow.get(last_modified_str, date_format)
-                except arrow.parser.ParserError:
-                    last_modified_date = arrow.get(
+                    last_modified_date = datetime.strptime(
+                        last_modified_str, date_format
+                    )
+                except Exception:
+                    last_modified_date = datetime.strptime(
                         last_modified_str, date_format_no_millis
                     )
 

invenio_vocabularies/contrib/subjects/config.py

@@ -45,8 +45,10 @@ class SubjectsSearchOptions(SearchOptions):
     """Search options."""
 
     suggest_parser_cls = CompositeSuggestQueryParser.factory(
+        filter_field="scheme",
         fields=[
             "subject^100",
+            "scheme^20",
             localized_title,
             "synonyms^20",
         ],

invenio_vocabularies/jobs.py

@@ -8,8 +8,6 @@
 
 """Jobs module."""
 
-import datetime
-
 from invenio_i18n import lazy_gettext as _
 from invenio_jobs.jobs import JobType
 
@@ -40,7 +38,7 @@ class ProcessRORAffiliationsJob(ProcessDataStreamJob):
             "config": {
                 "readers": [
                     {
-                        "args": {"since": str(since)},
+                        "args": {"since": since},
                         "type": "ror-http",
                     },
                     {"args": {"regex": "_schema_v2\\.json$"}, "type": "zip"},
@@ -78,7 +76,7 @@ class ProcessRORFundersJob(ProcessDataStreamJob):
             "config": {
                 "readers": [
                     {
-                        "args": {"since": str(since)},
+                        "args": {"since": since},
                         "type": "ror-http",
                     },
                     {"args": {"regex": "_schema_v2\\.json$"}, "type": "zip"},
@@ -173,4 +171,9 @@ class ImportORCIDJob(ProcessDataStreamJob):
     @classmethod
     def build_task_arguments(cls, job_obj, since=None, **kwargs):
         """Process ORCID data."""
-        return {"config": {**ORCID_PRESET_DATASTREAM_CONFIG}}
+        task_args = {"config": {**ORCID_PRESET_DATASTREAM_CONFIG}}
+        for reader in task_args["config"]["readers"]:
+            # Assign since to all readers of the ORCID job
+            # It is the responsibility of the reader to handle it or ignore it
+            reader["args"] = {**reader.get("args", {}), "since": str(since)}
+        return task_args

{invenio_vocabularies-8.2.0.dist-info → invenio_vocabularies-8.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-vocabularies
-Version: 8.2.0
+Version: 8.3.0
 Summary: Invenio module for managing vocabularies.
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -89,6 +89,14 @@ Invenio module for managing vocabularies, based on Invenio-Records and Invenio-R
 Changes
 =======
 
+Version v8.3.0 (released 2025-07-31)
+
+- subjects: Add search scheme field configuration to enable composite and filter query support in subject search functionality
+
+Version v8.2.1 (released 2025-07-21)
+
+- fix(jobs): remove string casts from since
+
 Version v8.2.0 (released 2025-07-17)
 
 - tasks: fix error name

{invenio_vocabularies-8.2.0.dist-info → invenio_vocabularies-8.3.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-invenio_vocabularies/__init__.py,sha256=HoDbpyP1QLhDVWx9AXCeUASOwbeWCvmIXCokn6cwpNE,434
+invenio_vocabularies/__init__.py,sha256=XqkbqtX6LzTtz60HTCIzX0QkWYmN5Aiagh22cYaT3EM,434
 invenio_vocabularies/cli.py,sha256=CpXTTIn2GTpUqNfLEMlRAp3JWst8ZjHVxoGYdhuuv_4,5959
 invenio_vocabularies/config.py,sha256=v6fTdeQXfUl0LavI2Xslql7mv3DVuIuGTqe2z3H3S7o,6942
 invenio_vocabularies/ext.py,sha256=GujJ4UARd4Fxf4z7zznRk9JAgHamZuYCOdrKU5czg00,5987
 invenio_vocabularies/factories.py,sha256=DM4jRUYu-so1jHRzhbNoNTnWKpYTZeRJhSP273giYws,6400
 invenio_vocabularies/fixtures.py,sha256=iEPkWf_ZjdP2D9r2sLdIlPoR8Rq2m5cnoFwywUGHneg,1696
-invenio_vocabularies/jobs.py,sha256=ACNpTRoM8AcSlkU79spEKOe8LHtRuBOBLNZQK2jSCgc,5811
+invenio_vocabularies/jobs.py,sha256=fSRedZhu_jH5gBD7Z8f_sNdGxAn9dFmbouXkIbqE4LI,6083
 invenio_vocabularies/proxies.py,sha256=k7cTUgWfnCoYIuNqAj_VFi1zBN33KNNclRSVnBkObEM,711
 invenio_vocabularies/views.py,sha256=PNJ5nvc3O7ASwNe56xmqy5YaU9n3UYF3W2JwvtE_kYs,1561
 invenio_vocabularies/webpack.py,sha256=FkM8TxXClmaJcD8YsQq5Mai56nYVJh_1IYTMEHb3c1M,1891
@@ -148,7 +148,7 @@ invenio_vocabularies/contrib/common/__init__.py,sha256=DdbGYRthEpQtObhY_YK4vOT9Z
 invenio_vocabularies/contrib/common/openaire/__init__.py,sha256=L7UtSimFJ3NI6j53bHzYKsWpFti1uo4fPb9OaTl7leI,244
 invenio_vocabularies/contrib/common/openaire/datastreams.py,sha256=BV6NtBCPFuii6KbTHGkgNQO5tt_3Hn9T_219bz8AINg,3514
 invenio_vocabularies/contrib/common/ror/__init__.py,sha256=3u2-fre1SQ-4nz3Ay0nxj3ntmMZ8Ujh_4eV-fyxfmtc,239
-invenio_vocabularies/contrib/common/ror/datastreams.py,sha256=V2GzJ2Hsu7QFcbqguEE2Z8X5ZDiqRp5Q0e-o1x0BmdQ,8434
+invenio_vocabularies/contrib/common/ror/datastreams.py,sha256=8rxfWDMZPIkkPJM5Z3GGQcuDfZI9_hjYwn_-ngMDx_k,8601
 invenio_vocabularies/contrib/funders/__init__.py,sha256=YxFXBDnT7NM8rFwxT_Ge3xXR2n17EM0alknQq7r_Bt8,478
 invenio_vocabularies/contrib/funders/api.py,sha256=QKGGeSnPHSoBfucvpaVruXT_txYidofZ080G3IxFkIo,306
 invenio_vocabularies/contrib/funders/config.py,sha256=OAP7NB7oF3cmrLBlP9dubrAAtanPWvrQO1XZaImBf98,2242
@@ -175,7 +175,7 @@ invenio_vocabularies/contrib/names/__init__.py,sha256=QwPEMnNyjt9LVeBBdFbVQfIxOn
 invenio_vocabularies/contrib/names/api.py,sha256=sEPn_jFX3gyoxgbdEUSIvOoPCUI8pocI6qCZO6mzCgQ,300
 invenio_vocabularies/contrib/names/components.py,sha256=PyYD1lOhmsuNoyDwM_huxkeo7kWd44vkEbJk9gqbDrM,769
 invenio_vocabularies/contrib/names/config.py,sha256=62jh4MP-CygnBpnRBVaCoGySHDEwhBSG1MnlUBumthw,2046
-invenio_vocabularies/contrib/names/datastreams.py,sha256=ZbgJo0q76ZEIRp8IQ2Qzj16IWoc1TWXoBmfjNUaT06E,16887
+invenio_vocabularies/contrib/names/datastreams.py,sha256=FqljkIl_MdYQ-oAnSMFf2Smfz-XjX8eVIdngeQApey0,16933
 invenio_vocabularies/contrib/names/models.py,sha256=SYdtDDG-y5Wq_d06YhiVO5n8gfxPW_mx-tECsIcv5H8,308
 invenio_vocabularies/contrib/names/names.py,sha256=jej3gkBgOJpKwp5RmWk1AP678WkMb0VqCpzbTHLTyEc,2675
 invenio_vocabularies/contrib/names/permissions.py,sha256=5xrpYsA3oQUJ5lJpF7wjRAFiW-pM6_yP1k9zllbRwnQ,844
@@ -196,7 +196,7 @@ invenio_vocabularies/contrib/names/mappings/v7/__init__.py,sha256=qLGB8C0kPI3xub
 invenio_vocabularies/contrib/names/mappings/v7/names/name-v1.0.0.json,sha256=5Ybcq3fUMYx3u1MNKmHh-CWBtATS9MYpdEcwAM8EQ80,1943
 invenio_vocabularies/contrib/subjects/__init__.py,sha256=GtXZKA6VWG1oA1fUX2Wh92nd-1i7RnnQF6RprGhxkD4,591
 invenio_vocabularies/contrib/subjects/api.py,sha256=QH8mxoLsa8qjJT1i1Tj6rRnpbH23plo2IMOJ56rnvbU,347
-invenio_vocabularies/contrib/subjects/config.py,sha256=CLQT1_5gj4waCFBI6K2jobHHUQjW0RJ7Xk49caWDP14,2378
+invenio_vocabularies/contrib/subjects/config.py,sha256=8_5FKfG5x5xIxw7eqwZNnanjJSH43EDTiaRKVOjatvk,2434
 invenio_vocabularies/contrib/subjects/datastreams.py,sha256=s6o5_A-0I3TMx77IbwmLHJpSuDWx8xClW9ocnP2JYfw,1885
 invenio_vocabularies/contrib/subjects/facets.py,sha256=qQ7_rppFBzsmrlZu4-MvOIdUcjeOmDA9gOHAcs0lWwI,695
 invenio_vocabularies/contrib/subjects/models.py,sha256=8XgbVRxDDvhWPjMWsoCriNlOKdmV_113a14yLRtlvM4,363
@@ -328,10 +328,10 @@ invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=AEoPrwqBX
 invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.po,sha256=sP0-MvZo4F4wIG4JVLebCAOxh1tFIkfM2bLaKL-B148,8024
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=p2PFN_PL1m7miZ6qyoHFmBi6UUF3qhuz1sfCqTxm5fY,599
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.po,sha256=vO8YRTkTqKE6gepSW_N3uNKYp3Me1rqnYaONFQGJOoY,7519
-invenio_vocabularies-8.2.0.dist-info/licenses/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-8.2.0.dist-info/licenses/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-8.2.0.dist-info/METADATA,sha256=DUcvbypazoDpoVyHCEwPsw06BM7dSGSfnc6k5d2J-4E,14848
-invenio_vocabularies-8.2.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-invenio_vocabularies-8.2.0.dist-info/entry_points.txt,sha256=lget4Ekno9VRTq36oowWReIJA99165gOp0BOiiET60Y,3179
-invenio_vocabularies-8.2.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-8.2.0.dist-info/RECORD,,
+invenio_vocabularies-8.3.0.dist-info/licenses/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-8.3.0.dist-info/licenses/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-8.3.0.dist-info/METADATA,sha256=Dlo1Et4okP8_1TBa4zoID2kIjFfnRytFIyd3c9bRZ2M,15097
+invenio_vocabularies-8.3.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+invenio_vocabularies-8.3.0.dist-info/entry_points.txt,sha256=lget4Ekno9VRTq36oowWReIJA99165gOp0BOiiET60Y,3179
+invenio_vocabularies-8.3.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-8.3.0.dist-info/RECORD,,