simplify logic

Author: dojutsu-user

readthedocs/search/api.py

@@ -1,6 +1,5 @@
 import itertools
 import logging
-from pprint import pformat
 
 from rest_framework import generics, serializers
 from rest_framework.exceptions import ValidationError
@@ -38,7 +37,7 @@ def get_highlight(self, obj):
         highlight = getattr(obj.meta, 'highlight', None)
         if highlight:
             ret = highlight.to_dict()
-            log.debug('API Search highlight [Page title]: %s', pformat(ret))
+            log.debug('API Search highlight [Page title]: %s', ret)
             return ret
 
     def get_inner_hits(self, obj):
@@ -47,11 +46,13 @@ def get_inner_hits(self, obj):
             sections = inner_hits.sections or []
             domains = inner_hits.domains or []
             all_results = itertools.chain(sections, domains)
-            sorted_results = list(utils._get_sorted_results(
+
+            sorted_results = utils._get_sorted_results(
                 results=all_results,
                 source_key='_source',
-                logging=True,
-            ))
+            )
+
+            log.debug('[API] Sorted Results: %s', sorted_results)
             return sorted_results
 
 

readthedocs/search/utils.py

@@ -1,7 +1,6 @@
 """Utilities related to reading and generating indexable search content."""
 
 import logging
-from pprint import pformat
 from operator import attrgetter
 
 from django.shortcuts import get_object_or_404
@@ -155,27 +154,15 @@ def _indexing_helper(html_objs_qs, wipe=False):
                 delete_objects_in_es.delay(**kwargs)
 
 
-def _get_inner_hits_highlights(hit, logging=False):
-    """Returns highlight dict and does conditional logging of the same."""
-    if hasattr(hit, 'highlight'):
-        highlight_dict = hit.highlight.to_dict()
-
-        if logging:
-            log.debug('API Search highlight: %s', pformat(highlight_dict))
-
-        return highlight_dict
-    return {}
-
-
-def _get_sorted_results(results, source_key='_source', logging=False):
-    """Sort results according to their score and return a generator expression."""
-    sorted_results = (
+def _get_sorted_results(results, source_key='_source'):
+    """Sort results according to their score and returns results as list."""
+    sorted_results = [
         {
             'type': hit._nested.field,
             source_key: hit._source.to_dict(),
-            'highlight': _get_inner_hits_highlights(hit, logging)
+            'highlight': hit.highlight.to_dict() if hasattr(hit, 'highlight') else {}
         }
         for hit in sorted(results, key=attrgetter('_score'), reverse=True)
-    )
+    ]
 
     return sorted_results

readthedocs/search/views.py

@@ -3,7 +3,6 @@
 import itertools
 import logging
 from operator import attrgetter
-from pprint import pformat
 
 from django.shortcuts import get_object_or_404, render
 
@@ -117,18 +116,17 @@ def elastic_search(request, project_slug=None):
                     domains = inner_hits.domains or []
                     all_results = itertools.chain(sections, domains)
 
-                    sorted_results = list(utils._get_sorted_results(
+                    sorted_results = utils._get_sorted_results(
                         results=all_results,
                         source_key='source',
-                        logging=False,
-                    ))
+                    )
 
                     result.meta.inner_hits = sorted_results
             except Exception:
                 log.exception('Error while sorting the results (inner_hits).')
 
-        log.debug('Search results: %s', pformat(results.to_dict()))
-        log.debug('Search facets: %s', pformat(results.facets.to_dict()))
+        log.debug('Search results: %s', results.to_dict())
+        log.debug('Search facets: %s', results.facets.to_dict())
 
     template_vars = user_input._asdict()
     template_vars.update({