invenio-vocabularies 5.0.2__py2.py3-none-any.whl → 5.1.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

@@ -10,6 +10,6 @@
 
 from .ext import InvenioVocabularies
 
-__version__ = "5.0.2"
+__version__ = "5.1.0"
 
 __all__ = ("__version__", "InvenioVocabularies")

invenio_vocabularies/contrib/funders/config.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2022 CERN.
+# Copyright (C) 2022-2024 CERN.
 #
 # 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
@@ -9,6 +9,7 @@
 """Vocabulary funders configuration."""
 
 from flask import current_app
+from invenio_i18n import get_locale
 from invenio_i18n import lazy_gettext as _
 from invenio_records_resources.services import SearchOptions
 from invenio_records_resources.services.records.components import DataComponent
@@ -22,6 +23,7 @@ funder_schemes = LocalProxy(lambda: current_app.config["VOCABULARIES_FUNDER_SCHE
 funder_fundref_doi_prefix = LocalProxy(
     lambda: current_app.config["VOCABULARIES_FUNDER_DOI_PREFIX"]
 )
+localized_title = LocalProxy(lambda: f"title.{get_locale()}^20")
 
 
 class FundersSearchOptions(SearchOptions):
@@ -30,9 +32,12 @@ class FundersSearchOptions(SearchOptions):
     suggest_parser_cls = SuggestQueryParser.factory(
         fields=[
             "name^100",
+            "acronym.keyword^100",
+            "acronym^40",
+            localized_title,
+            "id^20",
+            "aliases^20",
             "identifiers.identifier^10",
-            "acronym^10",
-            "aliases^10",
         ],
         type="most_fields",  # https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-multi-match-query.html#multi-match-types
         fuzziness="AUTO",  # https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#fuzziness

invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v2.0.0.json

@@ -29,6 +29,16 @@
           ]
         }
       },
+      "normalizer": {
+        "accent_normalizer": {
+          "type": "custom",
+          "char_filter": ["strip_special_chars"],
+          "filter": [
+            "lowercase",
+            "asciifolding"
+          ]
+        }
+      },
       "filter": {
         "lowercase": {
           "type": "lowercase",
@@ -112,7 +122,13 @@
       "acronym": {
         "type": "text",
         "analyzer": "accent_edge_analyzer",
-        "search_analyzer": "accent_analyzer"
+        "search_analyzer": "accent_analyzer",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "normalizer": "accent_normalizer"
+          }
+        }
       },
       "status": {
         "type": "keyword"

invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json

@@ -29,6 +29,16 @@
           ]
         }
       },
