config: add GND to concepts and places

* Adds GND to concepts and places. * Dependencies updates. * Adds safety ignore for sentry-sdk version 1.45.1. Co-Authored-by: Peter Weber <[email protected]>
rero · Aug 26, 2024 · c156c84 · c156c84
1 parent 95116c0
commit c156c84
Show file tree

Hide file tree

Showing 9 changed files with 1,049 additions and 1,002 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/rero_ils/config.py b/rero_ils/config.py
@@ -3159,18 +3159,18 @@ def _(x):
     },
     'concepts': {
         'base_url': os.environ.get('RERO_ILS_MEF_CONCEPTS_URL', 'https://mef.rero.ch/api/concepts'),
-        'sources': ['idref']
+        'sources': ['idref', 'gnd']
     },
-    'concepts-genreForm': {
+    'concepts_genreForm': {
         'base_url': os.environ.get('RERO_ILS_MEF_CONCEPTS_URL', 'https://mef.rero.ch/api/concepts'),
-        'sources': ['idref'],
+        'sources': ['idref', 'gnd'],
         'filters': [
             {'idref.bnf_type': 'genre/forme Rameau'}
         ]
     },
     'places': {
         'base_url': os.environ.get('RERO_ILS_MEF_PLACES_URL', 'https://mef.rero.ch/api/places'),
-        'sources': ['idref']
+        'sources': ['idref', 'gnd']
     },
 }
 RERO_ILS_ENTITY_TYPES = {

diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_genre_form_link-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_genre_form_link-v0.0.1.json
@@ -25,7 +25,7 @@
               "options": [
                 {
                   "label": "Genre, form",
-                  "value": "concepts-genreForm"
+                  "value": "concepts_genreForm"
                 }
               ]
             },

diff --git a/rero_ils/modules/entities/local_entities/proxy.py b/rero_ils/modules/entities/local_entities/proxy.py
@@ -27,7 +27,7 @@
     'person': Q('term', type=EntityType.PERSON),
     'organisation': Q('term', type=EntityType.ORGANISATION),
     'concepts': Q('term', type=EntityType.TOPIC),
-    'concepts-genreForm':
+    'concepts_genreForm':
         Q('term', type=EntityType.TOPIC) & Q('term', genreForm=True)
 }
 

diff --git a/rero_ils/modules/entities/remote_entities/proxy.py b/rero_ils/modules/entities/remote_entities/proxy.py
@@ -80,7 +80,7 @@ def create_proxy(category):
                 'class': MefConceptsProxy,
                 'entities': (EntityType.TEMPORAL, )
             },
