adjust tests

Author: archmoj

Diff for: packages/python/plotly/_plotly_utils/tests/validators/test_dataarray_validator.py

@@ -2,6 +2,7 @@
 from _plotly_utils.basevalidators import DataArrayValidator
 import numpy as np
 import pandas as pd
+from plotly.tests.b64 import b64
 
 # Fixtures
 # --------
@@ -33,12 +34,22 @@ def test_validator_acceptance_simple(val, validator):
 
 @pytest.mark.parametrize(
     "val",
-    [np.array([2, 3, 4]), pd.Series(["a", "b", "c"]), np.array([[1, 2, 3], [4, 5, 6]])],
+    [pd.Series(["a", "b", "c"])],
 )
 def test_validator_acceptance_homogeneous(val, validator):
     coerce_val = validator.validate_coerce(val)
     assert isinstance(coerce_val, np.ndarray)
-    assert np.array_equal(validator.present(coerce_val), val)
+    assert np.array_equal(validator.present(coerce_val), b64(val))
+
+
+@pytest.mark.parametrize(
+    "val",
+    [np.array([2, 3, 4]), np.array([[1, 2, 3], [4, 5, 6]])],
+)
+def test_validator_acceptance_homogeneous(val, validator):
+    coerce_val = validator.validate_coerce(val)
+    assert isinstance(coerce_val, object)
+    assert np.array_equal(validator.present(coerce_val), b64(val))
 
 
 # ### Rejection ###

Diff for: packages/python/plotly/_plotly_utils/tests/validators/test_pandas_series_input.py

@@ -9,6 +9,8 @@
     ColorValidator,
 )
 
+from plotly.tests.b64 import _b64
+
 
 @pytest.fixture
 def data_array_validator(request):
@@ -91,7 +93,7 @@ def test_numeric_validator_numeric_pandas(number_validator, numeric_pandas):
     res = number_validator.validate_coerce(numeric_pandas)
 
     # Check type
-    assert isinstance(res, np.ndarray)
+    assert isinstance(res, object)
 
     # Check dtype
     assert res.dtype == numeric_pandas.dtype
@@ -104,7 +106,7 @@ def test_integer_validator_numeric_pandas(integer_validator, numeric_pandas):
     res = integer_validator.validate_coerce(numeric_pandas)
 
     # Check type
-    assert isinstance(res, np.ndarray)
+    assert isinstance(res, object)
 
     # Check dtype
     if numeric_pandas.dtype.kind in ("u", "i"):
@@ -122,10 +124,12 @@ def test_data_array_validator(data_array_validator, numeric_pandas):
     res = data_array_validator.validate_coerce(numeric_pandas)
 
     # Check type
-    assert isinstance(res, np.ndarray)
+    assert isinstance(res, object)
+
+    numeric_pandas = _b64(numeric_pandas)
 
     # Check dtype
-    assert res.dtype == numeric_pandas.dtype
+    assert res["dtype"] == numeric_pandas["dtype"]
 
     # Check values
     np.testing.assert_array_equal(res, numeric_pandas)

Diff for: packages/python/plotly/_plotly_utils/tests/validators/test_xarray_input.py

@@ -9,6 +9,8 @@
     ColorValidator,
 )
 
+from plotly.tests.b64 import _b64
+
 
 @pytest.fixture
 def data_array_validator(request):
@@ -99,10 +101,12 @@ def test_data_array_validator(data_array_validator, numeric_xarray):
     res = data_array_validator.validate_coerce(numeric_xarray)
 
     # Check type
-    assert isinstance(res, np.ndarray)
+    assert isinstance(res, object)
+
+    numeric_xarray = _b64(numeric_xarray)
 
     # Check dtype
-    assert res.dtype == numeric_xarray.dtype
+    assert res["dtype"] == numeric_xarray["dtype"]
 
     # Check values
     np.testing.assert_array_equal(res, numeric_xarray)

Diff for: packages/python/plotly/plotly/tests/b64.py

@@ -0,0 +1,82 @@
+import numpy as np
+import base64
+
+plotlyjsShortTypes = {
+    "int8": "i1",
+    "uint8": "u1",
+    "int16": "i2",
+    "uint16": "u2",
+    "int32": "i4",
+    "uint32": "u4",
+    "float32": "f4",
+    "float64": "f8",
+}
+
+int8min = -128
+int8max = 127
+int16min = -32768
+int16max = 32767
+int32min = -2147483648
+int32max = 2147483647
+
+uint8max = 255
+uint16max = 65535
+uint32max = 4294967295
+
+
+def b64(v):
+    """
+    Convert numpy array to plotly.js typed array sepc
+    If not possible return the original value
+    """
+
+    if not isinstance(v, np.ndarray):
+        return v
+
+    dtype = str(v.dtype)
+
+    # convert default Big Ints until we could support them in plotly.js
+    if dtype == "int64":
+        max = v.max()
+        min = v.min()
+        if max <= int8max and min >= int8min:
+            v = v.astype("int8")
+        elif max <= int16max and min >= int16min:
+            v = v.astype("int16")
+        elif max <= int32max and min >= int32min:
+            v = v.astype("int32")
+        else:
+            return v
+
+    elif dtype == "uint64":
+        max = v.max()
+        min = v.min()
+        if max <= uint8max and min >= 0:
+            v = v.astype("uint8")
+        elif max <= uint16max and min >= 0:
+            v = v.astype("uint16")
+        elif max <= uint32max and min >= 0:
+            v = v.astype("uint32")
+        else:
+            return v
+
+    dtype = str(v.dtype)
+
+    if dtype in plotlyjsShortTypes:
+        arrObj = {
+            "dtype": plotlyjsShortTypes[dtype],
+            "bdata": base64.b64encode(v).decode("ascii"),
+        }
+
+        if v.ndim > 1:
+            arrObj["shape"] = str(v.shape)[1:-1]
+
+        print(arrObj)
+
+        return arrObj
+
+    return v
+
+
+def _b64(v):
+    return b64(np.array(v))

Diff for: packages/python/plotly/plotly/tests/test_io/test_to_from_plotly_json.py

@@ -137,7 +137,7 @@ def datetime_array(request, datetime_value):
 def test_graph_object_input(engine, pretty):
     scatter = go.Scatter(x=[1, 2, 3], y=np.array([4, 5, 6]))
     result = pio.to_json_plotly(scatter, engine=engine)
-    expected = """{"x":[1,2,3],"y":[4,5,6],"type":"scatter"}"""
+    expected = """{"x":[1,2,3],"y":{"dtype":"i1","bdata":"BAUG"},"type":"scatter"}"""
     assert result == expected
     check_roundtrip(result, engine=engine, pretty=pretty)