global: make search-engine-agnostic

* go via `invenio_search.engine` rather than importing elasticsearch
  packages directly

.github/workflows/tests-feature.yaml

@@ -31,11 +31,14 @@ jobs:
         requirements-level: [pypi]
         cache-service: [redis]
         db-service: [postgresql13]
-        search-service: [elasticsearch7]
+        search-service: [opensearch1,elasticsearch7]
         include:
           - db-service: postgresql13
             DB_EXTRAS: "postgresql"
 
+          - search-service: opensearch1
+            SEARCH_EXTRAS: "opensearch1"
+
           - search-service: elasticsearch7
             SEARCH_EXTRAS: "elasticsearch7"
 

.github/workflows/tests.yml

@@ -34,12 +34,15 @@ jobs:
         python-version: [3.7, 3.8, 3.9]
         requirements-level: [pypi]
         db-service: [postgresql10, postgresql13]
-        search-service: [elasticsearch7]
+        search-service: [opensearch1,elasticsearch7]
         exclude:
           - python-version: 3.7
             db-service: postgresql13
 
         include:
+          - search-service: opensearch1
+            SEARCH_EXTRAS: "opensearch1"
+
           - search-service: elasticsearch7
             SEARCH_EXTRAS: "elasticsearch7"
 

gen-migration.sh

@@ -26,7 +26,7 @@ fi
 parent_id=$1
 message=$2
 
-eval "$(docker-services-cli up --db ${DB:-postgresql} --search ${ES:-elasticsearch} --mq ${CACHE:-redis} --env)"
+eval "$(docker-services-cli up --db ${DB:-postgresql} --search ${ES:-opensearch} --mq ${CACHE:-redis} --env)"
 export INVENIO_SQLALCHEMY_DATABASE_URI=${SQLALCHEMY_DATABASE_URI}
 invenio db drop --yes-i-know
 invenio alembic upgrade

invenio_vocabularies/contrib/affiliations/affiliations.py

@@ -8,7 +8,7 @@
 
 """Vocabulary affiliations."""
 
-from invenio_records.dumpers import ElasticsearchDumper
+from invenio_records.dumpers import SearchDumper
 from invenio_records.dumpers.indexedat import IndexedAtDumperExt
 from invenio_records_resources.factories.factory import RecordTypeFactory
 
@@ -28,7 +28,7 @@
     },
     schema_version="1.0.0",
     schema_path="local://affiliations/affiliation-v1.0.0.json",
