dcascade dev and new params

Dockerfile

@@ -9,7 +9,7 @@ RUN mamba install -c conda-forge leafmap geopandas localtileserver -y && \
 USER root
 RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
 RUN conda install -c conda-forge gdal
-RUN pip install git+https://${GITHUB_TOKEN}@github.com/saferplaces/dcascade_py.git@test_no_click
+RUN pip install git+https://${GITHUB_TOKEN}@github.com/saferplaces/dcascade_py.git@development
 RUN pip install keplergl
 COPY requirements.txt .
 RUN pip install -r requirements.txt

pages/01_dcascade.py

@@ -8,7 +8,7 @@ import leafmap.kepler as leafmap
 import solara
 from leafmap.toolbar import change_basemap
 from solara.components.file_drop import FileInfo
-from dcascade import main as dcascade_main
+from dcascade_py import dcascade_py
 
 zoom = solara.reactive(2)
 center = solara.reactive((20, 0))
@@ -165,6 +165,9 @@ def Page():
         partitionings = ["Direct", "Bed material fraction (BMF)", "Transport capacity function (TCF)", "Shear stress correction approach"]
         partitioning = solara.reactive("Shear stress correction approach")
         timescale = solara.reactive("20")
+        sed_range = solara.reactive("-8,4")
+        class_size = solara.reactive(2.5)
+        deposit = solara.reactive(50.0)
         continuous_update = solara.reactive(True)
 
         
@@ -175,7 +178,6 @@ def Page():
             f = file["file_obj"]
             set_content(f.read())
             set_uploaded(False)
-            print(file)
             
         def upload_file():
             if content:
@@ -184,7 +186,6 @@ def Page():
                 with open(file_path,"wb") as file:
                     file.write(content)
                     if filename.endswith(".zip"):
-                        print(filename)
                         shutil.unpack_archive(os.getcwd()+"/public/"+filename,os.getcwd()+"/public")
                         os.remove(os.getcwd()+"/public/"+filename)
 
@@ -236,7 +237,7 @@ def Page():
                 out_shp = out+".shp"
                 out_prj = out+".prj"
                 shutil.copyfile(river,out_prj)
-                dcascade_main.main(river, q, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_shp, version=False, verbose=False, debug=False, credits=False)
+                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_shp, version=False, verbose=False, debug=False, credits=False)
                 set_map_loaded(True)
 
         with solara.Div() as main:
@@ -284,6 +285,12 @@ def Page():
                         solara.Select(label="Partitioning ", value=partitioning, values=partitionings)
                         # solara.Markdown(f"**Selected**: {partitioning.value}")
 
+                        solara.InputText(label="Sed range ", value=sed_range)
+
+                        solara.InputFloat(label="Class size ", value=class_size)
+
+                        solara.InputFloat(label="Deposit ", value=deposit)
+
                 with solara.Card("Select files"):
                     solara.Markdown("Select **river** and **q** files from file explorer below, the uploaded files can be found in /public folder. To select files click on the explorer the click on *SELECT RIVER FILE* or *SELECT Q FILE* based on the file selected.")
                     with solara.ColumnsResponsive(3, large=6):