Merge pull request #26 from hdlim15/bugfix_hashed_cache_key

use sha1 instead of built in hash function
ycharts · Oct 8, 2019 · 74291b9 · 74291b9
2 parents 4390bb3 + 5c2f183
commit 74291b9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/autocompleter/__init__.py b/autocompleter/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (0, 8, 2)
+VERSION = (0, 8, 3)
 
 from autocompleter.registry import registry, signal_registry
 from autocompleter.base import AutocompleterBase, AutocompleterModelProvider, AutocompleterDictProvider, Autocompleter

diff --git a/autocompleter/base.py b/autocompleter/base.py
@@ -1,4 +1,5 @@
 from collections import OrderedDict
+from hashlib import sha1
 import redis
 import json
 import itertools
@@ -863,19 +864,22 @@ def hash_facets(facets):
         Given an array of facet data, return a deterministic hash such that
         the ordering of keys inside the facet dicts does not matter.
         """
+        def sha1_digest(my_str):
+            return sha1(my_str.encode(encoding='UTF-8')).hexdigest()
+
         facet_hashes = []
         for facet in facets:
             sub_facet_hashes = []
             facet_type = facet['type']
             sub_facets = facet['facets']
             for sub_facet in sub_facets:
                 sub_facet_str = 'key:' + sub_facet['key'] + 'value:' + str(sub_facet['value'])
-                sub_facet_hashes.append(hash(sub_facet_str))
+                sub_facet_hashes.append(sha1_digest(sub_facet_str))
             sub_facet_hashes.sort()
             facet_str = 'type:' + facet_type + 'facets:' + str(sub_facet_hashes)
-            facet_hashes.append(hash(facet_str))
+            facet_hashes.append(sha1_digest(facet_str))
         facet_hashes.sort()
-        final_facet_hash = hash(str(facet_hashes))
+        final_facet_hash = sha1_digest(str(facet_hashes))
         return final_facet_hash
 
     @staticmethod

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='django-autocompleter',
-    version="0.8.2",
+    version="0.8.3",
     description='A redis-backed autocompletor for Django projects',
     author='Ara Anjargolian',
     author_email='[email protected]',

diff --git a/test_project/test_app/tests/test_utils.py b/test_project/test_app/tests/test_utils.py
@@ -48,7 +48,7 @@ def test_hashing_order(self):
                 'type': 'or',
                 'facets': [
                     {'key': 'sector', 'value': 'Technology'},
-                    {'key': 'industry', 'value': 'Software'}
+                    {'value': 'Software', 'key': 'industry'}
                 ]
             }
         ]
@@ -103,8 +103,8 @@ def test_multiple_facets_hashing_order(self):
             {
                 'type': 'or',
                 'facets': [
-                    {'key': 'sector', 'value': 'Technology'},
-                    {'key': 'industry', 'value': 'Software'}
+                    {'value': 'Technology', 'key': 'sector'},
+                    {'value': 'Software', 'key': 'industry'}
                 ]
             },
             {
@@ -127,7 +127,7 @@ def test_multiple_facets_hashing_order(self):
             {
                 'type': 'or',
                 'facets': [
-                    {'key': 'sector', 'value': 'Technology'},
+                    {'value': 'Technology', 'key': 'sector'},
                     {'key': 'industry', 'value': 'Software'}
                 ]
             },