-    record_dumper=ElasticsearchDumper(
+    record_dumper=SearchDumper(
         extensions=[
             IndexedAtDumperExt(),
         ]

invenio_vocabularies/contrib/affiliations/mappings/v6/__init__.py → invenio_vocabularies/contrib/affiliations/mappings/__init__.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2021 CERN.
+# Copyright (C) 2022 CERN.
+# Copyright (C) 2022 Northwestern University.
 #
 # 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
 # details.
 
-"""Affiliations Elasticsearch v6 mappings."""
+"""Affiliations search mappings."""

invenio_vocabularies/contrib/affiliations/mappings/os-v1/__init__.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2022 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
+# details.
+
+"""Affiliations OpenSearch v1 mappings."""

invenio_vocabularies/contrib/affiliations/mappings/os-v1/affiliations/affiliation-v1.0.0.json

@@ -0,0 +1,85 @@
+{
+  "mappings": {
+    "dynamic": "strict",
+    "properties": {
+      "$schema": {
+        "type": "keyword",
+        "index": "false"
+      },
+      "created": {
+        "type": "date"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "indexed_at": {
+        "type": "date"
+      },
+      "uuid": {
+        "type": "keyword"
+      },
+      "version_id": {
+        "type": "integer"
+      },
+      "id": {
+        "type": "keyword"
+      },
+      "name_sort": {
+        "type": "keyword"
+      },
+      "name": {
+        "type": "text",
+        "copy_to": "name_sort",
+        "fields": {
+          "suggest": {
+            "type": "search_as_you_type"
+          }
+        }
+      },
+      "acronym": {
+        "type": "text",
+        "fields": {
+          "suggest": {
+            "type": "search_as_you_type"
+          }
+        }
+      },
+      "identifiers": {
+        "properties": {
+          "identifier": {
+            "type": "keyword"
+          },
+          "scheme": {
+            "type": "keyword"
+          }
+        }
+      },
+      "pid": {
+        "type": "object",
+        "properties": {
+          "pk": {
+            "type": "integer"
+          },
+          "pid_type": {
+            "type": "keyword"
+          },
+          "obj_type": {
+            "type": "keyword"
+          },
+          "status": {
+            "type": "keyword"
+          }
+        }
+      },
+      "title": {
+        "type": "object",
+        "dynamic": true,
+        "properties": {
+          "en": {
+            "type": "search_as_you_type"
+          }
+        }
+      }
+    }
+  }
+}

invenio_vocabularies/contrib/affiliations/mappings/v7/__init__.py

@@ -6,4 +6,4 @@
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
 
-"""Affiliations Elasticsearch 7 mappings."""
+"""Affiliations Elasticsearch v7 mappings."""

invenio_vocabularies/contrib/awards/awards.py

@@ -14,7 +14,7 @@
     ResponseHandler,
 )
 from invenio_db import db
-from invenio_records.dumpers import ElasticsearchDumper
+from invenio_records.dumpers import SearchDumper
 from invenio_records.dumpers.indexedat import IndexedAtDumperExt
 from invenio_records.dumpers.relations import RelationDumperExt
 from invenio_records.systemfields import RelationsField
@@ -49,7 +49,7 @@
         # service level when create({}), see records-resources.
         "pid": db.Column(db.String, unique=True),
     },
-    record_dumper=ElasticsearchDumper(
+    record_dumper=SearchDumper(
         model_fields={"pid": ("id", str)},
         extensions=[
             RelationDumperExt("relations"),

invenio_vocabularies/contrib/awards/mappings/v6/__init__.py → invenio_vocabularies/contrib/awards/mappings/__init__.py

@@ -6,4 +6,4 @@
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
 
-"""Awards Elasticsearch 6 mappings."""
+"""Awards search mappings."""

invenio_vocabularies/contrib/funders/mappings/v6/__init__.py → invenio_vocabularies/contrib/awards/mappings/os-v1/__init__.py

@@ -6,4 +6,4 @@
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
 
-"""Funders Elasticsearch v6 mappings."""
+"""Awards OpenSearch v1 mappings."""

invenio_vocabularies/contrib/awards/mappings/os-v1/awards/award-v1.0.0.json

@@ -0,0 +1,68 @@
+{
+  "mappings": {
+    "dynamic": "strict",
+    "properties": {
+      "$schema": {
+        "type": "keyword",
+        "index": "false"
+      },
+      "created": {
+        "type": "date"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "indexed_at": {
+        "type": "date"
+      },
+      "uuid": {
+        "type": "keyword"
+      },
+      "version_id": {
+        "type": "integer"
+      },
+      "identifiers": {
+        "properties": {
+          "identifier": {
+            "type": "keyword"
+          },
+          "scheme": {
+            "type": "keyword"
+          }
+        }
+      },
+      "id": {
+        "type": "keyword"
+      },
+      "title": {
+        "type": "object",
+        "dynamic": true,
+        "properties": {
+          "en": {
+            "type": "search_as_you_type"
+          }
+        }
+      },
+      "number": {
+        "type": "keyword"
+      },
+      "acronym": {
+        "type": "keyword"
+      },
+      "funder": {
+        "type": "object",
+        "properties": {
+          "@v": {
+            "type": "keyword"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "name": {
+            "type": "text"
+          }
+        }
+      }
+    }
+  }
+}