Spaces:
Build error
Build error
Kelbec
commited on
Commit
•
0ee5691
1
Parent(s):
c1a444d
update version and fix ui
Browse files- docker2ecr.sh +1 -1
- pages/01_dcascade.py +21 -18
docker2ecr.sh
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 901702069075.dkr.ecr.us-east-1.amazonaws.com
|
2 |
-
docker build -t dcascade-app --build-arg GITHUB_TOKEN=$GITHUB_TOKEN .
|
3 |
docker tag dcascade-app:latest 901702069075.dkr.ecr.us-east-1.amazonaws.com/dcascade-app:latest
|
4 |
docker push 901702069075.dkr.ecr.us-east-1.amazonaws.com/dcascade-app:latest
|
|
|
1 |
aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 901702069075.dkr.ecr.us-east-1.amazonaws.com
|
2 |
+
docker build -t dcascade-app --build-arg GITHUB_TOKEN=$GITHUB_TOKEN . --no-cache
|
3 |
docker tag dcascade-app:latest 901702069075.dkr.ecr.us-east-1.amazonaws.com/dcascade-app:latest
|
4 |
docker push 901702069075.dkr.ecr.us-east-1.amazonaws.com/dcascade-app:latest
|
pages/01_dcascade.py
CHANGED
@@ -24,13 +24,22 @@ ds = solara.reactive(None)
|
|
24 |
feature_properties = solara.reactive(None)
|
25 |
geo_data = solara.reactive(None)
|
26 |
sel_feature = solara.reactive(None)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
27 |
chart_options = solara.reactive({
|
28 |
"line": {
|
29 |
"title": {"text": "Variable"},
|
30 |
"tooltip": {},
|
31 |
"legend": {"data": ["Variable"]},
|
32 |
-
"xAxis": {"data":list(range(1,
|
33 |
-
"xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30, "data":list(range(1, 21))}, # {"type": "category"},
|
34 |
"yAxis": {"name": "Variable","nameLocation": "middle","nameGap": 60},
|
35 |
"series": [{
|
36 |
"type": "line",
|
@@ -71,7 +80,7 @@ def on_variable_change(variable):
|
|
71 |
"title": {"text": sel_var.value+" "+str(feature_properties.value['FromN']-1)},
|
72 |
"tooltip": {},
|
73 |
"legend": {"data": [sel_var.value+" "+str(feature_properties.value['FromN']-1)]},
|
74 |
-
"xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1,
|
75 |
"yAxis": {"name": sel_var.value+" "+str(feature_properties.value['FromN']-1),"nameLocation": "middle","nameGap": 60},
|
76 |
"emphasis": {"itemStyle": {"shadowBlur":10}},
|
77 |
"series": [{
|
@@ -100,7 +109,7 @@ def on_feature_click(feature, **kwargs):
|
|
100 |
"title": {"text": sel_var.value+" "+str(properties['FromN']-1)},
|
101 |
"tooltip": {},
|
102 |
"legend": {"data": [sel_var.value+" "+str(properties['FromN']-1)]},
|
103 |
-
"xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1,
|
104 |
"yAxis": {"name": sel_var.value+" "+str(properties['FromN']-1),"nameLocation": "middle","nameGap": 60},
|
105 |
"emphasis": {"itemStyle": {"shadowBlur":10}},
|
106 |
"series": [{
|
@@ -224,17 +233,6 @@ def Page():
|
|
224 |
size, set_size = solara.use_state(0)
|
225 |
file_browser, set_file_browser = solara.use_state(cast(Optional[Path], None))
|
226 |
map_loaded, set_map_loaded = solara.use_state(False)
|
227 |
-
|
228 |
-
formulas = ["Parker and Klingeman 1982", "Wilkock and Crowe 2003", "Engelund and Hansen 1967", "Yang formula 1989", "Wong and Parker 2006", "Ackers and White formula 1973"]
|
229 |
-
formula = solara.reactive("Engelund and Hansen 1967")
|
230 |
-
partitionings = ["Direct", "Bed material fraction (BMF)", "Transport capacity function (TCF)", "Shear stress correction approach"]
|
231 |
-
partitioning = solara.reactive("Shear stress correction approach")
|
232 |
-
timescale = solara.reactive("20")
|
233 |
-
sed_range = solara.reactive("-8,5")
|
234 |
-
class_size = solara.reactive(2.5)
|
235 |
-
deposit = solara.reactive(50.0)
|
236 |
-
continuous_update = solara.reactive(True)
|
237 |
-
|
238 |
|
239 |
|
240 |
def on_file(file: FileInfo):
|
@@ -295,8 +293,13 @@ def Page():
|
|
295 |
set_no_file_selected(False)
|
296 |
sel_form = formulas.index(str(formula).replace("'",""))+1
|
297 |
sel_part = partitionings.index(str(partitioning).replace("'",""))+1
|
298 |
-
sel_timescale = int(str(timescale).replace("'",""))
|
299 |
-
|
|
|
|
|
|
|
|
|
|
|
300 |
set_map_loaded(False)
|
301 |
global_map_loaded.set(False)
|
302 |
river = river_filename
|
@@ -310,7 +313,7 @@ def Page():
|
|
310 |
file_shp.set(out_shp)
|
311 |
# out_prj = out+".prj"
|
312 |
# shutil.copyfile(river,out_prj)
|
313 |
-
dcascade_py(river, q, sed_range=sed_range.value, class_size=class_size.value, deposit=deposit.value, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_nc, version=False, verbose=False, debug=False, credits=False)
|
314 |
set_map_loaded(True)
|
315 |
# filename = os.getcwd()+'/public/deposito.nc'
|
316 |
ds.set(xr.open_dataset(out_nc, decode_times=False))
|
|
|
24 |
feature_properties = solara.reactive(None)
|
25 |
geo_data = solara.reactive(None)
|
26 |
sel_feature = solara.reactive(None)
|
27 |
+
timescale = solara.reactive("20")
|
28 |
+
sed_range = solara.reactive("-8,5")
|
29 |
+
class_size = solara.reactive(2.5)
|
30 |
+
deposit = solara.reactive(50.0)
|
31 |
+
continuous_update = solara.reactive(True)
|
32 |
+
formulas = ["Parker and Klingeman 1982", "Wilkock and Crowe 2003", "Engelund and Hansen 1967", "Yang formula 1989", "Wong and Parker 2006", "Ackers and White formula 1973"]
|
33 |
+
formula = solara.reactive("Engelund and Hansen 1967")
|
34 |
+
partitionings = ["Direct", "Bed material fraction (BMF)", "Transport capacity function (TCF)", "Shear stress correction approach"]
|
35 |
+
partitioning = solara.reactive("Shear stress correction approach")
|
36 |
+
|
37 |
chart_options = solara.reactive({
|
38 |
"line": {
|
39 |
"title": {"text": "Variable"},
|
40 |
"tooltip": {},
|
41 |
"legend": {"data": ["Variable"]},
|
42 |
+
"xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30, "data":list(range(1, int(timescale.value)+1))}, # {"type": "category"},
|
|
|
43 |
"yAxis": {"name": "Variable","nameLocation": "middle","nameGap": 60},
|
44 |
"series": [{
|
45 |
"type": "line",
|
|
|
80 |
"title": {"text": sel_var.value+" "+str(feature_properties.value['FromN']-1)},
|
81 |
"tooltip": {},
|
82 |
"legend": {"data": [sel_var.value+" "+str(feature_properties.value['FromN']-1)]},
|
83 |
+
"xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, int(timescale.value)+1))}, # {"type": "category"},
|
84 |
"yAxis": {"name": sel_var.value+" "+str(feature_properties.value['FromN']-1),"nameLocation": "middle","nameGap": 60},
|
85 |
"emphasis": {"itemStyle": {"shadowBlur":10}},
|
86 |
"series": [{
|
|
|
109 |
"title": {"text": sel_var.value+" "+str(properties['FromN']-1)},
|
110 |
"tooltip": {},
|
111 |
"legend": {"data": [sel_var.value+" "+str(properties['FromN']-1)]},
|
112 |
+
"xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, int(timescale.value)+1))}, # {"type": "category"},
|
113 |
"yAxis": {"name": sel_var.value+" "+str(properties['FromN']-1),"nameLocation": "middle","nameGap": 60},
|
114 |
"emphasis": {"itemStyle": {"shadowBlur":10}},
|
115 |
"series": [{
|
|
|
233 |
size, set_size = solara.use_state(0)
|
234 |
file_browser, set_file_browser = solara.use_state(cast(Optional[Path], None))
|
235 |
map_loaded, set_map_loaded = solara.use_state(False)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
236 |
|
237 |
|
238 |
def on_file(file: FileInfo):
|
|
|
293 |
set_no_file_selected(False)
|
294 |
sel_form = formulas.index(str(formula).replace("'",""))+1
|
295 |
sel_part = partitionings.index(str(partitioning).replace("'",""))+1
|
296 |
+
# sel_timescale = int(str(timescale).replace("'",""))
|
297 |
+
sel_timescale = int(timescale.value)
|
298 |
+
|
299 |
+
tmp_options = chart_options.value
|
300 |
+
tmp_options["line"]["xAxis"]["data"] = list(range(1, sel_timescale+1))
|
301 |
+
chart_options.set(tmp_options)
|
302 |
+
|
303 |
set_map_loaded(False)
|
304 |
global_map_loaded.set(False)
|
305 |
river = river_filename
|
|
|
313 |
file_shp.set(out_shp)
|
314 |
# out_prj = out+".prj"
|
315 |
# shutil.copyfile(river,out_prj)
|
316 |
+
dcascade_py(river, q, sed_range=sed_range.value, class_size=class_size.value, deposit=deposit.value, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_nc, version=False, verbose=False, debug=False, credits=False, nc=True)
|
317 |
set_map_loaded(True)
|
318 |
# filename = os.getcwd()+'/public/deposito.nc'
|
319 |
ds.set(xr.open_dataset(out_nc, decode_times=False))
|