plotly: Expose properties in layout.

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

@@ -39,11 +39,22 @@ def convert_datapoints(self, datapoints):
                 value = datapoint[self.properties[axis]]
                 traces[revision][axis].append(value)
         traces = list(traces.values())
-        template = self.properties["template"]
+
+        template = self.properties.pop("template", "linear")
         for trace in traces:
             trace["type"] = template
 
-        return {"data": traces}
+        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.convert_datapoints(self.datapoints))

tests/test_plotly.py

@@ -1,7 +1,5 @@
 import json
 
-import pytest
-
 from dvc_render.plotly import PlotlyRenderer
 
 # pylint: disable=missing-function-docstring,
@@ -16,19 +14,21 @@ def test_plotly_partial_html():
         {"first_val": 7, "second_val": 8, "rev": "HEAD"},
     ]
 
-    plot_content = json.loads(
-        PlotlyRenderer(datapoints, "foo", **props).partial_html()
-    )
+    plot_content = json.loads(PlotlyRenderer(datapoints, "foo", **props).partial_html())
 
     assert plot_content == {
         "data": [
             {"x": [1, 3], "y": [2, 4], "type": "scatter", "name": "workspace"},
             {"x": [5, 7], "y": [6, 8], "type": "scatter", "name": "HEAD"},
-        ]
+        ],
+        "layout": {
+            "title": "",
+            "xaxis": {"title": "first_val"},
+            "yaxis": {"title": "second_val"},
+        },
     }
 
 
-@pytest.mark.xfail(reason="TODO")
 def test_plotly_layout():
     props = {"x": "first_val", "y": "second_val", "title": "TITLE"}
     datapoints = [
@@ -38,14 +38,16 @@ def test_plotly_layout():
         {"first_val": 7, "second_val": 8, "rev": "HEAD"},
     ]
 
-    plot_content = json.loads(
-        PlotlyRenderer(datapoints, "foo", **props).partial_html()
-    )
+    plot_content = json.loads(PlotlyRenderer(datapoints, "foo", **props).partial_html())
 
     assert plot_content == {
         "data": [
-            {"x": [1, 3], "y": [2, 4], "type": "scatter", "name": "workspace"},
-            {"x": [5, 7], "y": [6, 8], "type": "scatter", "name": "HEAD"},
+            {"x": [1, 3], "y": [2, 4], "type": "linear", "name": "workspace"},
+            {"x": [5, 7], "y": [6, 8], "type": "linear", "name": "HEAD"},
         ],
-        "layout": {"title": "TITLE"},
+        "layout": {
+            "title": "TITLE",
+            "xaxis": {"title": "first_val"},
+            "yaxis": {"title": "second_val"},
+        },
     }