Switch from elasticsearch-dsl-py dependency to elasticsearch-py

This commit switches the dependency of this library from elasticsearch-dsl-py
to elasticsearch-py since the former was merged into the latter.

Author: sximba

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
         django-version: ["3.2", "4.1", "4.2"]
         es-dsl-version: ["6.4", "7.4"]
-        es-version: ["8.10.2"]
+        es-version: ["9.0.2"]
 
         exclude:
           - python-version: "3.11"

README.rst

@@ -12,17 +12,17 @@ Django Elasticsearch DSL
     :target: https://django-elasticsearch-dsl.readthedocs.io/en/latest/
 
 Django Elasticsearch DSL is a package that allows indexing of django models in elasticsearch.
-It is built as a thin wrapper around elasticsearch-dsl-py_
-so you can use all the features developed by the elasticsearch-dsl-py team.
+It is built as a thin wrapper around elasticsearch-py_
+so you can use all the features developed by the elasticsearch-py team.
 
 You can view the full documentation at https://django-elasticsearch-dsl.readthedocs.io
 
-.. _elasticsearch-dsl-py: https://github.com/elastic/elasticsearch-dsl-py
+.. _elasticsearch-py: https://github.com/elastic/elasticsearch-py
 
 Features
 --------
 
-- Based on elasticsearch-dsl-py_ so you can make queries with the Search_ class.
+- Based on elasticsearch-py_ so you can make queries with the Search_ class.
 - Django signal receivers on save and delete for keeping Elasticsearch in sync.
 - Management commands for creating, deleting, rebuilding and populating indices.
 - Elasticsearch auto mapping from django models fields.

django_elasticsearch_dsl/apps.py

@@ -1,8 +1,7 @@
 from django.apps import AppConfig
 from django.conf import settings
 from django.utils.module_loading import import_string
-
-from elasticsearch_dsl.connections import connections
+from elasticsearch.dsl.connections import connections
 
 
 class DEDConfig(AppConfig):

django_elasticsearch_dsl/documents.py

@@ -6,8 +6,8 @@
 
 from django import VERSION as DJANGO_VERSION
 from django.db import models
+from elasticsearch.dsl import Document as DSLDocument
 from elasticsearch.helpers import bulk, parallel_bulk
-from elasticsearch_dsl import Document as DSLDocument
 from six import iteritems
 
 from .exceptions import ModelFieldNotMappedError
@@ -21,7 +21,8 @@
     KeywordField,
     LongField,
     ShortField,
-    TextField, TimeField,
+    TextField,
+    TimeField,
 )
 from .search import Search
 from .signals import post_index
@@ -219,14 +220,13 @@ def _get_actions(self, object_list, action):
         for object_instance in object_list:
             if action == 'delete' or self.should_index_object(object_instance):
                 yield self._prepare_action(object_instance, action)
-    
+
     def get_actions(self, object_list, action):
         """
         Generate the elasticsearch payload.
         """
         return self._get_actions(object_list, action)
 
-
     def _bulk(self, *args, **kwargs):
         """Helper for switching between normal and parallel bulk operation"""
         parallel = kwargs.pop('parallel', False)

django_elasticsearch_dsl/fields.py

@@ -9,8 +9,9 @@
     from django.utils.encoding import force_text as force_str
 else:
     from django.utils.encoding import force_str
+
 from django.utils.functional import Promise
-from elasticsearch_dsl.field import (
+from elasticsearch.dsl.field import (
     Boolean,
     Byte,
     Completion,
@@ -22,14 +23,14 @@
     GeoShape,
     Integer,
     Ip,
+    Keyword,
     Long,
     Nested,
     Object,
     ScaledFloat,
+    SearchAsYouType,
     Short,
-    Keyword,
     Text,
-    SearchAsYouType,
 )
 
 from .exceptions import VariableLookupError
@@ -100,36 +101,24 @@ class ObjectField(DEDField, Object):
     def _get_inner_field_data(self, obj, field_value_to_ignore=None):
         data = {}
 
-        if hasattr(self, 'properties'):
-            for name, field in self.properties.to_dict().items():
-                if not isinstance(field, DEDField):
-                    continue
+        doc_instance = self._doc_class()
+        for name, field in self._doc_class._doc_type.mapping.properties._params.get(
+            'properties', {}).items():  # noqa
+            if not isinstance(field, DEDField):
+                continue
+
+            if field._path == []:
+                field._path = [name]
 
-                if field._path == []:
-                    field._path = [name]
+            # This allows for retrieving data from an InnerDoc with prepare_field_name functions.
+            prep_func = getattr(doc_instance, 'prepare_%s' % name, None)
 
+            if prep_func:
+                data[name] = prep_func(obj)
+            else:
                 data[name] = field.get_value_from_instance(
                     obj, field_value_to_ignore
                 )
-        else:
-            doc_instance = self._doc_class()
-            for name, field in self._doc_class._doc_type.mapping.properties._params.get(
-                'properties', {}).items():  # noqa
-                if not isinstance(field, DEDField):
-                    continue
-
-                if field._path == []:
-                    field._path = [name]
-
-                # This allows for retrieving data from an InnerDoc with prepare_field_name functions.
-                prep_func = getattr(doc_instance, 'prepare_%s' % name, None)
-
-                if prep_func:
-                    data[name] = prep_func(obj)
-                else:
-                    data[name] = field.get_value_from_instance(
-                        obj, field_value_to_ignore
-                    )
 
         # This allows for ObjectFields to be indexed from dicts with
         # dynamic keys (i.e. keys/fields not defined in 'properties')

django_elasticsearch_dsl/indices.py

@@ -1,6 +1,6 @@
 from copy import deepcopy
 
-from elasticsearch_dsl import Index as DSLIndex
+from elasticsearch.dsl import Index as DSLIndex
 from six import python_2_unicode_compatible
 
 from .apps import DEDConfig

django_elasticsearch_dsl/management/commands/search_index.py

@@ -1,10 +1,12 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
+
 from datetime import datetime
 
-from elasticsearch_dsl import connections
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
+from elasticsearch.dsl import connections
 from six.moves import input
+
 from ...registries import registry
 
 

django_elasticsearch_dsl/registries.py

@@ -1,14 +1,13 @@
 from collections import defaultdict
 from copy import deepcopy
-
 from itertools import chain
 
-from django.core.exceptions import ObjectDoesNotExist
-from django.core.exceptions import ImproperlyConfigured
-from elasticsearch_dsl import AttrDict
-from six import itervalues, iterkeys, iteritems
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
+from elasticsearch.dsl import AttrDict
+from six import iteritems, iterkeys, itervalues
 
 from django_elasticsearch_dsl.exceptions import RedeclaredFieldError
+
 from .apps import DEDConfig
 
 

django_elasticsearch_dsl/search.py

@@ -1,7 +1,6 @@
 from django.db.models import Case, When
 from django.db.models.fields import IntegerField
-
-from elasticsearch_dsl import Search as DSLSearch
+from elasticsearch.dsl import Search as DSLSearch
 
 
 class Search(DSLSearch):

django_elasticsearch_dsl/test/testcases.py

@@ -1,7 +1,7 @@
 import re
 
 from django.test.utils import captured_stderr
-from elasticsearch_dsl.connections import connections
+from elasticsearch.dsl.connections import connections
 
 from ..registries import registry