invenio-vocabularies 8.0.0__py2.py3-none-any.whl → 8.1.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

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

invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js

@@ -176,7 +176,7 @@ function FundingFieldForm(props) {
           />
         </Overridable>
 
-        {fundingError && <FeedbackLabel errorMessage={fundingError} />}
+        {fundingError && <FeedbackLabel fieldPath={fieldPath} />}
       </Form.Field>
     </DndProvider>
   );

invenio_vocabularies/contrib/affiliations/datastreams.py

@@ -200,6 +200,7 @@ VOCABULARIES_DATASTREAM_TRANSFORMERS = {
 
 DATASTREAM_CONFIG = {
     "readers": [
+        {"type": "ror-http"},
         {
             "type": "zip",
             "args": {

invenio_vocabularies/contrib/common/ror/datastreams.py

@@ -91,7 +91,7 @@ class RORHTTPReader(BaseReader):
         linkset_response.raise_for_status()
         linksets = linkset_response.json()["linkset"]
 
-        if self._since:
+        if self._since and self._since != "None":
             last_dump_date = self._get_last_dump_date(linksets)
             if last_dump_date < arrow.get(self._since):
                 current_app.logger.info(

invenio_vocabularies/contrib/funders/datastreams.py

@@ -67,6 +67,7 @@ VOCABULARIES_DATASTREAM_TRANSFORMERS = {
 
 DATASTREAM_CONFIG = {
     "readers": [
+        {"type": "ror-http"},
         {
             "type": "zip",
             "args": {

invenio_vocabularies/contrib/names/__init__.py

@@ -13,6 +13,7 @@ from .services import NamesService, NamesServiceConfig
 
 __all__ = (
     "NamesResource",
-    "NamesResourceConfig" "NamesService",
+    "NamesResourceConfig",
+    "NamesService",
     "NamesServiceConfig",
 )

invenio_vocabularies/services/custom_fields/__init__.py

@@ -12,5 +12,6 @@ from .vocabulary import VocabularyCF
 
 __all__ = [
     "VocabularyCF",
-    "SUBJECT_FIELDS_UI" "SUBJECT_FIELDS",
+    "SUBJECT_FIELDS_UI",
+    "SUBJECT_FIELDS",
 ]

invenio_vocabularies/services/service.py

@@ -3,6 +3,7 @@
 # Copyright (C) 2024 CERN.
 # Copyright (C) 2021 Northwestern University.
 # Copyright (C) 2024 University of Münster.
+# Copyright (C) 2025 Graz University of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -33,16 +34,21 @@ class VocabularyTypeService(RecordService):
         """Search for vocabulary types entries."""
         self.require_permission(identity, "list_vocabularies")
 
+        filters = []
         search_params = map_search_params(self.config.search, params)
 
         query_param = search_params["q"]
-
-        filters = []
         if query_param:
-            filters.extend([VocabularyType.id.ilike(f"%{query_param}%")])
+            filters.append(
+                # NOTE: Even though we only have one field, we use `or_` to
+                # allow for future expansion where multiple fields might be searched.
+                sa.or_(
+                    VocabularyType.id.ilike(f"%{query_param}%"),
+                )
+            )
 
         vocabulary_types = (
-            VocabularyType.query.filter(sa.or_(*filters))
+            VocabularyType.query.filter(*filters)
             .order_by(
                 search_params["sort_direction"](
                     sa.text(",".join(search_params["sort"]))

{invenio_vocabularies-8.0.0.dist-info → invenio_vocabularies-8.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-vocabularies
-Version: 8.0.0
+Version: 8.1.0
 Summary: Invenio module for managing vocabularies.
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -89,6 +89,17 @@ Invenio module for managing vocabularies, based on Invenio-Records and Invenio-R
 Changes
 =======
 
+Version v8.1.0 (released 2025-07-03)
+
+- fix: SADeprecationWarning
+- ror: fix handling of _since as "None"
+- chore: fix wrong module export strings
+- datastreams: add ror-http to funders and affiliations
+
+Version v8.0.1 (released 2025-06-11)
+
+- funding: added fieldpath prop for feedback label
+
 Version v8.0.0 (released 2025-06-03)
 
 - setup: bump major dependencies

{invenio_vocabularies-8.0.0.dist-info → invenio_vocabularies-8.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_vocabularies/__init__.py,sha256=6EfMtdvPstHaJqjJWpXbXkqFQoZeFEOOZtb_Yha2g2g,434
+invenio_vocabularies/__init__.py,sha256=S25jEdD4TasaKDl1k8iNY503o84GASmCCQfGr5POCiI,434
 invenio_vocabularies/cli.py,sha256=CpXTTIn2GTpUqNfLEMlRAp3JWst8ZjHVxoGYdhuuv_4,5959
 invenio_vocabularies/config.py,sha256=v6fTdeQXfUl0LavI2Xslql7mv3DVuIuGTqe2z3H3S7o,6942
 invenio_vocabularies/ext.py,sha256=GujJ4UARd4Fxf4z7zznRk9JAgHamZuYCOdrKU5czg00,5987
@@ -32,7 +32,7 @@ invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/form
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/AwardResults.js,sha256=AgqJg9GEcJvKZR4plZsH0j7cm9C3yjT9YCPI6uvmOyc,3499
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/CustomAwardForm.js,sha256=N4nCbvm6_vTCfuGyhuDnydUdk4cHyum14qYALr6p1WE,4675
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FunderDropdown.js,sha256=KOeeopPt1xoxQDmFDOV8nEi9YsH4VZPlc96hEzLxIQY,2432
-invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js,sha256=L1IqUDkU8VIpos7Cv75A-ZkG2ZLSP8aP3uKR5F1TL5k,7622
+invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js,sha256=hpm0FHRdeepOqPtR3G7sHXzf-rmIsBd3NP3mlF9XRJk,7616
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.test.js,sha256=z_4lWkf3h9Uin8OzSBSKY1wpUxtbnjE2kRUjW80jAhA,35
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingFieldItem.js,sha256=FvxrKFOf9tm3O2Dmnd3B4pt-Tj3OCMUKg22-rGI5qC8,4611
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingModal.js,sha256=4ZewwPdzYyWt85VcorgLDe9SguJ0RJCJSTdChUcSxsM,7475
@@ -80,7 +80,7 @@ invenio_vocabularies/contrib/affiliations/__init__.py,sha256=rV8YAzBRoSKsBYcVjCN
 invenio_vocabularies/contrib/affiliations/affiliations.py,sha256=zqFwrAuYhZw7dTfm7dE8bUDxmyPqydUEjKTMPwWSjHk,2096
 invenio_vocabularies/contrib/affiliations/api.py,sha256=5nIOvpfcseuAAg2XgblHc8jb7TAdfU79XOBRpL-p398,326
 invenio_vocabularies/contrib/affiliations/config.py,sha256=FFODJwfj6w-yejNQuP0GFVlc42jHtd47nu6lkN9mcVM,2281
-invenio_vocabularies/contrib/affiliations/datastreams.py,sha256=sMvkt9XOBTV7Q0wexMmwWXY5k9kbetcWBNqfS-vx6Mg,9598
+invenio_vocabularies/contrib/affiliations/datastreams.py,sha256=PW6e1wiqPrW5DIjUtdE_qVCC-oACx4zji1o8zEGJEC4,9628
 invenio_vocabularies/contrib/affiliations/facets.py,sha256=w316MGvtdyTpRCPOpCEmMxxLraRkbFFb1VvLkFlEc9o,1229
 invenio_vocabularies/contrib/affiliations/models.py,sha256=JUcj-1ydc2Cw2Rsc24JwXE3TFBJ_6fivhUYhGq4rT8A,329
 invenio_vocabularies/contrib/affiliations/resources.py,sha256=DBEbRxQmp-o-PeZlgFG588Q4sGcruuwIL8L9O-SzCes,435
@@ -120,11 +120,11 @@ 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=y8b1akZGbUjcvVBdT8hCqeN5ZsrlHr8OWqN0v_M-h18,8408
+invenio_vocabularies/contrib/common/ror/datastreams.py,sha256=V2GzJ2Hsu7QFcbqguEE2Z8X5ZDiqRp5Q0e-o1x0BmdQ,8434
 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
-invenio_vocabularies/contrib/funders/datastreams.py,sha256=3tOwcN1mK5AVqtdU6KdguouGSUurPTO-FDWTKzK1eRo,2481
+invenio_vocabularies/contrib/funders/datastreams.py,sha256=yczgXp4HnoDbU-CpJYrAx0mnRz_dXMC3pE4qvBLEzBU,2511
 invenio_vocabularies/contrib/funders/facets.py,sha256=a068TVtt74Ncu0latb177LFK8EdnpbMOWecAKozA04M,1245
 invenio_vocabularies/contrib/funders/funders.py,sha256=j4V7lz0fR5rp5XBL3cwmQQElwpopIpv4v37xfi1rU0o,2357
 invenio_vocabularies/contrib/funders/models.py,sha256=RAU-_YVOUNVCn03_XGJ2czcVwXTaZPk5w7X_bMAgMOk,314
@@ -143,7 +143,7 @@ invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v1.0.0.json,s
 invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json,sha256=gx2CkNWNcTxP94iCU9remCrWxR-AmNqloYTh47gwNHQ,3481
 invenio_vocabularies/contrib/funders/mappings/v7/__init__.py,sha256=yFHmi3QYD65YKzLU5vMEtwAZn0gwkFYa6Db_tSbHjKE,254
 invenio_vocabularies/contrib/funders/mappings/v7/funders/funder-v1.0.0.json,sha256=E7Zp4IHsQGdaxVrksr-SaQtieV7tV0W6-LgGe231G1w,1646
-invenio_vocabularies/contrib/names/__init__.py,sha256=DBfsM7JMETZGaV5QmXEwE7zhCaAXvc2SZN6uXnW_V-c,451
+invenio_vocabularies/contrib/names/__init__.py,sha256=QwPEMnNyjt9LVeBBdFbVQfIxOnzBwx_lbpyekg3vGOM,456
 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
@@ -233,9 +233,9 @@ invenio_vocabularies/services/permissions.py,sha256=83rNOwCuggdJji3VtWTQgytTrhfi
 invenio_vocabularies/services/querystr.py,sha256=OrNUR_QAcQ_T-EiL3H1Jvzz9gK2ZB5FicsG0fOipSro,2029
 invenio_vocabularies/services/results.py,sha256=6LZIpzWSbt9wpRNWgjA1uIM4RFooOYTkHcp5-PnIJdU,3767
 invenio_vocabularies/services/schema.py,sha256=mwIBFylpQlWw1M6h_axc-z4Yd7X3Z1S0PxJOlZGpfrQ,4634
-invenio_vocabularies/services/service.py,sha256=9QQDsG1WShCpBVFze-Dnq-iC2BwNX_0-qzfzrpImJo8,6469
+invenio_vocabularies/services/service.py,sha256=2LrtXa6gFXhHSWn4R3Kl7Nj2f2mFmxzjgAF3K3Q3LGM,6749
 invenio_vocabularies/services/tasks.py,sha256=xLLxcepJz-pv9KyVbKu-grh3hr9w7djaFKijMe_8WmM,1174
-invenio_vocabularies/services/custom_fields/__init__.py,sha256=QgvSsn-S1xLzbZ57pjjGTt5oI3HqzXHVjwGTtuPgzN8,421
+invenio_vocabularies/services/custom_fields/__init__.py,sha256=Wi7v8VUUTi16TCpMNKZ1zK3zWO2UjWBEnRMJjNm2foI,426
 invenio_vocabularies/services/custom_fields/subject.py,sha256=XTHnOddoSZsDHqGQq-hns46-WaLn88fqz57K--YLHg4,2243
 invenio_vocabularies/services/custom_fields/vocabulary.py,sha256=oQwI8Aoi2Nr9k3eWKnde5H7RXc7qdlATSeI6coy8UR0,3020
 invenio_vocabularies/templates/semantic-ui/invenio_vocabularies/subjects.html,sha256=Fr8xRfKYiytuTfbtH7gfasNXwFIcjPFnXV4F5oGNUkM,681
@@ -300,10 +300,10 @@ invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=bpqywk-Hn
 invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.po,sha256=vg8qC8ofpAdJ3mQz7mWM1ylKDpiNWXFs7rlMdSPkgKk,4629
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=o3nwy64PXTcRaAbRrJpYMICW5aVQ0sCdGIn2Xy4UccU,600
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.po,sha256=9ACePz_EpB-LfcIJajZ2kp8Q04tcdrQLOtug162ZUss,4115
-invenio_vocabularies-8.0.0.dist-info/licenses/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-8.0.0.dist-info/licenses/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-8.0.0.dist-info/METADATA,sha256=3k_ZfbtPNxsB4V9CQyeUB2QNJQjIirDvR34aP-VQ2oI,14107
-invenio_vocabularies-8.0.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-invenio_vocabularies-8.0.0.dist-info/entry_points.txt,sha256=lget4Ekno9VRTq36oowWReIJA99165gOp0BOiiET60Y,3179
-invenio_vocabularies-8.0.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-8.0.0.dist-info/RECORD,,
+invenio_vocabularies-8.1.0.dist-info/licenses/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-8.1.0.dist-info/licenses/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-8.1.0.dist-info/METADATA,sha256=IZINROHFrQn73Te6cD6k1-VkzpTT2PsRHHVbDPmNGfA,14401
+invenio_vocabularies-8.1.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+invenio_vocabularies-8.1.0.dist-info/entry_points.txt,sha256=lget4Ekno9VRTq36oowWReIJA99165gOp0BOiiET60Y,3179
+invenio_vocabularies-8.1.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-8.1.0.dist-info/RECORD,,