add DataValidator to autogenerated instances provided by ValidatorCache, and cleanup

Author: bmaranville

codegen/__init__.py

@@ -21,10 +21,9 @@
     build_from_imports_py,
 )
 from codegen.validators import (
-    write_validator_py,
+    get_data_validator_params,
     get_validator_params,
     write_validator_json,
-    write_data_validator_py,
     get_data_validator_instance,
 )
 
@@ -178,23 +177,22 @@ def perform_codegen(reformat=True):
     # --------------------
     # # ### 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 ###
+    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)
-    # ### Data (traces) validator ###
-    write_data_validator_py(outdir, base_traces_node)
 
     # Alls
     # ----
@@ -225,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 = {}