Integrate graph_objs codegen and improve codegen reliability

Author: Jon M. Mease

codegen/__init__.py

@@ -1,18 +1,26 @@
 import json
 import os.path as opath
-import os
 import shutil
 
-import time
-
-from codegen.datatypes import build_datatypes_py, write_datatypes_py, append_figure_class
-from codegen.utils import TraceNode, PlotlyNode, LayoutNode, FrameNode
-from codegen.validators import write_validator_py, append_traces_validator_py
-
+from codegen.graph_objs import (delete_graph_objs_non_generated_lines,
+                                append_graph_objs_generated_lines)
 
 def perform_codegen():
     outdir = 'plotly/'
-    # outdir = 'codegen/output'
+
+    # Delete non-generated lines from graph_objs.py
+    # ---------------------------------------------
+    delete_graph_objs_non_generated_lines()
+
+    # Perform codegen imports
+    # -----------------------
+    # this must happend after deleting non-generated lines above
+    from codegen.datatypes import (build_datatypes_py, write_datatypes_py,
+                                   append_figure_class)
+    from codegen.utils import TraceNode, PlotlyNode, LayoutNode, FrameNode
+    from codegen.validators import (write_validator_py,
+                                    append_traces_validator_py)
+
     # Load plotly schema
     # ------------------
     with open('plotly/package_data/default-schema.json', 'r') as f:
@@ -73,6 +81,10 @@ def perform_codegen():
     # --------------------------------
     append_figure_class(datatypes_pkgdir, base_traces_node)
 
+    # Append generated lines to graph_objs.py
+    # ------------------------------------
+    append_graph_objs_generated_lines()
+
 
 if __name__ == '__main__':
     perform_codegen()

update_graph_objs.py renamed to codegen/graph_objs.py

@@ -1,8 +1,5 @@
 from __future__ import print_function
 
-from plotly.graph_objs import graph_objs_tools
-from plotly.graph_reference import ARRAYS, CLASSES, TRACE_NAMES
-
 FLAG = '# AUTO-GENERATED BELOW. DO NOT EDIT! See makefile.'
 
 
@@ -30,6 +27,8 @@ def get_non_generated_file_lines():
 
 
 def print_class(name, f):
+    from plotly.graph_reference import ARRAYS, CLASSES, TRACE_NAMES
+
     if name == 'Figure':
         print('from plotly.datatypes import Figure', file=f, end='\n\n\n')
     elif name == 'Layout':
@@ -48,20 +47,32 @@ def print_class(name, f):
             print('    pass', file=f, end='\n\n\n')
 
 
-copied_lines = get_non_generated_file_lines()
-with open('./plotly/graph_objs/graph_objs.py', 'w') as graph_objs_file:
+def delete_graph_objs_non_generated_lines():
+    copied_lines = get_non_generated_file_lines()
+
+    with open('./plotly/graph_objs/graph_objs.py', 'w') as graph_objs_file:
+        # Keep things *exactly* as they were above our special FLAG.
+        for line in copied_lines:
+            print(line, file=graph_objs_file, end='')
+        print(FLAG, file=graph_objs_file)
+
+
+def append_graph_objs_generated_lines():
+    from plotly.graph_reference import CLASSES
+
+    with open('./plotly/graph_objs/graph_objs.py', 'a') as graph_objs_file:
 
-    # Keep things *exactly* as they were above our special FLAG.
-    for line in copied_lines:
-        print(line, file=graph_objs_file, end='')
-    print(FLAG, file=graph_objs_file)
+        # For each object in the plot schema, generate a class in the file.
+        class_names = list(CLASSES.keys())
+        class_names.sort()
+        for class_name in class_names:
+            print_class(class_name, graph_objs_file)
 
-    # For each object in the plot schema, generate a class in the file.
-    class_names = list(CLASSES.keys())
-    class_names.sort()
-    for class_name in class_names:
-        print_class(class_name, graph_objs_file)
+        # Print FigureWidget import
+        print('from plotly.datatypes import FigureWidget\n\n',
+              file=graph_objs_file)
 
-    # Finish off the file by only exporting plot-schema names.
-    print('__all__ = [cls for cls in graph_reference.CLASSES.keys() '
-          'if cls in globals()] + ["FigureWidget"]', file=graph_objs_file)
+        # Finish off the file by only exporting plot-schema names.
+        print("""\
+__all__ = [cls for cls in graph_reference.CLASSES.keys() 
+           if cls in globals()] + ['FigureWidget']""", file=graph_objs_file)

plotly/basedatatypes.py

@@ -17,8 +17,9 @@
 from plotly import animation
 from plotly.basevalidators import CompoundValidator, CompoundArrayValidator, BaseDataValidator
 from plotly.callbacks import Points, BoxSelector, LassoSelector, InputState
-from plotly.validators.layout import (XAxisValidator, YAxisValidator, GeoValidator,
-                                      TernaryValidator, SceneValidator)
+
+# from plotly.validators.layout import (XAxisValidator, YAxisValidator, GeoValidator,
+#                                       TernaryValidator, SceneValidator)
 
 
 class BaseFigure:
@@ -1806,15 +1807,24 @@ def _send_update(self, prop, val):
 
 
 class BaseLayoutType(BaseLayoutHierarchyType):
+
+
     _subplotid_prop_names = ['xaxis', 'yaxis', 'geo', 'ternary', 'scene']
-    _subplotid_validators = {'xaxis': XAxisValidator,
-                             'yaxis': YAxisValidator,
-                             'geo': GeoValidator,
-                             'ternary': TernaryValidator,
-                             'scene': SceneValidator}
 
     _subplotid_prop_re = re.compile('(' + '|'.join(_subplotid_prop_names) + ')(\d+)')
 
+    @property
+    def _subplotid_validators(self):
+        from plotly.validators.layout import (XAxisValidator, YAxisValidator,
+                                              GeoValidator,
+                                              TernaryValidator, SceneValidator)
+
+        return {'xaxis': XAxisValidator,
+                'yaxis': YAxisValidator,
+                'geo': GeoValidator,
+                'ternary': TernaryValidator,
+                'scene': SceneValidator}
+
     def __init__(self, plotly_name, **kwargs):
         # Compute invalid kwargs. Pass to parent for error message
         invalid_kwargs = {k: v for k, v in kwargs.items()

plotly/graph_objs/graph_objs.py

@@ -799,9 +799,6 @@ def create(object_name, *args, **kwargs):
                 return PlotlyDict(*args, **kwargs)
 
 
-from plotly.datatypes import FigureWidget
-
-
 # AUTO-GENERATED BELOW. DO NOT EDIT! See makefile.
 class AngularAxis(dict):
     pass
@@ -998,4 +995,8 @@ class ZAxis(dict):
     pass
 
 
-__all__ = [cls for cls in graph_reference.CLASSES.keys() if cls in globals()] + ["FigureWidget"]
+from plotly.datatypes import FigureWidget
+
+
+__all__ = [cls for cls in graph_reference.CLASSES.keys() 
+           if cls in globals()] + ['FigureWidget']