fix: protection for opensearch_dsl being merged in opensearchpy

Author: fstagni

environment.yml

@@ -19,7 +19,6 @@ dependencies:
   - elasticsearch <7.14
   - elasticsearch-dsl
   - opensearch-py
-  - opensearch-dsl
   - fts3
   - gitpython >=2.1.0
   - m2crypto >=0.38.0

src/DIRAC/Core/Utilities/ElasticSearchDB.py

@@ -13,13 +13,16 @@
 import certifi
 
 try:
-    from opensearch_dsl import A, Q, Search
     from opensearchpy import OpenSearch as Elasticsearch
-    from opensearchpy.exceptions import ConnectionError as ElasticConnectionError
-    from opensearchpy.exceptions import NotFoundError, RequestError, TransportError, ConflictError
+    from opensearchpy.exceptions import (
+        ConnectionError as ElasticConnectionError,
+        TransportError,
+        NotFoundError,
+        RequestError,
+        ConflictError,
+    )
     from opensearchpy.helpers import BulkIndexError, bulk
 except ImportError:
-    from elasticsearch_dsl import Search, Q, A
     from elasticsearch import Elasticsearch
     from elasticsearch.exceptions import (
         ConnectionError as ElasticConnectionError,
@@ -30,6 +33,15 @@
     )
     from elasticsearch.helpers import BulkIndexError, bulk
 
+try:
+    try:
+        from opensearchpy import A, Q, Search
+    except ImportError:
+        from opensearch_dsl import A, Q, Search
+except ImportError:
+    from elasticsearch_dsl import Search, Q, A
+
+
 from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.Core.Utilities import DErrno, TimeUtilities
 from DIRAC.FrameworkSystem.Client.BundleDeliveryClient import BundleDeliveryClient