[FEAT/FIX] Tab3: adaptive slider precision, hide Other resources, show hidden secondary hints, filter inactive methods

tabs/tab3_coefficients.py

@@ -2,7 +2,8 @@ import pandas as pd
 import streamlit as st
 
 from config.config import (method_groups, method_order, resource_groups,
-                           resource_order, secondary_resources, resource_unit_map, CO2_UNIT)
+                           resource_order, secondary_resources, resource_unit_map, CO2_UNIT,
+                           hidden_resource_names)
 from utils.ui_helpers import format_efficiency_summary, show_bar
 from utils.data_utils import strip_unit_suffix, get_resource_to_group
 
@@ -15,22 +16,50 @@ def normalize_costs(costs_dict: dict) -> dict:
 def get_slider_params(conf: dict) -> tuple:
     """Derive slider step size and display format from a coefficient config dict.
 
+    Format is driven by min (display precision); step is driven by range
+    (usability) and floored at 1e-06 (Streamlit's hard lower limit).
+
     Args:
-        conf (dict): slider config with key "min" (the minimum coefficient value).
+        conf (dict): slider config with keys "min", "median", "max".
 
     Returns:
         tuple[float, str]: (step, fmt) where step is the slider increment and
                            fmt is a printf-style format string for display.
     """
     min_coeff = conf["min"]
-    if min_coeff < 0.01:
-        return 0.0001, "%.4f"
+    coeff_range = conf["max"] - min_coeff
+
+    # Format: enough decimals to show the minimum value without scientific notation
+    if min_coeff < 1e-10:
+        fmt = "%.11f"
+    elif min_coeff < 1e-08:
+        fmt = "%.9f"
+    elif min_coeff < 1e-05:
+        fmt = "%.6f"
+    elif min_coeff < 0.01:
+        fmt = "%.4f"
     elif min_coeff < 1:
-        return 0.001, "%.3f"
+        fmt = "%.3f"
     elif min_coeff < 100:
-        return 0.01, "%.2f"
+        fmt = "%.2f"
+    else:
+        fmt = "%.0f"
+
+    # Step: ~1/1000 of the range, floored at 1e-06 (Streamlit minimum)
+    if coeff_range < 0.001:
+        step = 1e-06
+    elif coeff_range < 0.1:
+        step = 0.0001
+    elif coeff_range < 1:
+        step = 0.001
+    elif coeff_range < 10:
+        step = 0.01
+    elif coeff_range < 100:
+        step = 0.1
     else:
-        return 1.0, "%.0f"
+        step = 1.0
+
+    return step, fmt
 
 
 def is_method_enabled(method, resource, enabled_methods):
