Update inputs for Dash 2.0

mkhorton · mkhorton · commit 4547e94f9e46 · 2021-10-11T21:50:51.000-07:00
diff --git a/crystal_toolkit/apps/examples/bandstructure.py b/crystal_toolkit/apps/examples/bandstructure.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 
 # standard Crystal Toolkit import
 import crystal_toolkit.components as ctc
diff --git a/crystal_toolkit/apps/examples/basic_hello_structure.py b/crystal_toolkit/apps/examples/basic_hello_structure.py
@@ -1,7 +1,7 @@
 # as explained in "preamble" section in documentation
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 import crystal_toolkit.components as ctc
 
 app = dash.Dash()
diff --git a/crystal_toolkit/apps/examples/basic_hello_structure_interactive.py b/crystal_toolkit/apps/examples/basic_hello_structure_interactive.py
@@ -1,7 +1,7 @@
 # as above
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 import crystal_toolkit.components as ctc
 
 # standard Dash imports for callbacks (interactivity)
diff --git a/crystal_toolkit/apps/examples/basic_hello_world.py b/crystal_toolkit/apps/examples/basic_hello_world.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 
 # standard Crystal Toolkit import
 import crystal_toolkit.components as ctc
diff --git a/crystal_toolkit/apps/examples/diffraction.py b/crystal_toolkit/apps/examples/diffraction.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 
 # standard Crystal Toolkit import
 import crystal_toolkit.components as ctc
diff --git a/crystal_toolkit/apps/examples/diffraction_dynamic.py b/crystal_toolkit/apps/examples/diffraction_dynamic.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 from dash.dependencies import Input, Output
 
 # standard Crystal Toolkit import
diff --git a/crystal_toolkit/apps/examples/diffraction_empty.py b/crystal_toolkit/apps/examples/diffraction_empty.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 
 # standard Crystal Toolkit import
 import crystal_toolkit.components as ctc
diff --git a/crystal_toolkit/apps/examples/phase_diagram.py b/crystal_toolkit/apps/examples/phase_diagram.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 
 # import for this example
 from pymatgen.ext.matproj import MPRester
diff --git a/crystal_toolkit/apps/examples/structure.py b/crystal_toolkit/apps/examples/structure.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 
 # import for this example
 from pymatgen.core.structure import Structure
diff --git a/crystal_toolkit/apps/examples/structure_magnetic.py b/crystal_toolkit/apps/examples/structure_magnetic.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 
 # import for this example
 from pymatgen.core.structure import Structure
diff --git a/crystal_toolkit/apps/examples/transformations.py b/crystal_toolkit/apps/examples/transformations.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
 
diff --git a/crystal_toolkit/apps/examples/transformations_minimal.py b/crystal_toolkit/apps/examples/transformations_minimal.py
@@ -1,7 +1,7 @@
 # standard Dash imports
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
 from dash_mp_components import JsonView
diff --git a/crystal_toolkit/apps/examples/write_structure_screenshot_to_file.py b/crystal_toolkit/apps/examples/write_structure_screenshot_to_file.py
@@ -5,8 +5,8 @@
 from pathlib import Path
 
 import dash
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 from dash.dependencies import Input, Output, State
 from pymatgen.symmetry.analyzer import SpacegroupAnalyzer
 
diff --git a/crystal_toolkit/components/diffraction.py b/crystal_toolkit/components/diffraction.py
@@ -1,6 +1,6 @@
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 import math
 import numpy as np
 from dash import callback_context
diff --git a/crystal_toolkit/components/localenv.py b/crystal_toolkit/components/localenv.py
@@ -1,8 +1,8 @@
 import itertools
 from multiprocessing import cpu_count
 
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 import plotly.express as px
 from dash import callback_context
 from dash.dependencies import Input, Output
diff --git a/crystal_toolkit/components/phase_diagram.py b/crystal_toolkit/components/phase_diagram.py
@@ -1,8 +1,8 @@
 from typing import Optional
 
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 import dash_table
 import plotly.graph_objs as go
 from dash.dependencies import Input, Output, State
