prepare 0.16.3

barseghyanartur · barseghyanartur · commit bed3d20b2f73 · 2018-10-31T00:13:04.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,18 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.16.3
+------
+2018-10-31
+
+.. note::
+
+    Release dedicated to Charles Aznavour.
+
+- Make it possible to ignore certain Elastic exceptions by providing the
+  appropriate ``ignore`` argument (on the view level). Default behaviour is
+  intact. Set it to a list of integers (error codes) if you need it so.
+
 0.16.2
 ------
 2018-09-21
diff --git a/docs/documentation.rst.distrib b/docs/documentation.rst.distrib
@@ -18,7 +18,7 @@ Contents:
    nested_fields_usage_examples
    more_like_this
    global_aggregations
-   demo
+   configuration_tweaks
    changelog
    django_elasticsearch_dsl_drf
 
diff --git a/docs_src/configuration_tweaks.rst b/docs_src/configuration_tweaks.rst
@@ -0,0 +1,12 @@
+====================
+Configuration tweaks
+====================
+Ignore certain Elasticsearch exceptions
+---------------------------------------
+.. code-block:: python
+
+    class BookIgnoreIndexErrorsDocumentViewSet(DocumentViewSet):
+
+        # ...
+        ignore = [404]
+        # ...
diff --git a/examples/simple/search_indexes/urls.py b/examples/simple/search_indexes/urls.py
@@ -8,6 +8,7 @@
     BookDefaultFilterLookupDocumentViewSet,
     BookDocumentViewSet,
     BookFunctionalSuggesterDocumentViewSet,
+    BookIgnoreIndexErrorsDocumentViewSet,
     BookMoreLikeThisDocumentViewSet,
     BookMoreLikeThisNoOptionsDocumentViewSet,
     BookMultiMatchSearchFilterBackendDocumentViewSet,
@@ -64,6 +65,13 @@
     base_name='bookdocument_functional_suggester'
 )
 
+
+books_ignore_index_errors = router.register(
+    r'books-ignore-index-errors',
+    BookIgnoreIndexErrorsDocumentViewSet,
+    base_name='bookdocument_ignore_index_errors'
+)
+
 books_more_like_this = router.register(
     r'books-more-like-this',
     BookMoreLikeThisDocumentViewSet,
diff --git a/examples/simple/search_indexes/viewsets/__init__.py b/examples/simple/search_indexes/viewsets/__init__.py
@@ -6,6 +6,7 @@
     BookDefaultFilterLookupDocumentViewSet,
     BookDocumentViewSet,
     BookFunctionalSuggesterDocumentViewSet,
+    BookIgnoreIndexErrorsDocumentViewSet,
     BookMoreLikeThisDocumentViewSet,
     BookMoreLikeThisNoOptionsDocumentViewSet,
     BookMultiMatchSearchFilterBackendDocumentViewSet,
@@ -26,6 +27,7 @@
     'BookDefaultFilterLookupDocumentViewSet',
     'BookDocumentViewSet',
     'BookFunctionalSuggesterDocumentViewSet',
+    'BookIgnoreIndexErrorsDocumentViewSet',
     'BookMoreLikeThisDocumentViewSet',
     'BookMoreLikeThisNoOptionsDocumentViewSet',
     'BookMultiMatchSearchFilterBackendDocumentViewSet',
diff --git a/examples/simple/search_indexes/viewsets/book/__init__.py b/examples/simple/search_indexes/viewsets/book/__init__.py
@@ -6,6 +6,7 @@
 from .default import BookDocumentViewSet
 from .default_filter_lookup import BookDefaultFilterLookupDocumentViewSet
 from .functional_suggester import BookFunctionalSuggesterDocumentViewSet
+from .ignore_index_errors import BookIgnoreIndexErrorsDocumentViewSet
 from .more_like_this import (
     BookMoreLikeThisDocumentViewSet,
     BookMoreLikeThisNoOptionsDocumentViewSet,
diff --git a/examples/simple/search_indexes/viewsets/book/ignore_index_errors.py b/examples/simple/search_indexes/viewsets/book/ignore_index_errors.py
@@ -0,0 +1,11 @@
+from .default import BookDocumentViewSet
+
+__all__ = (
+    'BookIgnoreIndexErrorsDocumentViewSet',
+)
+
+
+class BookIgnoreIndexErrorsDocumentViewSet(BookDocumentViewSet):
+    """Book document view set based on compound search backend."""
+
+    ignore = [404]
diff --git a/scripts/prepare_docs.sh b/scripts/prepare_docs.sh
@@ -9,4 +9,5 @@ cat docs_src/advanced_usage_examples.rst > docs/advanced_usage_examples.rst
 cat docs_src/nested_fields_usage_examples.rst > docs/nested_fields_usage_examples.rst
 cat docs_src/filtering_usage_examples.rst > docs/filtering_usage_examples.rst
 cat docs_src/more_like_this.rst > docs/more_like_this.rst
+cat docs_src/configuration_tweaks.rst > docs/configuration_tweaks.rst
 cat docs_src/global_aggregations.rst > docs/global_aggregations.rst
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.16.2'
+version = '0.16.3'
 
 DOCS_TRANSFORMATIONS = (
     (
diff --git a/src/django_elasticsearch_dsl_drf/__init__.py b/src/django_elasticsearch_dsl_drf/__init__.py
@@ -3,7 +3,7 @@
 """
 
 __title__ = 'django-elasticsearch-dsl-drf'
-__version__ = '0.16.2'
+__version__ = '0.16.3'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2017-2018 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
diff --git a/src/django_elasticsearch_dsl_drf/viewsets.py b/src/django_elasticsearch_dsl_drf/viewsets.py
@@ -150,6 +150,7 @@ class BaseDocumentViewSet(ReadOnlyModelViewSet):
     document = None  # Re-define
     pagination_class = PageNumberPagination
     # permission_classes = (AllowAny,)
+    ignore = []
 
     def __init__(self, *args, **kwargs):
         assert self.document is not None
@@ -205,7 +206,12 @@ def get_object(self):
             )
 
         if lookup_url_kwarg == 'id':
-            obj = self.document.get(id=self.kwargs[lookup_url_kwarg])
+            get_kwargs = {'id': self.kwargs[lookup_url_kwarg]}
+            if self.ignore:
+                get_kwargs.update({'ignore': self.ignore})
+            obj = self.document.get(**get_kwargs)
+            if not obj and self.ignore:
+                raise Http404("No result matches the given query.")
             return DictionaryProxy(obj.to_dict())
         else:
             queryset = queryset.filter(

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`from setuptools import find_packages, setup`
`4`	`4`
`5`		`-version = '0.16.2'`
	`5`	`+version = '0.16.3'`
`6`	`6`
`7`	`7`	`DOCS_TRANSFORMATIONS = (`
`8`	`8`	`(`