+      "normalizer": {
+        "accent_normalizer": {
+          "type": "custom",
+          "char_filter": ["strip_special_chars"],
+          "filter": [
+            "lowercase",
+            "asciifolding"
+          ]
+        }
+      },
       "filter": {
         "lowercase": {
           "type": "lowercase",
@@ -112,7 +122,13 @@
       "acronym": {
         "type": "text",
         "analyzer": "accent_edge_analyzer",
-        "search_analyzer": "accent_analyzer"
+        "search_analyzer": "accent_analyzer",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "normalizer": "accent_normalizer"
+          }
+        }
       },
       "status": {
         "type": "keyword"

invenio_vocabularies/services/service.py

@@ -12,14 +12,7 @@
 
 import sqlalchemy as sa
 from invenio_cache import current_cache
-from invenio_records_resources.services import (
-    Link,
-    LinksTemplate,
-    RecordService,
-    RecordServiceConfig,
-    SearchOptions,
-    pagination_links,
-)
+from invenio_records_resources.services import LinksTemplate, RecordService
 from invenio_records_resources.services.base.utils import map_search_params
 from invenio_records_resources.services.records.schema import ServiceSchemaWrapper
 from invenio_records_resources.services.uow import unit_of_work
@@ -32,6 +25,10 @@ from .tasks import process_datastream
 class VocabularyTypeService(RecordService):
     """Vocabulary type service."""
 
+    def rebuild_index(self, identity, uow=None):
+        """Raise error since services are not backed by search indices."""
+        raise NotImplementedError()
+
     def search(self, identity, params=None):
         """Search for vocabulary types entries."""
         self.require_permission(identity, "list_vocabularies")

{invenio_vocabularies-5.0.2.dist-info → invenio_vocabularies-5.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 5.0.2
+Version: 5.1.0
 Summary: Invenio module for managing vocabularies.
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -81,6 +81,16 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
+Version v5.1.0 (released 2024-09-25)
+
+- funders: tune search boost for acronyms
+    * Add and `acronym.keyword` field to the funders mapping.
+    * Apply to funders the same field boosting as in affiliations.
+
+Version v5.0.3 (released 2024-09-06)
+
+- services: skip index rebuilding
+
 Version v5.0.2 (released 2024-08-28)
 
 - ror: use datePublished as fallback date for dataset timestamp

{invenio_vocabularies-5.0.2.dist-info → invenio_vocabularies-5.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_vocabularies/__init__.py,sha256=OL5grlUCznD7I2pTl2Pk59Rm6zju_S9ptITe7Zf0vdM,377
+invenio_vocabularies/__init__.py,sha256=EY0EBDXPeTzwN5DQMUlFBqdRhHxUqKpyOeWjvG3og0U,377
 invenio_vocabularies/cli.py,sha256=ToGc5dcGarDwNUgUXGqHIRT-3Uv1rleyFLKenwZdyBw,5719
 invenio_vocabularies/config.py,sha256=sOkJdmnfoSftfpH7msZEC6Eyo61Q3RQ7V2mMeE5LPAM,5157
 invenio_vocabularies/ext.py,sha256=GujJ4UARd4Fxf4z7zznRk9JAgHamZuYCOdrKU5czg00,5987
@@ -87,7 +87,7 @@ invenio_vocabularies/contrib/common/ror/__init__.py,sha256=3u2-fre1SQ-4nz3Ay0nxj
 invenio_vocabularies/contrib/common/ror/datastreams.py,sha256=7VaQUGtc4j0fX6P16csjAUgIVxSDEySrdZ5QZ57RD_g,7941
 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=llUYFK7hzP5DRzP8MfrgCZfFf1WNURCGvGwjnw4v2GM,2026
+invenio_vocabularies/contrib/funders/config.py,sha256=EU7UrwLOkr2Bem9Skz_HJIxyBQRkXEdPT8zIuV8vbzI,2217
 invenio_vocabularies/contrib/funders/datastreams.py,sha256=3tOwcN1mK5AVqtdU6KdguouGSUurPTO-FDWTKzK1eRo,2481
 invenio_vocabularies/contrib/funders/facets.py,sha256=a068TVtt74Ncu0latb177LFK8EdnpbMOWecAKozA04M,1245
 invenio_vocabularies/contrib/funders/funders.py,sha256=F2AQWv7IfSovThoKPEmlQbxbbmv7gNzIxDoSCaL5D0U,2338
@@ -101,10 +101,10 @@ invenio_vocabularies/contrib/funders/jsonschemas/funders/funder-v1.0.0.json,sha2
 invenio_vocabularies/contrib/funders/mappings/__init__.py,sha256=aSr-tZd9rsjet6leeS336gdSdZHXwZKdaPStNtVNQVk,244
 invenio_vocabularies/contrib/funders/mappings/os-v1/__init__.py,sha256=xXEX3tacmXp0I1KFtDw7ohIahozd2oIGp1UN40IhFic,251
 invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v1.0.0.json,sha256=E7Zp4IHsQGdaxVrksr-SaQtieV7tV0W6-LgGe231G1w,1646
-invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v2.0.0.json,sha256=Ydcog5QlXkUd9awPUdk2BOh266iCOALFDjaMBc30HqA,3006
+invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v2.0.0.json,sha256=31shkTYZDvx7tSCnOA4OlqRmQ0IEv2qhePJsIStReJo,3385
 invenio_vocabularies/contrib/funders/mappings/os-v2/__init__.py,sha256=YvMRlKYTnEmyTzI9smZp_lO3w-zcK-8IpqT-jGUXEEY,251
 invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v1.0.0.json,sha256=E7Zp4IHsQGdaxVrksr-SaQtieV7tV0W6-LgGe231G1w,1646
-invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json,sha256=Ydcog5QlXkUd9awPUdk2BOh266iCOALFDjaMBc30HqA,3006
+invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json,sha256=31shkTYZDvx7tSCnOA4OlqRmQ0IEv2qhePJsIStReJo,3385
 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
@@ -187,7 +187,7 @@ invenio_vocabularies/services/permissions.py,sha256=nU1t_aW-RimFTWHbg9SivfzoP3P2
 invenio_vocabularies/services/querystr.py,sha256=X3JHVF9B0O0iLWrnW3ok_bf_8jA-Cs_oAcYYkGOm3Uw,1829
 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=cF2FV4QTyCUQwaokeqoppqeYJZeRrtbvXYdi9T4U6uQ,6397
+invenio_vocabularies/services/service.py,sha256=9QQDsG1WShCpBVFze-Dnq-iC2BwNX_0-qzfzrpImJo8,6469
 invenio_vocabularies/services/tasks.py,sha256=AH0XifkOypsEdh8LyjmlHnPLQK5qqUJC8cNVWGkbqks,788
 invenio_vocabularies/services/custom_fields/__init__.py,sha256=QgvSsn-S1xLzbZ57pjjGTt5oI3HqzXHVjwGTtuPgzN8,421
 invenio_vocabularies/services/custom_fields/subject.py,sha256=ZM-ZkaxoouF9lL62smOtLxsjQQZwiQs0jG3qGruP6nY,2231
@@ -290,10 +290,10 @@ invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=g1I5aNO8r
 invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.po,sha256=vg8qC8ofpAdJ3mQz7mWM1ylKDpiNWXFs7rlMdSPkgKk,4629
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=cqSm8NtMAwrP9O6qbmtkDtRT1e9D93qpsJN5X9_PPVw,600
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.po,sha256=9ACePz_EpB-LfcIJajZ2kp8Q04tcdrQLOtug162ZUss,4115
-invenio_vocabularies-5.0.2.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-5.0.2.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-5.0.2.dist-info/METADATA,sha256=V8ddv-nWaDPyvtg1Y66UIqIgeVP7CA0rH47Z9Io5b3M,8828
-invenio_vocabularies-5.0.2.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-invenio_vocabularies-5.0.2.dist-info/entry_points.txt,sha256=qHHFkyU3r0COsKm5gCYuhP8tfsioBggxKAiEXNAbbjM,2803
-invenio_vocabularies-5.0.2.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-5.0.2.dist-info/RECORD,,
+invenio_vocabularies-5.1.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-5.1.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-5.1.0.dist-info/METADATA,sha256=q58QaH3-DlcUWMppE5PDWV1vf8FsIE4rWiT_mCvoaNo,9111
+invenio_vocabularies-5.1.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+invenio_vocabularies-5.1.0.dist-info/entry_points.txt,sha256=qHHFkyU3r0COsKm5gCYuhP8tfsioBggxKAiEXNAbbjM,2803
+invenio_vocabularies-5.1.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-5.1.0.dist-info/RECORD,,