Prepare 0.20.8

Author: barseghyanartur

CHANGELOG.rst

@@ -15,6 +15,12 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.20.8
+------
+2020-04-10
+
+- Fixes in ``skip_duplicates`` option support for native suggester.
+
 0.20.7
 ------
 2020-04-10

docs/changelog.rst

@@ -15,6 +15,12 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.20.8
+------
+2020-04-10
+
+- Fixes in ``skip_duplicates`` option support for native suggester.
+
 0.20.7
 ------
 2020-04-10

examples/simple/search_indexes/viewsets/address/default.py

@@ -141,6 +141,7 @@ class AddressDocumentViewSet(DocumentViewSet):
                     'title_suggest_loc': 'loc',
                 },
                 'size': 10,
+                'skip_duplicates': True,
             }
         },
         'city_suggest': {

examples/simple/search_indexes/viewsets/book/frontend.py

@@ -271,6 +271,7 @@ class BookFrontendDocumentViewSet(DocumentViewSet):
             'default_suggester': SUGGESTER_COMPLETION,
             'options': {
                 'size': 20,
+                'skip_duplicates': True,
             },
         },
         'title_suggest_context': {

examples/simple/search_indexes/viewsets/location.py

@@ -115,7 +115,7 @@ class LocationDocumentViewSet(DocumentViewSet):
     }
 
     # Specify default ordering
-    ordering = ("_score",) # "full", "postcode",)
+    ordering = ("_score",)  # "full", "postcode",)
     suggester_fields = {
         "full": {
             "field": "full.suggest",

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.20.7'
+version = '0.20.8'
 
 DOCS_TRANSFORMATIONS = (
     (

src/django_elasticsearch_dsl_drf/__init__.py

@@ -3,7 +3,7 @@
 """
 
 __title__ = 'django-elasticsearch-dsl-drf'
-__version__ = '0.20.7'
+__version__ = '0.20.8'
 __author__ = 'Artur Barseghyan <[email protected]>'
 __copyright__ = '2017-2020 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

src/django_elasticsearch_dsl_drf/filter_backends/filtering/common.py

@@ -34,8 +34,7 @@
 )
 from ..mixins import FilterBackendMixin
 
-from ...compat import coreapi
-from ...compat import coreschema
+from ...compat import coreapi, coreschema
 
 
 __title__ = 'django_elasticsearch_dsl_drf.filter_backends.filtering.common'
@@ -822,8 +821,8 @@ def filter_queryset(self, request, queryset, view):
                 # `regexp` filter lookup
                 elif options['lookup'] == LOOKUP_FILTER_REGEXP:
                     queryset = self.apply_filter_regexp(queryset,
-                                                       options,
-                                                       value)
+                                                        options,
+                                                        value)
 
                 # `exists` filter lookup
                 elif options['lookup'] == LOOKUP_FILTER_EXISTS:

src/django_elasticsearch_dsl_drf/filter_backends/suggester/native.py

@@ -67,6 +67,7 @@
     >>>
     >>>         model = Publisher  # The model associate with this Document
 """
+from collections import defaultdict
 
 from django_elasticsearch_dsl_drf.constants import (
     SUGGESTER_TERM,
@@ -270,7 +271,6 @@ def get_suggester_context(cls, field, suggester_name, request, view):
 
         :return:
         """
-        from collections import defaultdict
         contexts = {}
         query_params = request.query_params.copy()
 
@@ -506,12 +506,16 @@ def get_suggester_query_params(self, request, view):
                             'type': view.mapping,
                         }
 
-                        if 'options' in _sf and 'size' in _sf['options']:
-                            suggester_query_params[query_param].update(
-                                {
+                        if 'options' in _sf:
+                            if 'size' in _sf['options']:
+                                suggester_query_params[query_param].update({
                                     'size': _sf['options']['size']
-                                }
-                            )
+                                })
+                            if 'skip_duplicates' in _sf['options']:
+                                suggester_query_params[query_param].update({
+                                    'skip_duplicates':
+                                        _sf['options']['skip_duplicates']
+                                })
 
                         if (
                             suggester_param == SUGGESTER_COMPLETION