Add initial version of PlotlyRenderer.

setup.cfg

@@ -32,19 +32,19 @@ markdown =
     %(table)s
     matplotlib
 docs =
-    mkdocs==1.3.1
-    mkdocs-gen-files==0.3.5
-    mkdocs-material==8.4.1
-    mkdocs-section-index==0.3.4
-    mkdocstrings-python==0.7.1
+    mkdocs==1.5.2
+    mkdocs-gen-files==0.5.0
+    mkdocs-material==9.2.2
+    mkdocs-section-index==0.3.5
+    mkdocstrings-python==1.5.0
 tests =
     %(table)s
     %(markdown)s
     funcy>=1.17
-    pytest==7.2.0
-    pytest-sugar>=0.9.6,<1.0
-    pytest-cov==3.0.0
-    pytest-mock==3.8.2
+    pytest==7.4.0
+    pytest-sugar==0.9.7
+    pytest-cov==4.1.0
+    pytest-mock==3.11.1
     pylint==2.15.0
     mypy==0.981
     pytest-test-utils>=0.0.6

src/dvc_render/__init__.py

@@ -3,8 +3,8 @@
 """
 from .html import render_html  # noqa: F401
 from .image import ImageRenderer
-from .plotly import ParallelCoordinatesRenderer  # noqa: F401
+from .plotly import PlotlyRenderer  # noqa: F401
 from .vega import VegaRenderer
 from .vega_templates import TEMPLATES  # noqa: F401
 
-RENDERERS = [ImageRenderer, VegaRenderer]
+RENDERERS = [ImageRenderer, PlotlyRenderer, VegaRenderer]

src/dvc_render/plotly.py

@@ -1,16 +1,11 @@
 import json
-from typing import Any, Dict, Optional
+from typing import List
 
 from .base import Renderer
-from .utils import list_dict_to_dict_list
 
 
-class ParallelCoordinatesRenderer(Renderer):
-    """
-    Renderer for Parallel Coordinates plot.
-
-    Using Plotly.
-    """
+class PlotlyRenderer(Renderer):
+    """Renderer using plotly.js mimicking VegaRenderer"""
 
     TYPE = "plotly"
 
@@ -30,63 +25,38 @@ class ParallelCoordinatesRenderer(Renderer):
     """
 
     # pylint: disable=W0231
-    def __init__(
-        self,
-        datapoints,
-        name="pcp",
-        color_by: Optional[str] = None,
-        fill_value: str = "",
-    ):
-        self.datapoints = datapoints
-        self.color_by = color_by
-        self.name = name
-        self.fill_value = fill_value
+    def __init__(self, datapoints: List, name: str, **properties):
+        super().__init__(datapoints, name, **properties)
+
+    def convert_datapoints(self, datapoints):
+        """Convert from dvc-render format to plotly json format"""
+        traces = {}
+        for datapoint in datapoints:
+            revision = datapoint.get("dvc_data_version_info", {}).get(
+                "revision", "workspace"
+            )
+            if revision not in traces:
+                traces[revision] = {"name": revision, "x": [], "y": []}
+            for axis in ("x", "y"):
+                value = datapoint[self.properties[axis]]
+                traces[revision][axis].append(value)
+        traces = list(traces.values())
+
+        template = self.properties.pop("template", "linear")
+        for trace in traces:
+            trace["type"] = template
+
+        layout = {
+            "title": self.properties.get("title", ""),
+            "xaxis": {
+                "title": self.properties.get("x_label", self.properties.get("x"))
+            },
+            "yaxis": {
+                "title": self.properties.get("y_label", self.properties.get("y"))
+            },
+        }
+
+        return {"data": traces, "layout": layout}
 
     def partial_html(self, **kwargs) -> str:
-        return json.dumps(self._get_plotly_data())
-
-    def _get_plotly_data(self):
-        tabular_dict = list_dict_to_dict_list(self.datapoints)
-
-        trace: Dict[str, Any] = {"type": "parcoords", "dimensions": []}
-        for label, values in tabular_dict.items():
-            values = list(map(str, values))
-            is_categorical = False
-            try:
-                float_values = [
-                    float(x) if x != self.fill_value else None for x in values
-                ]
-            except ValueError:
-                is_categorical = True
-
-            if is_categorical:
-                non_missing = [x for x in values if x != self.fill_value]
-                unique_values = sorted(set(non_missing))
-                unique_values.append(self.fill_value)
-
-                dummy_values = [unique_values.index(x) for x in values]
-
-                values = [x if x != self.fill_value else "Missing" for x in values]
-                trace["dimensions"].append(
-                    {
-                        "label": label,
-                        "values": dummy_values,
-                        "tickvals": dummy_values,
-                        "ticktext": values,
-                    }
-                )
-            else:
-                trace["dimensions"].append({"label": label, "values": float_values})
-
-            if label == self.color_by:
-                trace["line"] = {
-                    "color": dummy_values if is_categorical else float_values,
-                    "showscale": True,
-                    "colorbar": {"title": self.color_by},
-                }
-                if is_categorical:
-                    trace["line"]["colorbar"]["tickmode"] = "array"
-                    trace["line"]["colorbar"]["tickvals"] = dummy_values
-                    trace["line"]["colorbar"]["ticktext"] = values
-
-        return {"data": [trace], "layout": {}}
+        return json.dumps(self.convert_datapoints(self.datapoints))