Fix typing generation & explicitize_args

Author: T4rk1n

dash/development/_py_components_generation.py

@@ -22,13 +22,21 @@
 import_string = """# AUTO GENERATED FILE - DO NOT EDIT
 
 import typing  # noqa: F401
-import numbers # noqa: F401
 from typing_extensions import TypedDict, NotRequired, Literal # noqa: F401
-from dash.development.base_component import Component
-try:
-    from dash.development.base_component import ComponentType # noqa: F401
-except ImportError:
-    ComponentType = typing.TypeVar("ComponentType", bound=Component)
+from dash.development.base_component import Component, _explicitize_args
+{custom_imports}
+ComponentType = typing.Union[
+    str,
+    int,
+    float,
+    Component,
+    None,
+    typing.Sequence[typing.Union[str, int, float, Component, None]],
+]
+
+NumberType = typing.Union[
+    typing.SupportsFloat, typing.SupportsInt, typing.SupportsComplex
+]
 
 
 """
@@ -80,7 +88,6 @@ def generate_class_string(
     _namespace = '{namespace}'
     _type = '{typename}'
 {shapes}
-    _explicitize_dash_init = True
 
     def __init__(
         self,
@@ -98,6 +105,8 @@ def __init__(
         args = {args}
         {required_validation}
         super({typename}, self).__init__({argtext})
+
+setattr({typename}, "__init__", _explicitize_args({typename}.__init__))
 '''
 
     filtered_props = (
@@ -239,7 +248,6 @@ def generate_class_file(
     Returns
     -------
     """
-    imports = import_string
 
     class_string = generate_class_string(
         typename,
@@ -255,8 +263,11 @@ def generate_class_file(
     custom_imp = custom_imp.get(typename) or custom_imp.get("*")
 
     if custom_imp:
-        imports += "\n".join(custom_imp)
-        imports += "\n\n"
+        imports = import_string.format(
+            custom_imports="\n" + "\n".join(custom_imp) + "\n\n"
+        )
+    else:
+        imports = import_string.format(custom_imports="")
 
     file_name = f"{typename:s}.py"
 

dash/development/_py_prop_typing.py

@@ -183,16 +183,10 @@ def get_prop_typing(
     "exact": generate_shape,
     "string": generate_type("str"),
     "bool": generate_type("bool"),
-    "number": generate_type(
-        "typing.Union[typing.SupportsFloat, typing.SupportsInt, typing.SupportsComplex]"
-    ),
-    "node": generate_type(
-        "typing.Union[str, int, float, ComponentType,"
-        " typing.Sequence[typing.Union"
-        "[str, int, float, ComponentType]]]"
-    ),
+    "number": generate_type("NumberType"),
+    "node": generate_type("ComponentType"),
     "func": generate_any,
-    "element": generate_type("ComponentType"),
+    "element": generate_type("Component"),
     "union": generate_union,
     "any": generate_any,
     "custom": generate_any,

dash/development/base_component.py

@@ -57,6 +57,9 @@ def __new__(mcs, name, bases, attributes):
             # We only want to patch the new generated component without
             # the `@_explicitize_args` decorator for mypy support
             # See issue: https://github.com/plotly/dash/issues/3226
+            # Only for component that were generated by 3.0.3
+            # Better to setattr on the component afterwards to ensure
+            # backward compatibility.
             attributes["__init__"] = _explicitize_args(attributes["__init__"])
 
         _component = abc.ABCMeta.__new__(mcs, name, bases, attributes)
@@ -441,7 +444,15 @@ def _validate_deprecation(self):
             warnings.warn(DeprecationWarning(textwrap.dedent(deprecation_message)))
 
 
-ComponentType = typing.TypeVar("ComponentType", bound=Component)
+# Renderable node type.
+ComponentType = typing.Union[
+    str,
+    int,
+    float,
+    Component,
+    None,
+    typing.Sequence[typing.Union[str, int, float, Component, None]],
+]
 
 ComponentTemplate = typing.TypeVar("ComponentTemplate")