Merge branch 'ipyplotly_integration' of https://github.com/plotly/plotly.py into ipyplotly_integration

merging from ipyplotly_integration

Author: Kully

_plotly_utils/basevalidators.py

@@ -1864,11 +1864,18 @@ def validate_coerce(self, v):
 
 class BaseDataValidator(BaseValidator):
 
-    def __init__(self, class_strs_map, plotly_name, parent_name, **kwargs):
+    def __init__(self,
+                 class_strs_map,
+                 plotly_name,
+                 parent_name,
+                 set_uid=False,
+                 **kwargs):
         super(BaseDataValidator, self).__init__(
             plotly_name=plotly_name, parent_name=parent_name, **kwargs)
+
         self.class_strs_map = class_strs_map
         self._class_map = None
+        self.set_uid = set_uid
 
     def description(self):
 
@@ -1957,8 +1964,9 @@ def validate_coerce(self, v):
             v = to_scalar_or_list(res)
 
             # Set new UIDs
-            for trace in v:
-                trace.uid = str(uuid.uuid1())
+            if self.set_uid:
+                for trace in v:
+                    trace.uid = str(uuid.uuid1())
 
         else:
             self.raise_invalid_val(v)

codegen/datatypes.py

@@ -81,6 +81,9 @@ def build_datatype_py(node):
     # -------
     buffer.write(
         f'from plotly.basedatatypes import {node.name_base_datatype}\n')
+    buffer.write(
+        f'import copy\n')
+
 
     # Write class definition
     # ----------------------
@@ -210,12 +213,14 @@ def __init__(self""")
             arg = {{}}
         elif isinstance(arg, self.__class__):
             arg = arg.to_plotly_json()
-        elif not isinstance(arg, dict):
+        elif isinstance(arg, dict):
+            arg = copy.copy(arg)
+        else:
             raise ValueError(\"\"\"\\
 The first argument to the {class_name} 
 constructor must be a dict or 
 an instance of {class_name}\"\"\")
-                
+
         # Import validators
         # -----------------
         from plotly.validators{node.parent_dotpath_str} import (
@@ -237,7 +242,7 @@ def __init__(self""")
         name_prop = subtype_node.name_property
         buffer.write(f"""
         v = arg.pop('{name_prop}', None)
-        self.{name_prop} = {name_prop} or v""")
+        self.{name_prop} = {name_prop} if {name_prop} is not None else v""")
 
     # ### Literals ###
     if literal_nodes:

plotly/basedatatypes.py

@@ -119,7 +119,7 @@ class is a subclass of both BaseFigure and widgets.DOMWidget.
         # ### Construct data validator ###
         # This is the validator that handles importing sequences of trace
         # objects
-        self._data_validator = DataValidator()
+        self._data_validator = DataValidator(set_uid=True)
 
         # ### Import traces ###
         data = self._data_validator.validate_coerce(data)
@@ -3846,3 +3846,43 @@ def _send_prop_set(self, prop_path_str, val):
     def on_change(self, callback, *args):
         raise NotImplementedError(
             'Change callbacks are not supported on Frames')
+
+    def _get_child_props(self, child):
+        """
+        Return the properties dict for a child trace or child layout
+
+        Note: this method must match the name/signature of one on
+        BasePlotlyType
+
+        Parameters
+        ----------
+        child : BaseTraceType | BaseLayoutType
+
+        Returns
+        -------
+        dict
+        """
+        # Try to find index of child as a trace
+        # -------------------------------------
+        try:
+            trace_index = BaseFigure._index_is(self.data, child)
+        except ValueError as _:
+            trace_index = None
+
+        # Child is a trace
+        # ----------------
+        if trace_index is not None:
+            if 'data' in self._props:
+                return self._props['data'][trace_index]
+            else:
+                return None
+
+        # Child is the layout
+        # -------------------
+        elif child is self.layout:
+            return self._props.get('layout', None)
+
+        # Unknown child
+        # -------------
+        else:
+            raise ValueError('Unrecognized child: %s' % child)

plotly/graph_objs/_area.py

@@ -1,4 +1,5 @@
 from plotly.basedatatypes import BaseTraceType
+import copy
 
 
 class Area(BaseTraceType):
@@ -699,7 +700,9 @@ def __init__(
             arg = {}
         elif isinstance(arg, self.__class__):
             arg = arg.to_plotly_json()
-        elif not isinstance(arg, dict):
+        elif isinstance(arg, dict):
+            arg = copy.copy(arg)
+        else:
             raise ValueError(
                 """\
 The first argument to the plotly.graph_objs.Area 
