Merge pull request #40 from spectriclabs/sha256

Replaced md5 with sha256

Author: ballenspectric

elastic_datashader/drawing.py

@@ -1,5 +1,5 @@
 from functools import lru_cache
-from hashlib import md5
+from hashlib import sha256
 from typing import Dict, Iterable, Tuple
 
 import io
@@ -23,7 +23,7 @@ def get_categorical_color_index(category: str, num_colors: int) -> int:
     across independent tile generations, but can result in situations where
     colors are reused before exhausting the color palette.
     """
-    category_hash = md5(bytes(category, encoding="utf-8")).hexdigest()
+    category_hash = sha256(bytes(category, encoding="utf-8")).hexdigest()
     number = int(category_hash[0:2], 16)
     return number % num_colors
 

elastic_datashader/parameters.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta, timezone
-from hashlib import md5
+from hashlib import sha256
 from json import loads
 from socket import gethostname
 from time import sleep
@@ -244,7 +244,7 @@ def get_time_bounds(now: datetime, from_time: Optional[str], to_time: Optional[s
 
 def get_parameter_hash(params: Dict[str, Any]) -> str:
     """Calculates a hash value for the specific parameter set"""
-    parameter_hash = md5()
+    parameter_hash = sha256()
 
     for _, p in sorted(params.items()):
         if isinstance(p, datetime):

elastic_datashader/tilegen.py

@@ -118,7 +118,7 @@ def all_ellipse_fields_have_values(locs, majors, minors, angles, field_names: El
 
 def normalize_ellipses_to_list(locs, majors, minors, angles):
     '''
-    If its a list determine if there are multiple ellipses or just a single ellipse in list format
+    If it's a list determine if there are multiple ellipses or just a single ellipse in list format
     '''
     if isinstance(locs, (AttrList, list)):
         if (

pyproject.toml

@@ -32,13 +32,13 @@ Pillow = "*"
 pynumeral = "*"
 arrow = "*"
 python-datemath = "*"
-numba = "*"
+numba = "0.56.4"
 numpy = "^1.23"
 PyYAML = "*"
 humanize = "*"
 uvicorn = {extras = ["standard"], version = "^0.18.2", optional = true}
 fastapi = "^0.86"
-georgio = "2022.313.1239"
+georgio = "2022.335.152"
 
 [tool.poetry.dev-dependencies]
 pytest = "*"

tests/test_drawing.py

@@ -13,9 +13,9 @@
         (
             ("foo", "bar", "baz", "Other", "N/A"),
             {
-                "bar": "#8a9500",
-                "baz": "#870062",
-                "foo": "#9a0390",
+                "bar": "#b5e2e1",
+                "baz": "#672138",
+                "foo": "#bfebc3",
                 "Other": "#AAAAAA",
                 "N/A": "#666666",
             }
@@ -84,7 +84,7 @@ def test_ellipse_planar_points():
     np.testing.assert_almost_equal(actual_x[8], 0)
     np.testing.assert_almost_equal(actual_x[12], -50)
 
-    
+
 
     radm = 100
     radn = 30

tests/test_parameters.py

@@ -119,9 +119,9 @@ def test_get_category_field():
     assert parameters.get_category_field("banana") == "banana"
 
 def test_get_parameter_hash():
-    assert parameters.get_parameter_hash({"foo": "bar", "baz": 1}) == "0d922e38f1a94fdc8acc6016c333d49e"
-    assert parameters.get_parameter_hash({"foo": "bar", "baz": 1, "abc": datetime(2022, 2, 17, 11, 0, 0, tzinfo=timezone.utc)}) == "5463c0e1ae7f3c9e182afc2786050765"
-    assert parameters.get_parameter_hash({}) == "d41d8cd98f00b204e9800998ecf8427e"
+    assert parameters.get_parameter_hash({"foo": "bar", "baz": 1}) == "a6488297eb1cdaa23e196800b1c399b13d9a5c86cfecaf8f9fd0fbe9af7533db"
+    assert parameters.get_parameter_hash({"foo": "bar", "baz": 1, "abc": datetime(2022, 2, 17, 11, 0, 0, tzinfo=timezone.utc)}) == "88ade56886a8099e6fd3c25525a0fb9ab3938be64374569480ed3bfd7f3d70e9"
+    assert parameters.get_parameter_hash({}) == "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 
 def test_get_time_bounds_already_quantized():
     now = datetime(2022, 6, 14, 12, 15, 0, tzinfo=timezone.utc)