Skip to content

Commit 46d05be

Browse files
committed
Fix custom imports.
1 parent 4045a61 commit 46d05be

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

dash/development/_py_components_generation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def generate_class_file(
221221
)
222222

223223
custom_imp = custom_imports[namespace][typename]
224-
if custom_imports:
224+
if custom_imp:
225225
import_string += "\n".join(custom_imp)
226226
import_string += "\n\n"
227227

tests/unit/development/metadata_test.py

+24-23
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import typing # noqa: F401
44
import numbers # noqa: F401
55
from typing_extensions import TypedDict, NotRequired, Literal # noqa: F401
6+
from dash.development.base_component import ComponentType # noqa: F401
67
from dash.development.base_component import Component, _explicitize_args
78

89

@@ -96,7 +97,7 @@ class Table(Component):
9697
OptionalObjectWithExactAndNestedDescriptionFigure = TypedDict(
9798
"OptionalObjectWithExactAndNestedDescriptionFigure",
9899
{
99-
"data": NotRequired[typing.Union[typing.List[dict], typing.Tuple]],
100+
"data": NotRequired[typing.Union[typing.Sequence[dict], typing.Tuple]],
100101
"layout": NotRequired[dict]
101102
}
102103
)
@@ -113,7 +114,7 @@ class Table(Component):
113114
OptionalObjectWithShapeAndNestedDescriptionFigure = TypedDict(
114115
"OptionalObjectWithShapeAndNestedDescriptionFigure",
115116
{
116-
"data": NotRequired[typing.Union[typing.List[dict], typing.Tuple]],
117+
"data": NotRequired[typing.Union[typing.Sequence[dict], typing.Tuple]],
117118
"layout": NotRequired[dict]
118119
}
119120
)
@@ -130,27 +131,27 @@ class Table(Component):
130131
@_explicitize_args
131132
def __init__(
132133
self,
133-
children: typing.Union[str, int, float, Component, typing.List[typing.Union[str, int, float, Component]]] = None,
134-
optionalArray: typing.Union[typing.List, typing.Tuple] = Component.UNDEFINED,
135-
optionalBool: bool = Component.UNDEFINED,
136-
optionalFunc: typing.Any = Component.UNDEFINED,
137-
optionalNumber: typing.Union[int, float, numbers.Number] = Component.UNDEFINED,
138-
optionalObject: dict = Component.UNDEFINED,
139-
optionalString: str = Component.UNDEFINED,
140-
optionalSymbol: typing.Any = Component.UNDEFINED,
141-
optionalNode: typing.Union[str, int, float, Component, typing.List[typing.Union[str, int, float, Component]]] = Component.UNDEFINED,
142-
optionalElement: Component = Component.UNDEFINED,
143-
optionalMessage: typing.Any = Component.UNDEFINED,
144-
optionalEnum: Literal["News", "Photos"] = Component.UNDEFINED,
145-
optionalUnion: typing.Union[str, typing.Union[int, float, numbers.Number], typing.Any] = Component.UNDEFINED,
146-
optionalArrayOf: typing.Union[typing.List[typing.Union[int, float, numbers.Number]], typing.Tuple] = Component.UNDEFINED,
147-
optionalObjectOf: typing.Dict[typing.Union[str, float, int], typing.Union[int, float, numbers.Number]] = Component.UNDEFINED,
148-
optionalObjectWithExactAndNestedDescription: "OptionalObjectWithExactAndNestedDescription" = Component.UNDEFINED,
149-
optionalObjectWithShapeAndNestedDescription: "OptionalObjectWithShapeAndNestedDescription" = Component.UNDEFINED,
150-
optionalAny: typing.Any = Component.UNDEFINED,
151-
customProp: typing.Any = Component.UNDEFINED,
152-
customArrayProp: typing.Union[typing.List[typing.Any], typing.Tuple] = Component.UNDEFINED,
153-
id: str = Component.UNDEFINED,
134+
children: typing.Optional[typing.Union[str, int, float, ComponentType, typing.Sequence[typing.Union[str, int, float, ComponentType]]]] = None,
135+
optionalArray: typing.Optional[typing.Union[typing.Sequence, typing.Tuple]] = None,
136+
optionalBool: typing.Optional[bool] = None,
137+
optionalFunc: typing.Optional[typing.Any] = None,
138+
optionalNumber: typing.Optional[typing.Union[int, float, numbers.Number]] = None,
139+
optionalObject: typing.Optional[dict] = None,
140+
optionalString: typing.Optional[str] = None,
141+
optionalSymbol: typing.Optional[typing.Any] = None,
142+
optionalNode: typing.Optional[typing.Union[str, int, float, ComponentType, typing.Sequence[typing.Union[str, int, float, ComponentType]]]] = None,
143+
optionalElement: typing.Optional[ComponentType] = None,
144+
optionalMessage: typing.Optional[typing.Any] = None,
145+
optionalEnum: typing.Optional[Literal["News", "Photos"]] = None,
146+
optionalUnion: typing.Optional[typing.Union[str, typing.Union[int, float, numbers.Number], typing.Any]] = None,
147+
optionalArrayOf: typing.Optional[typing.Union[typing.Sequence[typing.Union[int, float, numbers.Number]], typing.Tuple]] = None,
148+
optionalObjectOf: typing.Optional[typing.Dict[typing.Union[str, float, int], typing.Union[int, float, numbers.Number]]] = None,
149+
optionalObjectWithExactAndNestedDescription: typing.Optional["OptionalObjectWithExactAndNestedDescription"] = None,
150+
optionalObjectWithShapeAndNestedDescription: typing.Optional["OptionalObjectWithShapeAndNestedDescription"] = None,
151+
optionalAny: typing.Optional[typing.Any] = None,
152+
customProp: typing.Optional[typing.Any] = None,
153+
customArrayProp: typing.Optional[typing.Union[typing.Sequence[typing.Any], typing.Tuple]] = None,
154+
id: typing.Optional[str] = None,
154155
**kwargs
155156
):
156157
self._prop_names = ['children', 'id', 'aria-*', 'customArrayProp', 'customProp', 'data-*', 'in', 'optionalAny', 'optionalArray', 'optionalArrayOf', 'optionalBool', 'optionalElement', 'optionalEnum', 'optionalNode', 'optionalNumber', 'optionalObject', 'optionalObjectOf', 'optionalObjectWithExactAndNestedDescription', 'optionalObjectWithShapeAndNestedDescription', 'optionalString', 'optionalUnion']

tests/unit/development/test_generate_class_file.py

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"import typing # noqa: F401\n"
1818
"import numbers # noqa: F401\n"
1919
"from typing_extensions import TypedDict, NotRequired, Literal # noqa: F401\n"
20+
"from dash.development.base_component import ComponentType # noqa: F401\n"
2021
"from dash.development.base_component import "
2122
"Component, _explicitize_args\n\n\n"
2223
)

0 commit comments

Comments
 (0)