@@ -737,45 +740,45 @@ def __init__(
         # Populate data dict with properties
         # ----------------------------------
         v = arg.pop('customdata', None)
-        self.customdata = customdata or v
+        self.customdata = customdata if customdata is not None else v
         v = arg.pop('customdatasrc', None)
-        self.customdatasrc = customdatasrc or v
+        self.customdatasrc = customdatasrc if customdatasrc is not None else v
         v = arg.pop('hoverinfo', None)
-        self.hoverinfo = hoverinfo or v
+        self.hoverinfo = hoverinfo if hoverinfo is not None else v
         v = arg.pop('hoverinfosrc', None)
-        self.hoverinfosrc = hoverinfosrc or v
+        self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else v
         v = arg.pop('hoverlabel', None)
-        self.hoverlabel = hoverlabel or v
+        self.hoverlabel = hoverlabel if hoverlabel is not None else v
         v = arg.pop('ids', None)
-        self.ids = ids or v
+        self.ids = ids if ids is not None else v
         v = arg.pop('idssrc', None)
-        self.idssrc = idssrc or v
+        self.idssrc = idssrc if idssrc is not None else v
         v = arg.pop('legendgroup', None)
-        self.legendgroup = legendgroup or v
+        self.legendgroup = legendgroup if legendgroup is not None else v
         v = arg.pop('marker', None)
-        self.marker = marker or v
+        self.marker = marker if marker is not None else v
         v = arg.pop('name', None)
-        self.name = name or v
+        self.name = name if name is not None else v
         v = arg.pop('opacity', None)
-        self.opacity = opacity or v
+        self.opacity = opacity if opacity is not None else v
         v = arg.pop('r', None)
-        self.r = r or v
+        self.r = r if r is not None else v
         v = arg.pop('rsrc', None)
-        self.rsrc = rsrc or v
+        self.rsrc = rsrc if rsrc is not None else v
         v = arg.pop('selectedpoints', None)
-        self.selectedpoints = selectedpoints or v
+        self.selectedpoints = selectedpoints if selectedpoints is not None else v
         v = arg.pop('showlegend', None)
-        self.showlegend = showlegend or v
+        self.showlegend = showlegend if showlegend is not None else v
         v = arg.pop('stream', None)
-        self.stream = stream or v
+        self.stream = stream if stream is not None else v
         v = arg.pop('t', None)
-        self.t = t or v
+        self.t = t if t is not None else v
         v = arg.pop('tsrc', None)
-        self.tsrc = tsrc or v
+        self.tsrc = tsrc if tsrc is not None else v
         v = arg.pop('uid', None)
-        self.uid = uid or v
+        self.uid = uid if uid is not None else v
         v = arg.pop('visible', None)
-        self.visible = visible or v
+        self.visible = visible if visible is not None else v
 
         # Read-only literals
         # ------------------

plotly/graph_objs/_bar.py

@@ -1,4 +1,5 @@
 from plotly.basedatatypes import BaseTraceType
+import copy
 
 
 class Bar(BaseTraceType):
@@ -1984,7 +1985,9 @@ def __init__(
             arg = {}
         elif isinstance(arg, self.__class__):
             arg = arg.to_plotly_json()
-        elif not isinstance(arg, dict):
+        elif isinstance(arg, dict):
+            arg = copy.copy(arg)
+        else:
             raise ValueError(
                 """\
 The first argument to the plotly.graph_objs.Bar 
@@ -2056,113 +2059,113 @@ def __init__(
         # Populate data dict with properties
         # ----------------------------------
         v = arg.pop('base', None)
-        self.base = base or v
+        self.base = base if base is not None else v
         v = arg.pop('basesrc', None)
-        self.basesrc = basesrc or v
+        self.basesrc = basesrc if basesrc is not None else v
         v = arg.pop('cliponaxis', None)
-        self.cliponaxis = cliponaxis or v
+        self.cliponaxis = cliponaxis if cliponaxis is not None else v
         v = arg.pop('constraintext', None)
-        self.constraintext = constraintext or v
+        self.constraintext = constraintext if constraintext is not None else v
         v = arg.pop('customdata', None)
-        self.customdata = customdata or v
+        self.customdata = customdata if customdata is not None else v
         v = arg.pop('customdatasrc', None)
-        self.customdatasrc = customdatasrc or v
+        self.customdatasrc = customdatasrc if customdatasrc is not None else v
         v = arg.pop('dx', None)
-        self.dx = dx or v
+        self.dx = dx if dx is not None else v
         v = arg.pop('dy', None)
-        self.dy = dy or v
+        self.dy = dy if dy is not None else v
         v = arg.pop('error_x', None)
-        self.error_x = error_x or v
+        self.error_x = error_x if error_x is not None else v
         v = arg.pop('error_y', None)
-        self.error_y = error_y or v
+        self.error_y = error_y if error_y is not None else v
         v = arg.pop('hoverinfo', None)
-        self.hoverinfo = hoverinfo or v
+        self.hoverinfo = hoverinfo if hoverinfo is not None else v
         v = arg.pop('hoverinfosrc', None)
-        self.hoverinfosrc = hoverinfosrc or v
+        self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else v
         v = arg.pop('hoverlabel', None)
-        self.hoverlabel = hoverlabel or v
+        self.hoverlabel = hoverlabel if hoverlabel is not None else v
         v = arg.pop('hovertext', None)
-        self.hovertext = hovertext or v
+        self.hovertext = hovertext if hovertext is not None else v
         v = arg.pop('hovertextsrc', None)
-        self.hovertextsrc = hovertextsrc or v
+        self.hovertextsrc = hovertextsrc if hovertextsrc is not None else v
         v = arg.pop('ids', None)
-        self.ids = ids or v
+        self.ids = ids if ids is not None else v
         v = arg.pop('idssrc', None)
-        self.idssrc = idssrc or v
+        self.idssrc = idssrc if idssrc is not None else v
         v = arg.pop('insidetextfont', None)
-        self.insidetextfont = insidetextfont or v
+        self.insidetextfont = insidetextfont if insidetextfont is not None else v
         v = arg.pop('legendgroup', None)
-        self.legendgroup = legendgroup or v
+        self.legendgroup = legendgroup if legendgroup is not None else v
         v = arg.pop('marker', None)
-        self.marker = marker or v
+        self.marker = marker if marker is not None else v
         v = arg.pop('name', None)
-        self.name = name or v
+        self.name = name if name is not None else v
         v = arg.pop('offset', None)
-        self.offset = offset or v
+        self.offset = offset if offset is not None else v
         v = arg.pop('offsetsrc', None)
-        self.offsetsrc = offsetsrc or v
+        self.offsetsrc = offsetsrc if offsetsrc is not None else v
         v = arg.pop('opacity', None)
-        self.opacity = opacity or v
+        self.opacity = opacity if opacity is not None else v
         v = arg.pop('orientation', None)
-        self.orientation = orientation or v
+        self.orientation = orientation if orientation is not None else v
         v = arg.pop('outsidetextfont', None)
-        self.outsidetextfont = outsidetextfont or v
+        self.outsidetextfont = outsidetextfont if outsidetextfont is not None else v
         v = arg.pop('r', None)
-        self.r = r or v
+        self.r = r if r is not None else v
         v = arg.pop('rsrc', None)
-        self.rsrc = rsrc or v
+        self.rsrc = rsrc if rsrc is not None else v
         v = arg.pop('selected', None)
-        self.selected = selected or v
+        self.selected = selected if selected is not None else v
         v = arg.pop('selectedpoints', None)
-        self.selectedpoints = selectedpoints or v
+        self.selectedpoints = selectedpoints if selectedpoints is not None else v
         v = arg.pop('showlegend', None)
-        self.showlegend = showlegend or v
+        self.showlegend = showlegend if showlegend is not None else v
         v = arg.pop('stream', None)
-        self.stream = stream or v
+        self.stream = stream if stream is not None else v
         v = arg.pop('t', None)
-        self.t = t or v
+        self.t = t if t is not None else v
         v = arg.pop('text', None)
-        self.text = text or v
+        self.text = text if text is not None else v
         v = arg.pop('textfont', None)
-        self.textfont = textfont or v
+        self.textfont = textfont if textfont is not None else v
         v = arg.pop('textposition', None)
-        self.textposition = textposition or v
+        self.textposition = textposition if textposition is not None else v
         v = arg.pop('textpositionsrc', None)
-        self.textpositionsrc = textpositionsrc or v
+        self.textpositionsrc = textpositionsrc if textpositionsrc is not None else v
         v = arg.pop('textsrc', None)
-        self.textsrc = textsrc or v
+        self.textsrc = textsrc if textsrc is not None else v
         v = arg.pop('tsrc', None)
-        self.tsrc = tsrc or v
+        self.tsrc = tsrc if tsrc is not None else v
         v = arg.pop('uid', None)
-        self.uid = uid or v
+        self.uid = uid if uid is not None else v
         v = arg.pop('unselected', None)
-        self.unselected = unselected or v
+        self.unselected = unselected if unselected is not None else v
         v = arg.pop('visible', None)
-        self.visible = visible or v
+        self.visible = visible if visible is not None else v
         v = arg.pop('width', None)
-        self.width = width or v
+        self.width = width if width is not None else v
         v = arg.pop('widthsrc', None)
-        self.widthsrc = widthsrc or v
+        self.widthsrc = widthsrc if widthsrc is not None else v
         v = arg.pop('x', None)
-        self.x = x or v
+        self.x = x if x is not None else v
         v = arg.pop('x0', None)
-        self.x0 = x0 or v
+        self.x0 = x0 if x0 is not None else v
         v = arg.pop('xaxis', None)
-        self.xaxis = xaxis or v
+        self.xaxis = xaxis if xaxis is not None else v
         v = arg.pop('xcalendar', None)
-        self.xcalendar = xcalendar or v
+        self.xcalendar = xcalendar if xcalendar is not None else v
         v = arg.pop('xsrc', None)
-        self.xsrc = xsrc or v
+        self.xsrc = xsrc if xsrc is not None else v
         v = arg.pop('y', None)
-        self.y = y or v
+        self.y = y if y is not None else v
         v = arg.pop('y0', None)
-        self.y0 = y0 or v
+        self.y0 = y0 if y0 is not None else v
         v = arg.pop('yaxis', None)
-        self.yaxis = yaxis or v
+        self.yaxis = yaxis if yaxis is not None else v
         v = arg.pop('ycalendar', None)
-        self.ycalendar = ycalendar or v
+        self.ycalendar = ycalendar if ycalendar is not None else v
         v = arg.pop('ysrc', None)
-        self.ysrc = ysrc or v
+        self.ysrc = ysrc if ysrc is not None else v
 
         # Read-only literals
         # ------------------