@@ -167,9 +196,9 @@ def render_standard_resource_row(method, r, conf, display_label, enabled_methods
 
     is_secondary = (method, r) in secondary_resources
     step, fmt = get_slider_params(conf)
-    toggle_key = f"toggle_{method}_{r}".replace(" ", "_").lower()
-    slider_key = f"slider_{method}_{r}".replace(" ", "_").lower()
-    manual_key = f"manual_{method}_{r}".replace(" ", "_").lower()
+    toggle_key = f"toggle_{method}_{r}".replace(" ", "_")
+    slider_key = f"slider_{method}_{r}".replace(" ", "_")
+    manual_key = f"manual_{method}_{r}".replace(" ", "_")
     current_val = normalize_costs(st.session_state.costs.get(method, {})).get(r, 0.0)
     if is_secondary:
         if toggle_key not in st.session_state:
@@ -190,15 +219,15 @@ def render_standard_resource_row(method, r, conf, display_label, enabled_methods
         st.session_state.costs[method][r] = conf["median"]
         if st.session_state.get("resource_caps", {}).get(r, 0) <= 0:
             if has_custom_batch:
-                st.info(
+                st.warning(
                     f"No available quantity set for **{r}** in Resource Inputs tab.",
-                    icon=":material/info:",
+                    icon=":material/warning:",
                 )
             else:
-                st.info(
+                st.warning(
                     f"No available quantity set for **{r}** in Resource Inputs tab: "
                     f"**{method}** won't be used in the optimization.",
-                    icon=":material/info:",
+                    icon=":material/warning:",
                 )
         return
 
@@ -208,15 +237,15 @@ def render_standard_resource_row(method, r, conf, display_label, enabled_methods
         st.session_state[manual_key] = st.session_state[slider_key]
     if st.session_state.get("resource_caps", {}).get(r, 0) <= 0:
         if has_custom_batch:
-            st.info(
+            st.warning(
                 f"No available quantity set for **{r}** in Resource Inputs tab.",
-                icon=":material/info:",
+                icon=":material/warning:",
             )
         else:
-            st.info(
+            st.warning(
                 f"No available quantity set for **{r}** in Resource Inputs tab: "
                 f"**{method}** won't be used in the optimization.",
-                icon=":material/info:",
+                icon=":material/warning:",
             )
 
     col1, col2 = st.columns([3, 1])
@@ -225,13 +254,13 @@ def render_standard_resource_row(method, r, conf, display_label, enabled_methods
             label=display_label,
             min_value=conf["min"], max_value=conf["max"], step=step, format=fmt,
             key=slider_key,
-            on_change=make_sync_s_to_m(slider_key, manual_key),
+            on_change=make_sync_s_to_m(slider_key, manual_key)
         )
     with col2:
         st.number_input(
             label="label", label_visibility="collapsed",
             key=manual_key, help="Manual override (optional, any value)",
-            format=fmt, value=None, placeholder=str(round(slider_val, 4)),
+            format=fmt, value=None, placeholder=str(round(slider_val, 6)),
             on_change=make_sync_m_to_s(slider_key, manual_key, conf["min"], conf["max"]),
         )
 
@@ -259,9 +288,9 @@ def render_custom_resource_row(method, r, conf, enabled_methods, custom_resource
 
     is_sec = is_custom_secondary(method, r, custom_resource_to_sub_group)
     step, fmt = get_slider_params(conf)
-    toggle_key = f"toggle_{method}_{r}".replace(" ", "_").lower()
-    slider_key = f"slider_{method}_{r}".replace(" ", "_").lower()
-    manual_key = f"manual_{method}_{r}".replace(" ", "_").lower()
+    toggle_key = f"toggle_{method}_{r}".replace(" ", "_")
+    slider_key = f"slider_{method}_{r}".replace(" ", "_")
+    manual_key = f"manual_{method}_{r}".replace(" ", "_")
     current_val = st.session_state.costs.get(method, {}).get(r, 0.0 if is_sec else conf["median"])
 
     if is_sec:
@@ -314,7 +343,7 @@ def render_custom_resource_row(method, r, conf, enabled_methods, custom_resource
         st.number_input(
             label="label", label_visibility="collapsed",
             key=manual_key, help="Manual override (optional, any value)",
-            format=fmt, value=None, placeholder=str(round(slider_val, 4)),
+            format=fmt, value=None, placeholder=str(round(slider_val, 6)),
             on_change=make_sync_m_to_s(slider_key, manual_key, conf["min"], conf["max"]),
         )
 
@@ -350,13 +379,32 @@ def panel_method_editor(
         method_sliders = cost_sliders_norm.get(method, {})
         custom_for_method = custom_sliders_by_method.get(method, {})
 
+        primary_resources = [r for r in method_sliders if (method, r) not in secondary_resources]
+        if primary_resources and all(r in hidden_resource_names for r in primary_resources) and not custom_for_method:
+            required = [r for r in primary_resources if r in hidden_resource_names]
+            optional = [r for r in method_sliders if r in hidden_resource_names and (method, r) in secondary_resources]
+            req_list = "\n".join(f"- **{r}** *(required)*" for r in required)
+            opt_list = "\n".join(f"- **{r}** *(optional)*" for r in optional) if optional else ""
+            body = f"To use this method, add a new resource in the **Resource inputs** tab:\n\n{req_list}"
+            if opt_list:
+                body += f"\n{opt_list}"
+            st.info(body, icon=":material/info:")
+            return
+
         for group_name, rlist in resource_groups.items():
-            used = [r for r in rlist if r in method_sliders]
+            used = [r for r in rlist if r in method_sliders and r not in hidden_resource_names]
             custom_in_group = [
                 r for r in custom_for_method
                 if custom_resource_to_group.get(r) == group_name
             ]
-            if not used and not custom_in_group:
+            hidden_secondary_in_group = [
+                r for r in rlist
+                if r in method_sliders
+                and r in hidden_resource_names
+                and (method, r) in secondary_resources
+                and not any(custom_resource_to_sub_group.get(cr) == r for cr in custom_for_method)
+            ]
+            if not used and not custom_in_group and not hidden_secondary_in_group:
                 continue
 
             st.markdown(f'<p class="crra-group-name">{group_name}</p>', unsafe_allow_html=True)
@@ -375,16 +423,23 @@ def panel_method_editor(
                     enabled_methods, custom_resource_to_sub_group, custom_resources
                 )
 
+            for r in hidden_secondary_in_group:
+                st.info(
+                    f"**{r}** can be used as an optional secondary resource for this method. "
+                    f"Add a custom resource of type **{r}** in the **Resource inputs** tab to activate it.",
+                    icon=":material/add_circle:",
+                )
+
         if st.button("Reset selected method", key="btn-reset-method", icon=":material/reset_settings:"):
             for r, conf in cost_sliders_norm.get(method, {}).items():
                 is_secondary = (method, r) in secondary_resources
                 st.session_state.costs[method][r] = 0.0 if is_secondary else conf["median"]
                 for prefix in ["slider", "manual", "toggle"]:
-                    st.session_state.pop(f"{prefix}_{method}_{r}".replace(" ", "_").lower(), None)
+                    st.session_state.pop(f"{prefix}_{method}_{r}".replace(" ", "_"), None)
             for r, conf in custom_sliders_by_method.get(method, {}).items():
                 st.session_state.costs.setdefault(method, {})[r] = conf["median"]
                 for prefix in ["slider", "manual"]:
-                    st.session_state.pop(f"{prefix}_{method}_{r}".replace(" ", "_").lower(), None)
+                    st.session_state.pop(f"{prefix}_{method}_{r}".replace(" ", "_"), None)
             st.success(f"{method} reset to default values.")
             st.rerun()
 
@@ -414,7 +469,7 @@ def panel_summary_table(
         for cat, resources in resource_groups.items()
         for r in resources
     }
-    all_resource_columns = resource_order + sorted(custom_resource_names)
+    all_resource_columns = [r for r in resource_order if r not in hidden_resource_names] + sorted(custom_resource_names)
 
     df_default = pd.DataFrame(index=method_order, columns=all_resource_columns)
     df_current = pd.DataFrame(index=method_order, columns=all_resource_columns)
@@ -476,9 +531,9 @@ def render_tab(cost_sliders):
         unsafe_allow_html=True,
     )
     with st.container(key="warning_resources"):
-        st.warning(
+        st.info(
             "Red cells in the table highlight coefficients modified from their **default median values**",
-            icon=":material/warning:",
+            icon=":material/info:",
         )
 
     enabled_methods  = st.session_state.get("enabled_methods", {})
@@ -498,7 +553,17 @@ def render_tab(cost_sliders):
         custom_resource_to_group,
     ) = build_custom_slider_index(cost_sliders_norm, custom_resources)
 
-    method_choices = [f"{g} | {m}" for g, methods in method_groups.items() for m in methods]
+    constraints = st.session_state.get("constraints", {})
+    active_methods = {m for m, c in constraints.items() if c.get("active", True)}
+    method_choices = [
+        f"{g} | {m}"
+        for g, methods in method_groups.items()
+        for m in methods
+        if not constraints or m in active_methods
+    ]
+    if not method_choices:
+        st.warning("No active methods. Enable at least one method in the **Method Constraints** tab.")
+        return
     method_lookup  = {label: label.split(" | ", 1)[1] for label in method_choices}
     selected_label = st.selectbox("Select a method:", method_choices, key="crra-select")
 
@@ -507,14 +572,14 @@ def render_tab(cost_sliders):
             for r, conf in sliders.items():
                 st.session_state.costs[m][r] = 0.0 if (m, r) in secondary_resources else conf["median"]
                 for prefix in ["slider", "manual", "toggle"]:
-                    st.session_state.pop(f"{prefix}_{m}_{r}".replace(" ", "_").lower(), None)
+                    st.session_state.pop(f"{prefix}_{m}_{r}".replace(" ", "_"), None)
         for m, sliders in custom_sliders_by_method.items():
             for r, conf in sliders.items():
                 st.session_state.costs.setdefault(m, {})[r] = (
                     0.0 if is_custom_secondary(m, r, custom_resource_to_sub_group) else conf["median"]
                 )
                 for prefix in ["slider", "manual", "toggle"]:
-                    st.session_state.pop(f"{prefix}_{m}_{r}".replace(" ", "_").lower(), None)
+                    st.session_state.pop(f"{prefix}_{m}_{r}".replace(" ", "_"), None)
         st.success("All methods reset to default values.")
         st.rerun()