add mibig bgc classes version-based control

Author: gcroci2

app/callbacks.py

@@ -12,7 +12,8 @@
 import dash_uploader as du
 import pandas as pd
 import plotly.graph_objects as go
-from config import GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS
+from config import GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_PRE_V4
+from config import GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_V4
 from config import GM_FILTER_DROPDOWN_MENU_OPTIONS
 from config import GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
 from config import GM_RESULTS_TABLE_MANDATORY_COLUMNS
@@ -528,7 +529,7 @@ def gm_filter_create_initial_block(block_id: str) -> dmc.Grid:
                     ),
                     dcc.Dropdown(
                         id={"type": "gm-filter-dropdown-bgc-class-dropdown", "index": block_id},
-                        options=GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS,
+                        options=GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_PRE_V4,
                         multi=True,
                         style={"display": "none"},
                     ),
@@ -631,7 +632,7 @@ def gm_filter_display_blocks(
                                 "type": "gm-filter-dropdown-bgc-class-dropdown",
                                 "index": new_block_id,
                             },
-                            options=GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS,
+                            options=GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_PRE_V4,
                             multi=True,
                             style={"display": "none"},
                         ),
@@ -663,36 +664,64 @@ def gm_filter_display_blocks(
     Output({"type": "gm-filter-dropdown-bgc-class-dropdown", "index": MATCH}, "placeholder"),
     Output({"type": "gm-filter-dropdown-ids-text-input", "index": MATCH}, "value"),
     Output({"type": "gm-filter-dropdown-bgc-class-dropdown", "index": MATCH}, "value"),
+    Output({"type": "gm-filter-dropdown-bgc-class-dropdown", "index": MATCH}, "options"),
     Input({"type": "gm-filter-dropdown-menu", "index": MATCH}, "value"),
+    Input("mibig-version-selector", "value"),
+    State({"type": "gm-filter-dropdown-bgc-class-dropdown", "index": MATCH}, "value"),
 )
 def gm_filter_update_placeholder(
-    selected_value: str,
-) -> tuple[dict[str, str], dict[str, str], str, str, str, list[Any]]:
-    """Update the placeholder text and style of input fields based on the dropdown selection.
+    selected_value: str, mibig_version: str, current_bgc_value: list
+) -> tuple[dict[str, str], dict[str, str], str, str, str, list[Any], list[dict]]:
+    """Update the placeholder text, style, and options of input fields based on the dropdown selection and MIBiG version.
 
     Args:
         selected_value: The value selected in the dropdown menu.
+        mibig_version: The selected MIBiG version.
+        current_bgc_value: Currently selected BGC class values.
 
     Returns:
-        A tuple containing style, placeholder, and value updates for the input fields.
+        A tuple containing style, placeholder, value, and options updates for the input fields.
     """
-    if not ctx.triggered:
-        # Callback was not triggered by user interaction, don't change anything
-        raise dash.exceptions.PreventUpdate
+    # Determine which option set to use based on MIBiG version
+    if mibig_version == "v4_plus":
+        bgc_options = GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_V4
+    else:
+        bgc_options = GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_PRE_V4
+
+    # Check what triggered the callback
+    triggered_id = ctx.triggered_id
+
+    # If MIBiG version changed, clear the BGC class selection
+    if triggered_id == "mibig-version-selector":
+        new_bgc_value = []
+    else:
+        # Otherwise keep the current selection
+        new_bgc_value = current_bgc_value
+
+    # Update the styles and placeholders based on the dropdown selection
     if selected_value == "GCF_ID":
-        return {"display": "block"}, {"display": "none"}, "1, 2, 3, ...", "", "", []
+        return (
+            {"display": "block"},
+            {"display": "none"},
+            "1, 2, 3, ...",
+            "",
+            "",
+            new_bgc_value,
+            bgc_options,
+        )
     elif selected_value == "BGC_CLASS":
         return (
             {"display": "none"},
             {"display": "block"},
             "",
             "Select one or more BGC classes",
             "",
-            [],
+            new_bgc_value,
+            bgc_options,
         )
     else:
         # This case should never occur due to the Literal type, but it satisfies mypy
-        return {"display": "none"}, {"display": "none"}, "", "", "", []
+        return {"display": "none"}, {"display": "none"}, "", "", "", new_bgc_value, bgc_options
 
 
 # ------------------ MG Filter functions ------------------ #

app/config.py

@@ -4,12 +4,28 @@
     {"label": "BGC Class", "value": "BGC_CLASS"},
 ]
 
-GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS = [
+# BGC class options for different MIBiG versions
+MIBIG_VERSIONS = [
+    {"label": "MIBiG < 4.0", "value": "pre_v4"},
+    {"label": "MIBiG ≥ 4.0", "value": "v4_plus"},
+]
+
+GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_PRE_V4 = [
     {"label": "Alkaloid", "value": "ALKALOID"},
     {"label": "NRP", "value": "NRP"},
     {"label": "Polyketide", "value": "POLYKETIDE"},
     {"label": "RiPP", "value": "RIPP"},
-    {"label": "Saccharide", "value": "SAACCHARIDE"},
+    {"label": "Saccharide", "value": "SACCHARIDE"},
+    {"label": "Terpene", "value": "TERPENE"},
+    {"label": "Other", "value": "OTHER"},
+    {"label": "Unknown", "value": "UNKNOWN"},
+]
+
+GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS_V4 = [
+    {"label": "NRPS", "value": "NRPS"},
+    {"label": "PKS", "value": "PKS"},
+    {"label": "Ribosomal", "value": "RIBOSOMAL"},
+    {"label": "Saccharide", "value": "SACCHARIDE"},
     {"label": "Terpene", "value": "TERPENE"},
     {"label": "Other", "value": "OTHER"},
     {"label": "Unknown", "value": "UNKNOWN"},

app/layouts.py

@@ -4,6 +4,7 @@
 import dash_uploader as du
 from config import GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
 from config import MG_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
+from config import MIBIG_VERSIONS
 from dash import dash_table
 from dash import dcc
 from dash import html
@@ -166,7 +167,12 @@ def create_results_table(table_id, no_sort_columns):
 
 
 def create_filter_accordion(
-    title, control_id, blocks_store_id, blocks_container_id, apply_button_id
+    title,
+    control_id,
+    blocks_store_id,
+    blocks_container_id,
+    apply_button_id,
+    include_mibig_selector=False,
 ):
     """Create a common filter accordion component.
 