-            'concepts-genreForm': {
+            'concepts_genreForm': {
                 'class': MefConceptsGenreFormProxy,
                 'entities': (EntityType.TOPIC,)
             },
@@ -326,7 +326,7 @@ def _post_process_result_hit(self, hit):
 class MefConceptsGenreFormProxy(MefConceptsProxy):
     """Proxy on RERO-MEF authority system for specific `genreForm` concepts."""
 
-    mef_entrypoint = 'concepts-genreForm'
+    mef_entrypoint = 'concepts_genreForm'
 
 
 class MefPlacesProxy(MEFProxyMixin):

diff --git a/scripts/test b/scripts/test
@@ -67,32 +67,30 @@ if [[ -z "${VIRTUAL_ENV}" ]]; then
 fi
 
 function pretests () {
-  # -> Vulnerability found in flask-caching version 2.3.0
-  #   Vulnerability ID: 40459
+  # -> Vulnerability found in flask-caching version 2.0.1
+  #    Vulnerability ID: 40459
+  # -> Vulnerability found in flask-cors version 4.0.1
+  #    Vulnerability ID: 70624
+  # -> Vulnerability found in sqlalchemy version 1.4.53
+  #    Vulnerability ID: 51668
   # -> Vulnerability found in sqlalchemy-utils version 0.38.3
-  #   Vulnerability ID: 42194
+  #    Vulnerability ID: 42194
   # -> Vulnerability found in wtforms version 2.3.3
-  #   Vulnerability ID: 42852
-  # -> Vulnerability found in py version 1.11.0
-  #   Vulnerability ID: 51457
-  # -> Vulnerability found in sqlalchemy version 1.4.52
-  #   Vulnerability ID: 51668
+  #    Vulnerability ID: 42852
   # -> Vulnerability found in werkzeug version 2.2.3
-  #   Vulnerability ID: 62019
-  # -> Vulnerability found in black version 22.12.0
-  #   Vulnerability ID: 66742
-  # -> Vulnerability found in jinja2 version 3.1.4
-  #   Vulnerability ID: 70612
-  # -> Vulnerability found in flask-cors version 4.0.1
-  #   Vulnerability ID: 70624
+  #    Vulnerability ID: 62019
   # -> Vulnerability found in werkzeug version 2.2.3
-  #   Vulnerability ID: 71594
+  #    Vulnerability ID: 71595
   # -> Vulnerability found in werkzeug version 2.2.3
-  #   Vulnerability ID: 71595
+  #    Vulnerability ID: 71594
+  # -> Vulnerability found in jinja2 version 3.1.4
+  #    Vulnerability ID: 70612
+  # -> Vulnerability found in py version 1.11.0
+  #    Vulnerability ID: 51457
   # -> Vulnerability found in sentry-sdk version 1.45.1
-  #   Vulnerability ID: 72260
+  #    Vulnerability ID: 72260
   info_msg "Check vulnerabilities:"
-  safety_exceptions="-i 40459 -i 70624 -i 51668 -i 42194 -i 42852 -i 71594 -i 62019 -i 71595 -i 70612 -i 51457 -i 72260"
+  safety_exceptions="-i 40459 -i 70624 -i 51668 -i 42194 -i 42852 -i 62019 -i 71595 -i 71594 -i 70612 -i 51457 -i 72260"
   msg=$(safety check -o text ${safety_exceptions}) || {
     echo "Safety vulnerabilites found for packages:" $(safety check -o bare ${safety_exceptions})
     echo "Run: \"safety check -o screen ${safety_exceptions} | grep -i vulnerability\" for more details"

diff --git a/tests/api/entities/local_entities/test_local_entities_rest.py b/tests/api/entities/local_entities/test_local_entities_rest.py
@@ -157,7 +157,7 @@ def test_local_search_by_proxy(
     """Test local entity search proxy."""
     response = client.get(url_for(
         'api_local_entities.local_search_proxy',
-        entity_type='concepts-genreForm',
+        entity_type='concepts_genreForm',
         term='personal',
         size='dummy_qs_arg'
     ))
@@ -167,7 +167,7 @@ def test_local_search_by_proxy(
 
     response = client.get(url_for(
         'api_local_entities.local_search_proxy',
-        entity_type='concepts-genreForm',
+        entity_type='concepts_genreForm',
         term='personal',
         size='0'
     ))
@@ -176,7 +176,7 @@ def test_local_search_by_proxy(
 
     response = client.get(url_for(
         'api_local_entities.local_search_proxy',
-        entity_type='concepts-genreForm',
+        entity_type='concepts_genreForm',
         term='dummy_key'
     ))
     assert response.status_code == 200

diff --git a/tests/api/entities/remote_entities/test_remote_entities_rest.py b/tests/api/entities/remote_entities/test_remote_entities_rest.py
@@ -95,7 +95,7 @@ def test_remote_search_proxy(
 
     response = client.get(url_for(
         'api_remote_entities.remote_search_proxy',
-        entity_type='concepts-genreForm',
+        entity_type='concepts_genreForm',
         term='side-car'
     ))
     assert response.status_code == 200

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -220,7 +220,7 @@ def app_config(app_config):
             'base_url': 'https://mef.rero.ch/api/concepts',
             'sources': ['idref']
         },
-        'concepts-genreForm': {
+        'concepts_genreForm': {
             'base_url': 'https://mef.rero.ch/api/concepts',
             'sources': ['idref'],
             'filters': [