Skip to content

Commit 8d8ec8c

Browse files
committed
Remove old import
1 parent 6aa1eaa commit 8d8ec8c

File tree

1 file changed

+8
-15
lines changed
  • crystal_toolkit/components

1 file changed

+8
-15
lines changed

crystal_toolkit/components/xas.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
from dash.dependencies import Input, Output, State
88
from dash.exceptions import PreventUpdate
99

10-
from pymatgen.ext.matproj import MPRester
11-
1210
from crystal_toolkit.core.mpcomponent import MPComponent
13-
from crystal_toolkit.core.panelcomponent import PanelComponent, PanelComponent2
11+
from crystal_toolkit.core.panelcomponent import PanelComponent
1412
from crystal_toolkit.helpers.layouts import *
1513

1614
# Author: Matthew McDermott
@@ -140,8 +138,9 @@ def update_graph(plotdata):
140138
]
141139

142140
@app.callback(
143-
Output(self.id(), "data"),
144-
[Input(self.id("element-selector"), "value")],
141+
[Output(self.id(), "data"), Output(self.id("elements"), "data")][
142+
Input(self.id("element-selector"), "value")
143+
],
145144
[State(self.id("mpid"), "data"), State(self.id("elements"), "data")],
146145
)
147146
def pattern_from_mpid(element, mpid, elements):
@@ -150,6 +149,8 @@ def pattern_from_mpid(element, mpid, elements):
150149

151150
url_path = "/materials/" + mpid["mpid"] + "/xas/" + element
152151

152+
from mp_api.matproj import MPRester
153+
153154
with MPRester() as mpr:
154155
data = mpr._make_request(url_path) # querying MP database via MAPI
155156

@@ -166,20 +167,12 @@ def pattern_from_mpid(element, mpid, elements):
166167
)
167168
]
168169

169-
return plotdata
170-
171-
@app.callback(
172-
Output(self.id("elements"), "data"), [Input(self.id("mpid"), "data")]
173-
)
174-
def get_elements_from_mpid(mpid):
175-
if not mpid or "mpid" not in mpid:
176-
raise PreventUpdate
177-
178170
with MPRester() as mpr:
179171
entry = mpr.get_entry_by_material_id(mpid["mpid"])
180172
comp = entry.composition
181173
elem_options = [str(comp.elements[i]) for i in range(0, len(comp))]
182-
return elem_options
174+
175+
return plotdata, elem_options
183176

184177
@app.callback(
185178
Output(self.id("element-selector"), "options"),

0 commit comments

Comments
 (0)