Use to_json_plotly in html and orca logic

jonmmease · jonmmease · commit 4e9d64ecdc4b · 2021-01-08T12:00:16.000-05:00
diff --git a/packages/python/plotly/plotly/io/_html.py b/packages/python/plotly/plotly/io/_html.py
@@ -128,6 +128,7 @@ def to_html(
     str
         Representation of figure as an HTML div string
     """
+    from plotly.io.json import to_json_plotly
 
     # ## Validate figure ##
     fig_dict = validate_coerce_fig_to_dict(fig, validate)
@@ -136,15 +137,11 @@ def to_html(
     plotdivid = str(uuid.uuid4())
 
     # ## Serialize figure ##
-    jdata = _json.dumps(
-        fig_dict.get("data", []), cls=utils.PlotlyJSONEncoder, sort_keys=True
-    )
-    jlayout = _json.dumps(
-        fig_dict.get("layout", {}), cls=utils.PlotlyJSONEncoder, sort_keys=True
-    )
+    jdata = to_json_plotly(fig_dict.get("data", []))
+    jlayout = to_json_plotly(fig_dict.get("layout", {}))
 
     if fig_dict.get("frames", None):
-        jframes = _json.dumps(fig_dict.get("frames", []), cls=utils.PlotlyJSONEncoder)
+        jframes = to_json_plotly(fig_dict.get("frames", []))
     else:
         jframes = None
 
diff --git a/packages/python/plotly/plotly/io/_orca.py b/packages/python/plotly/plotly/io/_orca.py
@@ -1458,6 +1458,7 @@ def request_image_with_retrying(**kwargs):
     with retrying logic.
     """
     from requests import post
+    from plotly.io.json import to_json_plotly
 
     if config.server_url:
         server_url = config.server_url
@@ -1467,7 +1468,7 @@ def request_image_with_retrying(**kwargs):
         )
 
     request_params = {k: v for k, v, in kwargs.items() if v is not None}
-    json_str = json.dumps(request_params, cls=_plotly_utils.utils.PlotlyJSONEncoder)
+    json_str = to_json_plotly(request_params)
     response = post(server_url + "/", data=json_str)
 
     if response.status_code == 522:
diff --git a/packages/python/plotly/templategen/__init__.py b/packages/python/plotly/templategen/__init__.py
@@ -1,5 +1,4 @@
-from plotly.utils import PlotlyJSONEncoder
-import json
+from plotly.io.json import to_json_plotly
 import os
 from templategen.definitions import builders
 
@@ -20,4 +19,4 @@
             ),
             "w",
         ) as f:
-            plotly_schema = json.dump(template, f, cls=PlotlyJSONEncoder)
+            f.write(to_json_plotly(template))
