Some fixes for states and rename file

Author: tupui

Makefile

@@ -41,14 +41,14 @@ test:  ## Run tests with coverage
 # Dashboard commands
 
 serve-dev:  ## Serve Panel dashboard - Dev mode
-	panel serve panel/simdec.py panel/sampling.py \
+	panel serve panel/simdec_app.py panel/sampling.py \
 		--index panel/index.html \
  		--show --autoreload \
  		--static-dirs _static=docs/_static \
  		--reuse-sessions --warm
 
 serve-oauth:  ## Serve Panel dashboard - Prod mode with OAuth2. Needs: PANEL_OAUTH_REDIRECT_URI, PANEL_OAUTH_KEY, PANEL_OAUTH_SECRET, PANEL_OAUTH_ENCRYPTION
-	PANEL_OAUTH_SCOPE=email panel serve panel/simdec.py panel/sampling.py \
+	PANEL_OAUTH_SCOPE=email panel serve panel/simdec_app.py panel/sampling.py \
 		--index panel/index.html \
 		--show \
 		--cookie-secret panel_cookie_secret_oauth \

panel/Dockerfile

@@ -62,7 +62,7 @@ USER app
 WORKDIR /app
 
 # Run the web service on container startup.
-CMD ["panel", "serve", "panel/simdec.py", "panel/sampling.py", \
+CMD ["panel", "serve", "panel/simdec_app.py", "panel/sampling.py", \
      "--address", "0.0.0.0", "--port", "8080", \
      "--num-procs", "2", \
      "--allow-websocket-origin", "simdec.io", \

panel/simdec.py renamed to panel/simdec_app.py

@@ -174,6 +174,7 @@ def update_colors_select(event):
 
 
 def create_color_pickers(states, colors):
+    print(states)
     color_picker_list = []
     for state, color in zip(states[0], colors):
         color_picker = pn.widgets.ColorPicker(name=state, value=color)
@@ -183,10 +184,11 @@ def create_color_pickers(states, colors):
 
 
 @pn.cache
-def palette(res, colors_picked):
+def palette_(states: list[list[str]], colors_picked: list[list[float]]):
     cmaps = [single_color_to_colormap(color_picked) for color_picked in colors_picked]
     # Reverse order as in figures high values take the first colors
-    return sd.palette(res.states[::-1], cmaps=cmaps[::-1])
+    states = [len(states_) for states_ in states]
+    return sd.palette(states[::-1], cmaps=cmaps[::-1])
 
 
 @pn.cache
@@ -206,7 +208,7 @@ def xlim_auto(output):
 
 
 @pn.cache
-def figure(res, palette, n_bins, xlim, kind, output_name):
+def figure_pn(res, palette, n_bins, xlim, kind, output_name):
     kind = "histogram" if kind == "Stacked histogram" else "boxplot"
     plt.close("all")
     fig, ax = plt.subplots()
@@ -224,12 +226,12 @@ def states_from_data(res, inputs):
 
 
 @pn.cache
-def tableau(res, states, palette):
+def tableau_pn(res, states, palette):
     # use a notebook to see the styling
     _, styler = sd.tableau(
         statistic=res.statistic,
         var_names=res.var_names,
-        states=states,
+        states=res.states,
         bins=res.bins,
         palette=palette,
     )
@@ -392,12 +394,10 @@ def callback_xlim(start, end):
     colors_select.param.value,
 )
 
-interactive_palette = pn.bind(
-    palette, interactive_decomposition, colors_select.param.value
-)
+interactive_palette = pn.bind(palette_, interactive_states, colors_select.param.value)
 
 interactive_figure = pn.bind(
-    figure,
+    figure_pn,
     interactive_decomposition,
     interactive_palette,
     selector_n_bins,
@@ -407,7 +407,7 @@ def callback_xlim(start, end):
 )
 
 interactive_tableau = pn.bind(
-    tableau, interactive_decomposition, interactive_states, interactive_palette
+    tableau_pn, interactive_decomposition, interactive_states, interactive_palette
 )
 interactive_tableau_states = pn.bind(
     tableau_states, interactive_decomposition, interactive_states