@@ -176,10 +182,69 @@ def create_filter_accordion(
         blocks_store_id: The ID for blocks storage.
         blocks_container_id: The ID for blocks container.
         apply_button_id: The ID for the apply button.
+        include_mibig_selector: Whether to include MIBiG version selector.
 
     Returns:
         A dmc.Accordion component.
     """
+    panel_content = []
+
+    # Add MIBiG version selector if needed
+    if include_mibig_selector:
+        panel_content.append(
+            dbc.Row(
+                dbc.Col(
+                    html.Div(
+                        [
+                            dbc.Label(
+                                "MIBiG Version:",
+                                className="me-2",
+                                style={"verticalAlign": "middle"},
+                            ),
+                            dcc.Dropdown(
+                                id="mibig-version-selector",
+                                options=MIBIG_VERSIONS,
+                                value="pre_v4",  # Default to pre v4.0 for backward compatibility
+                                clearable=False,
+                                style={
+                                    "width": "150px",
+                                    "verticalAlign": "middle",
+                                    "marginLeft": "5px",
+                                },
+                            ),
+                        ],
+                        className="d-flex align-items-center",
+                        style={"marginLeft": "0", "marginBottom": "70px"},
+                    ),
+                    width=12,
+                ),
+                className="mb-3",
+            )
+        )
+
+    panel_content.extend(
+        [
+            html.Div(
+                [
+                    dcc.Store(id=blocks_store_id, data=[]),
+                    html.Div(
+                        id=blocks_container_id,
+                        children=[],
+                    ),
+                ]
+            ),
+            html.Div(
+                dbc.Button(
+                    "Apply Filters",
+                    id=apply_button_id,
+                    color="primary",
+                    className="mt-3",
+                ),
+                className="d-flex justify-content-center",
+            ),
+        ]
+    )
+
     return dmc.Accordion(
         [
             dmc.AccordionItem(
@@ -190,28 +255,7 @@ def create_filter_accordion(
                         id=control_id,
                         className="mt-5 mb-3",
                     ),
-                    dmc.AccordionPanel(
-                        [
-                            html.Div(
-                                [
-                                    dcc.Store(id=blocks_store_id, data=[]),
-                                    html.Div(
-                                        id=blocks_container_id,
-                                        children=[],
-                                    ),
-                                ]
-                            ),
-                            html.Div(
-                                dbc.Button(
-                                    "Apply Filters",
-                                    id=apply_button_id,
-                                    color="primary",
-                                    className="mt-3",
-                                ),
-                                className="d-flex justify-content-center",
-                            ),
-                        ]
-                    ),
+                    dmc.AccordionPanel(panel_content),
                 ],
                 value=f"{control_id.split('-')[0]}-filter-accordion",
             ),
@@ -448,13 +492,14 @@ def create_tab_content(prefix, filter_title, checkl_options, no_sort_columns):
     Returns:
         A dbc.Row component with all tab content.
     """
-    # Create filter accordion
+    # Create filter accordion with MIBiG selector for GM tab
     filter_accordion = create_filter_accordion(
         filter_title,
         f"{prefix}-filter-accordion-control",
         f"{prefix}-filter-blocks-id",
         f"{prefix}-filter-blocks-container",
         f"{prefix}-filter-apply-button",
+        include_mibig_selector=(prefix == "gm"),
     )
 
     # Create data table