refactor validators to remove duplicate files

README.md

@@ -55,7 +55,7 @@ See the [Python documentation](https://plotly.com/python/) for more examples.
 
 Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is a high-level, declarative charting library. plotly.js ships with over 30 chart types, including scientific charts, 3D graphs, statistical charts, SVG maps, financial charts, and more.
 
-`plotly.py` is [MIT Licensed](https://github.com/plotly/plotly.py/blob/main/LICENSE.txt). Plotly graphs can be viewed in Jupyter and marimo notebooks, standalone HTML files, or integrated into [Dash applications](https://dash.plotly.com/).
+`plotly.py` is [MIT Licensed](https://github.com/plotly/plotly.py/blob/main/LICENSE.txt). Plotly graphs can be viewed in [Jupyter notebooks](https://jupyter.org), other Python notebook software such as [marimo](https://marimo.io), as standalone HTML files, or integrated into [Dash applications](https://dash.plotly.com/).
 
 [Contact us](https://plotly.com/consulting-and-oem/) for consulting, dashboard development, application integration, and feature additions.
 

codegen/__init__.py

@@ -21,8 +21,9 @@
     build_from_imports_py,
 )
 from codegen.validators import (
-    write_validator_py,
-    write_data_validator_py,
+    get_data_validator_params,
+    get_validator_params,
+    write_validator_json,
     get_data_validator_instance,
 )
 
@@ -171,22 +172,27 @@ def perform_codegen(reformat=True):
         if node.is_compound and not isinstance(node, ElementDefaultsNode)
     ]
 
+    validator_params = {}
     # Write out validators
     # --------------------
     # # ### Layout ###
     for node in all_layout_nodes:
-        write_validator_py(outdir, node)
+        get_validator_params(node, validator_params)
 
     # ### Trace ###
     for node in all_trace_nodes:
-        write_validator_py(outdir, node)
+        get_validator_params(node, validator_params)
 
     # ### Frames ###
     for node in all_frame_nodes:
-        write_validator_py(outdir, node)
+        get_validator_params(node, validator_params)
 
     # ### Data (traces) validator ###
-    write_data_validator_py(outdir, base_traces_node)
+    get_data_validator_params(base_traces_node, validator_params)
+
+    # Write out the JSON data for the validators
+    os.makedirs(validators_pkgdir, exist_ok=True)
+    write_validator_json(outdir, validator_params)
 
     # Alls
     # ----
@@ -217,27 +223,6 @@ def perform_codegen(reformat=True):
         layout_array_nodes,
     )
 
-    # Write validator __init__.py files
-    # ---------------------------------
-    # ### Write __init__.py files for each validator package ###
-    validator_rel_class_imports = {}
-    for node in all_datatype_nodes:
-        if node.is_mapped:
-            continue
-        key = node.parent_path_parts
-        validator_rel_class_imports.setdefault(key, []).append(
-            f"._{node.name_property}.{node.name_validator_class}"
-        )
-
-    # Add Data validator
-    root_validator_pairs = validator_rel_class_imports[()]
-    root_validator_pairs.append("._data.DataValidator")
-
-    # Output validator __init__.py files
-    validators_pkg = opath.join(outdir, "validators")
-    for path_parts, rel_classes in validator_rel_class_imports.items():
-        write_init_py(validators_pkg, path_parts, [], rel_classes)
-
     # Write datatype __init__.py files
     # --------------------------------
     datatype_rel_class_imports = {}

codegen/datatypes.py

@@ -130,14 +130,11 @@ class {datatype_class}(_{node.name_base_datatype}):\n"""
 """
         )
 
-        subplot_validator_names = [n.name_validator_class for n in subplot_nodes]
-
-        validator_csv = ", ".join(subplot_validator_names)
         subplot_dict_str = (
             "{"
             + ", ".join(
-                f"'{subname}': {valname}"
-                for subname, valname in zip(subplot_names, subplot_validator_names)
+                f'"{subname}": ValidatorCache.get_validator("layout", "{subname}")'
+                for subname in subplot_names
             )
             + "}"
         )
@@ -153,7 +150,7 @@ def _subplotid_validators(self):
         -------
         dict
         \"\"\"
-        from plotly.validators.layout import ({validator_csv})
+        from plotly.validator_cache import ValidatorCache
 
         return {subplot_dict_str}