diff --git a/django_elasticsearch_dsl/fields.py b/django_elasticsearch_dsl/fields.py index 4c45501a..e3e45fc7 100644 --- a/django_elasticsearch_dsl/fields.py +++ b/django_elasticsearch_dsl/fields.py @@ -23,7 +23,8 @@ Object, Short, Keyword, - Text + Text, + SearchAsYouType, ) from .exceptions import VariableLookupError @@ -128,7 +129,7 @@ def get_value_from_instance(self, instance, field_value_to_ignore=None): is_iterable = bool(iter(objs)) except TypeError: is_iterable = False - + if is_iterable: return [ self._get_inner_field_data(obj, field_value_to_ignore) @@ -206,6 +207,18 @@ class ShortField(DEDField, Short): pass +class KeywordField(DEDField, Keyword): + pass + + +class TextField(DEDField, Text): + pass + + +class SearchAsYouTypeField(DEDField, SearchAsYouType): + pass + + class FileFieldMixin(object): def get_value_from_instance(self, instance, field_value_to_ignore=None): _file = super(FileFieldMixin, self).get_value_from_instance( @@ -216,13 +229,5 @@ def get_value_from_instance(self, instance, field_value_to_ignore=None): return _file if _file else '' -class KeywordField(DEDField, Keyword): - pass - - -class TextField(DEDField, Text): - pass - - class FileField(FileFieldMixin, DEDField, Text): pass diff --git a/setup.py b/setup.py index cf74203d..4bda37d6 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ ], include_package_data=True, install_requires=[ - 'elasticsearch-dsl>=7.0.0<8.0.0', + 'elasticsearch-dsl>=7.2.0<8.0.0', 'six', ], license="Apache Software License 2.0",