diff --git a/crystal_toolkit/components/pourbaix.py b/crystal_toolkit/components/pourbaix.py
@@ -1,6 +1,6 @@
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 import plotly.graph_objs as go
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
diff --git a/crystal_toolkit/components/robocrys.py b/crystal_toolkit/components/robocrys.py
@@ -1,4 +1,4 @@
-import dash_html_components as html
+from dash import html
 from dash.dependencies import Input, Output
 from robocrys import StructureCondenser, StructureDescriber
 from robocrys import __version__ as robocrys_version
diff --git a/crystal_toolkit/components/search.py b/crystal_toolkit/components/search.py
@@ -1,7 +1,7 @@
 import os
 
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
diff --git a/crystal_toolkit/components/structure.py b/crystal_toolkit/components/structure.py
@@ -15,7 +15,7 @@
 from typing import Dict, Optional, Tuple, Union
 
 import dash
-import dash_table as dt
+from dash import dash_table as dt
 import numpy as np
 from dash.dependencies import Input, Output, State, MATCH
 from dash.exceptions import PreventUpdate
diff --git a/crystal_toolkit/components/symmetry.py b/crystal_toolkit/components/symmetry.py
@@ -1,6 +1,6 @@
 from fractions import Fraction
 
-import dash_html_components as html
+from dash import html
 import numpy as np
 from dash import callback_context
 from dash.dependencies import Input, Output
diff --git a/crystal_toolkit/components/transformations/core.py b/crystal_toolkit/components/transformations/core.py
@@ -6,10 +6,10 @@
 from typing import Dict, List, Optional, Tuple, Union
 
 import dash
-import dash_core_components as dcc
+from dash import dcc
 import dash_daq as daq
-import dash_html_components as html
-import dash_table as dt
+from dash import html
+from dash import dash_table as dt
 import numpy as np
 from dash.dependencies import ALL, Input, Output, State
 from dash.exceptions import PreventUpdate
diff --git a/crystal_toolkit/components/transformations/grainboundary.py b/crystal_toolkit/components/transformations/grainboundary.py
@@ -1,5 +1,5 @@
 import dash
-import dash_core_components as dcc
+from dash import dcc
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
 from pymatgen.symmetry.analyzer import SpacegroupAnalyzer
diff --git a/crystal_toolkit/components/transformations/slab.py b/crystal_toolkit/components/transformations/slab.py
@@ -1,5 +1,5 @@
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 
 from dash.dependencies import Input, Output, State
 
diff --git a/crystal_toolkit/components/transformations/substitution.py b/crystal_toolkit/components/transformations/substitution.py
@@ -1,6 +1,6 @@
-import dash_core_components as dcc
-import dash_html_components as html
-import dash_table as dt
+from dash import dcc
+from dash import html
+from dash import dash_table as dt
 
 from dash.dependencies import Input, Output, State
 
diff --git a/crystal_toolkit/components/transformations/supercell.py b/crystal_toolkit/components/transformations/supercell.py
@@ -1,5 +1,5 @@
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 
 from dash.dependencies import Input, Output, State
 
diff --git a/crystal_toolkit/components/upload.py b/crystal_toolkit/components/upload.py
@@ -2,8 +2,8 @@
 from tempfile import NamedTemporaryFile
 
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
 from monty.serialization import loadfn
diff --git a/crystal_toolkit/components/xas.py b/crystal_toolkit/components/xas.py
@@ -1,7 +1,7 @@
 import os
 
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 import plotly.graph_objs as go
 
 from dash.dependencies import Input, Output, State
diff --git a/crystal_toolkit/core/mpcomponent.py b/crystal_toolkit/core/mpcomponent.py
@@ -8,9 +8,9 @@
 from base64 import b64encode
 
 import dash
-import dash_core_components as dcc
-import dash_html_components as html
-import dash_table as dt
+from dash import dcc
+from dash import html
+from dash import dash_table as dt
 import numpy as np
 from dash.dependencies import ALL, Output
 from flask_caching import Cache
diff --git a/crystal_toolkit/core/panelcomponent.py b/crystal_toolkit/core/panelcomponent.py
@@ -1,5 +1,5 @@
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
 
diff --git a/crystal_toolkit/helpers/layouts.py b/crystal_toolkit/helpers/layouts.py
@@ -2,8 +2,8 @@
 import warnings
 from typing import Any, Dict, List, Optional, Union
 
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 from habanero import content_negotiation
 from monty.serialization import dumpfn, loadfn
 
