workbench 0.8.218__tar.gz → 0.8.228__tar.gz

{workbench-0.8.218 → workbench-0.8.228}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workbench
-Version: 0.8.218
+Version: 0.8.228
 Summary: Workbench: A Dashboard and Python API for creating and deploying AWS SageMaker Model Pipelines
 Author-email: SuperCowPowers LLC <support@supercowpowers.com>
 License: MIT License
@@ -54,6 +54,7 @@ Requires-Dist: requests>=2.26.0
 Requires-Dist: rdkit>=2024.9.5
 Requires-Dist: mordredcommunity>=2.0.6
 Requires-Dist: workbench-bridges>=0.1.16
+Requires-Dist: cleanlab>=2.9.0
 Provides-Extra: ui
 Requires-Dist: plotly>=6.0.0; extra == "ui"
 Requires-Dist: dash>=3.0.0; extra == "ui"
@@ -71,66 +72,54 @@ Requires-Dist: flake8; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Provides-Extra: all
 Requires-Dist: networkx>=3.2; extra == "all"
-Requires-Dist: plotly>=6.0.0; extra == "all"
-Requires-Dist: dash>=3.0.0; extra == "all"
-Requires-Dist: dash-bootstrap-components>=1.6.0; extra == "all"
-Requires-Dist: dash-bootstrap-templates>=1.3.0; extra == "all"
-Requires-Dist: dash_ag_grid; extra == "all"
-Requires-Dist: tabulate>=0.9.0; extra == "all"
-Requires-Dist: pytest; extra == "all"
-Requires-Dist: pytest-sugar; extra == "all"
-Requires-Dist: coverage; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: flake8; extra == "all"
-Requires-Dist: black; extra == "all"
+Requires-Dist: workbench[ui]; extra == "all"
+Requires-Dist: workbench[dev]; extra == "all"
 Dynamic: license-file
 
 
-# Recent News
+## Live Dashboard Demo
+You can explore a live demo of the Workbench Dashboard at: [Workbench Dashboard Demo](https://workbench-dashboard.com)
 
-### Themes
+## Recent News
+**Chemprop Models!** All the rage for the Open ADMET Challenge. 
 
-Everyone knows that good data science requires... **Some Awesome Themes!**
+Workbench now supports:
+- Single Task Chemprop Models
+- Multi Task Chemprop Models
+- Chemprop Hybrid Models (MPNN + Descriptors)
+- Foundation Chemprop Models (CheMeleon Pretrained)
+
+Examples: 
+
+- [Deploying Chemprop Models](examples/models/chemprop.py)
+- [Deploying Foundation Chemprop Models](examples/models/chemprop_foundation.py)
+
+**References**
+- [Open ADMET Challenge](https://huggingface.co/spaces/openadmet/OpenADMET-ExpansionRx-Challenge)
+- **ChemProp:** Yang et al. "Analyzing Learned Molecular Representations for Property Prediction" *J. Chem. Inf. Model.* 2019 — [GitHub](https://github.com/chemprop/chemprop) | [Paper](https://pubs.acs.org/doi/10.1021/acs.jcim.9b00237)
+- [CheMeleon Github](https://github.com/JacksonBurns/chemeleon)
+
+### Chemprop Action Shots!
 
 <table>
   <tr>
     <td>
-      <a href="https://github.com/user-attachments/assets/82ab4eab-0688-4b93-ad8e-9b954564777b">
-        <img width="400" alt="theme_dark" src="https://github.com/user-attachments/assets/82ab4eab-0688-4b93-ad8e-9b954564777b" />
-      </a>
-    </td>
-    <td>
-      <a href="https://github.com/user-attachments/assets/b63a0789-c144-4048-afb6-f03e3d993680">
-        <img width="400" alt="theme_light" src="https://github.com/user-attachments/assets/b63a0789-c144-4048-afb6-f03e3d993680" />
+      <a href="https://github.com/user-attachments/assets/a36c6eff-c464-4c9a-9859-a45cd7e35145">
+        <img width="800" alt="theme_dark" src="https://github.com/user-attachments/assets/a36c6eff-c464-4c9a-9859-a45cd7e35145" />
       </a>
     </td>
   </tr>
   <tr>
     <td>
-      <a href="https://github.com/user-attachments/assets/8a59be19-0c5d-42c6-9922-feafb1a1eecd">
-        <img width="400" alt="theme_quartz" src="https://github.com/user-attachments/assets/8a59be19-0c5d-42c6-9922-feafb1a1eecd" />
-      </a>
-    </td>
-    <td>
-      <a href="https://github.com/user-attachments/assets/5b01ec64-8d56-43bf-96c5-7da8ec48f527">
-        <img width="400" alt="theme_quartz_dark" src="https://github.com/user-attachments/assets/5b01ec64-8d56-43bf-96c5-7da8ec48f527" />
+      <a href="https://github.com/user-attachments/assets/d65ec1da-e04e-44fe-8782-4da0fb50588a">
+        <img width="800" alt="theme_quartz" src="https://github.com/user-attachments/assets/d65ec1da-e04e-44fe-8782-4da0fb50588a" />
       </a>
     </td>
   </tr>
 </table>
 
-All of the Dashboard pages, subpages, and plugins use our new `ThemeManager()` class. See [Workbench Themes](https://supercowpowers.github.io/workbench/themes/), also big thanks to our friends at [Dash Bootstrap Templates](https://github.com/AnnMarieW/dash-bootstrap-templates)
-
 
 
-### Workbench up on the AWS Marketplace
-
-Powered by AWS® to accelerate your Machine Learning Pipelines development with our new [Dashboard for ML Pipelines](https://aws.amazon.com/marketplace/pp/prodview-5idedc7uptbqo). Getting started with Workbench is a snap and can be billed through AWS.
-
-### Coming Soon: `v0.9`
-
-We're getting ready for our `v0.9` release. Here's the road map: [Workbench RoadMaps](https://supercowpowers.github.io/workbench/road_maps/0_9_0/) 
-
 # Welcome to Workbench
 The Workbench framework makes AWS® both easier to use and more powerful. Workbench handles all the details around updating and managing a complex set of AWS Services. With a simple-to-use Python API and a beautiful set of web interfaces, Workbench makes creating AWS ML pipelines a snap. It also dramatically improves both the usability and visibility across the entire spectrum of services: Glue Job, Athena, Feature Store, Models, and Endpoints, Workbench makes it easy to build production ready, AWS powered, machine learning pipelines.
 
@@ -168,6 +157,10 @@ For the full instructions for connecting your AWS Account see:
 - One time AWS Onboarding: [AWS Setup](https://supercowpowers.github.io/workbench/aws_setup/core_stack/)
 
 
+### Workbench up on the AWS Marketplace
+
+Powered by AWS® to accelerate your Machine Learning Pipelines development with our new [Dashboard for ML Pipelines](https://aws.amazon.com/marketplace/pp/prodview-5idedc7uptbqo). Getting started with Workbench is a snap and can be billed through AWS.
+
 ### Workbench Presentations
 Even though Workbench makes AWS easier, it's taking something very complex (the full set of AWS ML Pipelines/Services) and making it less complex. Workbench has a depth and breadth of functionality so we've provided higher level conceptual documentation See: [Workbench Presentations](https://supercowpowers.github.io/workbench/presentations/)
 

{workbench-0.8.218 → workbench-0.8.228}/README.md

@@ -1,49 +1,47 @@
 
-# Recent News
+## Live Dashboard Demo
+You can explore a live demo of the Workbench Dashboard at: [Workbench Dashboard Demo](https://workbench-dashboard.com)
 
-### Themes
+## Recent News
+**Chemprop Models!** All the rage for the Open ADMET Challenge. 
 
-Everyone knows that good data science requires... **Some Awesome Themes!**
+Workbench now supports:
+- Single Task Chemprop Models
+- Multi Task Chemprop Models
+- Chemprop Hybrid Models (MPNN + Descriptors)
+- Foundation Chemprop Models (CheMeleon Pretrained)
+
+Examples: 
+
+- [Deploying Chemprop Models](examples/models/chemprop.py)
+- [Deploying Foundation Chemprop Models](examples/models/chemprop_foundation.py)
+
+**References**
+- [Open ADMET Challenge](https://huggingface.co/spaces/openadmet/OpenADMET-ExpansionRx-Challenge)
+- **ChemProp:** Yang et al. "Analyzing Learned Molecular Representations for Property Prediction" *J. Chem. Inf. Model.* 2019 — [GitHub](https://github.com/chemprop/chemprop) | [Paper](https://pubs.acs.org/doi/10.1021/acs.jcim.9b00237)
+- [CheMeleon Github](https://github.com/JacksonBurns/chemeleon)
+
+### Chemprop Action Shots!
 
 <table>
   <tr>
     <td>
-      <a href="https://github.com/user-attachments/assets/82ab4eab-0688-4b93-ad8e-9b954564777b">
-        <img width="400" alt="theme_dark" src="https://github.com/user-attachments/assets/82ab4eab-0688-4b93-ad8e-9b954564777b" />
-      </a>
-    </td>
-    <td>
-      <a href="https://github.com/user-attachments/assets/b63a0789-c144-4048-afb6-f03e3d993680">
-        <img width="400" alt="theme_light" src="https://github.com/user-attachments/assets/b63a0789-c144-4048-afb6-f03e3d993680" />
+      <a href="https://github.com/user-attachments/assets/a36c6eff-c464-4c9a-9859-a45cd7e35145">
+        <img width="800" alt="theme_dark" src="https://github.com/user-attachments/assets/a36c6eff-c464-4c9a-9859-a45cd7e35145" />
       </a>
     </td>
   </tr>
   <tr>
     <td>
-      <a href="https://github.com/user-attachments/assets/8a59be19-0c5d-42c6-9922-feafb1a1eecd">
-        <img width="400" alt="theme_quartz" src="https://github.com/user-attachments/assets/8a59be19-0c5d-42c6-9922-feafb1a1eecd" />
-      </a>
-    </td>
-    <td>
-      <a href="https://github.com/user-attachments/assets/5b01ec64-8d56-43bf-96c5-7da8ec48f527">
-        <img width="400" alt="theme_quartz_dark" src="https://github.com/user-attachments/assets/5b01ec64-8d56-43bf-96c5-7da8ec48f527" />
+      <a href="https://github.com/user-attachments/assets/d65ec1da-e04e-44fe-8782-4da0fb50588a">
+        <img width="800" alt="theme_quartz" src="https://github.com/user-attachments/assets/d65ec1da-e04e-44fe-8782-4da0fb50588a" />
       </a>
     </td>
   </tr>
 </table>
 
-All of the Dashboard pages, subpages, and plugins use our new `ThemeManager()` class. See [Workbench Themes](https://supercowpowers.github.io/workbench/themes/), also big thanks to our friends at [Dash Bootstrap Templates](https://github.com/AnnMarieW/dash-bootstrap-templates)
-
 
 
-### Workbench up on the AWS Marketplace
-
-Powered by AWS® to accelerate your Machine Learning Pipelines development with our new [Dashboard for ML Pipelines](https://aws.amazon.com/marketplace/pp/prodview-5idedc7uptbqo). Getting started with Workbench is a snap and can be billed through AWS.
-
-### Coming Soon: `v0.9`
-
-We're getting ready for our `v0.9` release. Here's the road map: [Workbench RoadMaps](https://supercowpowers.github.io/workbench/road_maps/0_9_0/) 
-
 # Welcome to Workbench
 The Workbench framework makes AWS® both easier to use and more powerful. Workbench handles all the details around updating and managing a complex set of AWS Services. With a simple-to-use Python API and a beautiful set of web interfaces, Workbench makes creating AWS ML pipelines a snap. It also dramatically improves both the usability and visibility across the entire spectrum of services: Glue Job, Athena, Feature Store, Models, and Endpoints, Workbench makes it easy to build production ready, AWS powered, machine learning pipelines.
 
@@ -81,6 +79,10 @@ For the full instructions for connecting your AWS Account see:
 - One time AWS Onboarding: [AWS Setup](https://supercowpowers.github.io/workbench/aws_setup/core_stack/)
 
 
+### Workbench up on the AWS Marketplace
+
+Powered by AWS® to accelerate your Machine Learning Pipelines development with our new [Dashboard for ML Pipelines](https://aws.amazon.com/marketplace/pp/prodview-5idedc7uptbqo). Getting started with Workbench is a snap and can be billed through AWS.
+
 ### Workbench Presentations
 Even though Workbench makes AWS easier, it's taking something very complex (the full set of AWS ML Pipelines/Services) and making it less complex. Workbench has a depth and breadth of functionality so we've provided higher level conceptual documentation See: [Workbench Presentations](https://supercowpowers.github.io/workbench/presentations/)
 

{workbench-0.8.218 → workbench-0.8.228}/applications/aws_dashboard/Dockerfile

@@ -7,7 +7,7 @@ EXPOSE 8000
 ENV PYTHONHASHSEED=0
 
 # Define workbench version
-ARG WORKBENCH_VERSION=0.8.208
+ARG WORKBENCH_VERSION=0.8.227
 
 # Install system packages and gunicorn in one layer
 RUN apt-get update && apt-get install -y --no-install-recommends \

{workbench-0.8.218 → workbench-0.8.228}/applications/aws_dashboard/app.py

@@ -1,12 +1,13 @@
 """Workbench Dashboard: A Workbench Web Application for viewing and managing Workbench Artifacts"""
 
-from dash import Dash, html, dcc, page_container
+from dash import Dash, html, dcc, page_container, Input, Output, State, ALL
 import dash_bootstrap_components as dbc
 from dash import page_registry
 
 # Workbench Imports
 from workbench.utils.plugin_manager import PluginManager
 from workbench.utils.theme_manager import ThemeManager
+from workbench.web_interface.components.settings_menu import SettingsMenu
 
 # Set up the logging
 import logging
@@ -37,9 +38,43 @@ app = Dash(
 # Register the CSS route in the ThemeManager
 tm.register_css_route(app)
 
+# Custom index string to sync localStorage theme to cookie on page load
+app.index_string = """
+<!DOCTYPE html>
+<html>
+    <head>
+        {%metas%}
+        <title>{%title%}</title>
+        {%favicon%}
+        {%css%}
+        <script>
+            // Sync localStorage theme to cookie on page load (before Flask renders)
+            (function() {
+                var theme = localStorage.getItem('wb_theme');
+                if (theme) {
+                    document.cookie = 'wb_theme=' + theme + '; path=/; max-age=31536000';
+                }
+            })();
+        </script>
+    </head>
+    <body>
+        {%app_entry%}
+        <footer>
+            {%config%}
+            {%scripts%}
+            {%renderer%}
+        </footer>
+    </body>
+</html>
+"""
+
 # Note: The 'server' object is required for running the app with NGINX/uWSGI
 server = app.server
 
+# Create the settings menu component
+settings_menu = SettingsMenu()
+settings_menu_id = "settings-menu"
+
 # For Multi-Page Applications, we need to create a 'page container' to hold all the pages
 plugin_info_id = "plugin-pages-info"
 app.layout = html.Div(
@@ -47,11 +82,32 @@ app.layout = html.Div(
         # URL for subpage navigation (jumping to feature_sets, models, etc.)
         dcc.Location(id="url", refresh="callback-nav"),
         dcc.Store(id=plugin_info_id, data={}),
+        # Settings menu in top-right corner
+        html.Div(
+            settings_menu.create_component(settings_menu_id),
+            style={"position": "absolute", "top": "25px", "right": "20px", "zIndex": 1000},
+        ),
         dbc.Container([page_container], fluid=True, className="dbc dbc-ag-grid"),
     ],
     **{"data-bs-theme": tm.data_bs_theme()},
 )
 
+# Clientside callback for theme switching (stores in localStorage, sets cookie, reloads page)
+app.clientside_callback(
+    settings_menu.get_clientside_callback_code(settings_menu_id),
+    Output(f"{settings_menu_id}-dummy", "data"),
+    Input({"type": f"{settings_menu_id}-theme-item", "theme": ALL}, "n_clicks"),
+    State({"type": f"{settings_menu_id}-theme-item", "theme": ALL}, "id"),
+)
+
+# Clientside callback to update checkmarks based on localStorage
+app.clientside_callback(
+    settings_menu.get_checkmark_callback_code(),
+    Output({"type": f"{settings_menu_id}-checkmark", "theme": ALL}, "children"),
+    Input(f"{settings_menu_id}-init", "data"),
+    State({"type": f"{settings_menu_id}-checkmark", "theme": ALL}, "id"),
+)
+
 # Spin up the Plugin Manager
 pm = PluginManager()
 

{workbench-0.8.218 → workbench-0.8.228}/applications/aws_dashboard/pages/data_sources/page.py

@@ -21,19 +21,11 @@ register_page(
 
 # Create a table to display the Data Sources
 data_sources_table = AGTable()
-data_sources_component = data_sources_table.create_component(
-    "data_sources_table",
-    header_color="rgb(120, 70, 70)",
-    max_height=270,
-)
+data_sources_component = data_sources_table.create_component("data_sources_table", max_height=270)
 
 # Create a table that sample rows from the currently selected data source
 samples_table = AGTable()
-samples_component = samples_table.create_component(
-    "data_source_sample_rows",
-    header_color="rgb(70, 70, 110)",
-    max_height=250,
-)
+samples_component = samples_table.create_component("data_source_sample_rows", max_height=250)
 
 # Data Source Details Markdown PANEL
 data_details = DataDetails()

{workbench-0.8.218 → workbench-0.8.228}/applications/aws_dashboard/pages/endpoints/page.py

@@ -23,9 +23,7 @@ register_page(
 
 # Create a table to display the endpoints
 endpoints_table = ag_table.AGTable()
-endpoints_component = endpoints_table.create_component(
-    "endpoints_table", header_color="rgb(100, 60, 100)", max_height=270
-)
+endpoints_component = endpoints_table.create_component("endpoints_table", max_height=270)
 
 # Create a Markdown component to display the endpoint details
 endpoint_details = endpoint_details.EndpointDetails()

{workbench-0.8.218 → workbench-0.8.228}/applications/aws_dashboard/pages/feature_sets/page.py

@@ -16,17 +16,11 @@ register_page(__name__, path="/feature_sets", name="Workbench - Feature Sets")
 
 # Create a table to display the Feature Sets
 feature_sets_table = AGTable()
-feature_sets_component = feature_sets_table.create_component(
-    "feature_sets_table", header_color="rgb(60, 100, 60)", max_height=270
-)
+feature_sets_component = feature_sets_table.create_component("feature_sets_table", max_height=270)
 
 # Grab smart_sample rows from the first Feature Set
 samples_table = AGTable()
-samples_component = samples_table.create_component(
-    "feature_set_sample_rows",
-    header_color="rgb(70, 70, 110)",
-    max_height=250,
-)
+samples_component = samples_table.create_component("feature_set_sample_rows", max_height=250)
 
 # Feature Set Details
 feature_details = DataDetails()

{workbench-0.8.218 → workbench-0.8.228}/applications/aws_dashboard/pages/main/page.py

@@ -25,29 +25,13 @@ for table_name in table_names:
 # Create a table container for each Workbench Artifact Type
 table_containers = dict()
 table_name = "data_sources"
-table_containers[table_name] = tables[table_name].create_component(
-    f"main_{table_name}",
-    header_color="rgb(120, 70, 70)",
-    max_height=200,
-)
+table_containers[table_name] = tables[table_name].create_component(f"main_{table_name}", max_height=200)
 table_name = "feature_sets"
-table_containers[table_name] = tables[table_name].create_component(
-    f"main_{table_name}",
-    header_color="rgb(110, 110, 70)",
-    max_height=200,
-)
+table_containers[table_name] = tables[table_name].create_component(f"main_{table_name}", max_height=200)
 table_name = "models"
-table_containers[table_name] = tables[table_name].create_component(
-    f"main_{table_name}",
-    header_color="rgb(60, 100, 60)",
-    max_height=500,
-)
+table_containers[table_name] = tables[table_name].create_component(f"main_{table_name}", max_height=500)
 table_name = "endpoints"
-table_containers[table_name] = tables[table_name].create_component(
-    f"main_{table_name}",
-    header_color="rgb(100, 60, 100)",
-    max_height=500,
-)
+table_containers[table_name] = tables[table_name].create_component(f"main_{table_name}", max_height=500)
 
 # Set up our layout (Dash looks for a var called layout)
 layout = main_layout(**table_containers)

workbench-0.8.228/applications/aws_dashboard/pages/models/callbacks.py

@@ -0,0 +1,152 @@
+"""Callbacks for the Model Subpage Web User Interface"""
+
+import logging
+from dash import callback, no_update, Input, Output, State
+from dash.exceptions import PreventUpdate
+from urllib.parse import urlparse, parse_qs
+
+# Workbench Imports
+from workbench.api import ModelType
+from workbench.web_interface.page_views.models_page_view import ModelsPageView
+from workbench.web_interface.components.plugins.ag_table import AGTable
+from workbench.web_interface.components.plugins.scatter_plot import ScatterPlot
+from workbench.web_interface.components.plugins.confusion_matrix import ConfusionMatrix
+from workbench.cached.cached_model import CachedModel
+
+# Get the Workbench logger
+log = logging.getLogger("workbench")
+
+
+def on_page_load():
+    @callback(
+        Output("models_table", "selectedRows"),
+        Output("models_page_loaded", "data"),
+        Input("url", "href"),
+        Input("models_table", "rowData"),
+        State("models_page_loaded", "data"),
+        prevent_initial_call=True,
+    )
+    def _on_page_load(href, row_data, page_already_loaded):
+        if page_already_loaded:
+            raise PreventUpdate
+
+        if not href or not row_data:
+            raise PreventUpdate
+
+        parsed = urlparse(href)
+        if parsed.path != "/models":
+            raise PreventUpdate
+
+        selected_name = parse_qs(parsed.query).get("name", [None])[0]
+        if not selected_name:
+            return [row_data[0]], True
+
+        for row in row_data:
+            if row.get("name") == selected_name:
+                return [row], True
+
+        raise PreventUpdate
+
+
+def model_table_refresh(page_view: ModelsPageView, table: AGTable):
+    @callback(
+        [Output(component_id, prop) for component_id, prop in table.properties],
+        Input("models_refresh", "n_intervals"),
+    )
+    def _model_table_refresh(_n):
+        """Return the table data for the Models Table"""
+        page_view.refresh()
+        models = page_view.models()
+        models["name"] = models["Model Group"]
+        models["id"] = range(len(models))
+        return table.update_properties(models)
+
+
+def setup_plugin_callbacks(plugins, scatter_plot_plugin: ScatterPlot, confusion_matrix_plugin: ConfusionMatrix):
+    """Set up callbacks for all plugins including model-type-aware visualization switching.
+
+    Args:
+        plugins: List of all plugins (model_details, shap_plot, scatter_plot, confusion_matrix)
+        scatter_plot_plugin: The ScatterPlot plugin instance (for regression models)
+        confusion_matrix_plugin: The ConfusionMatrix plugin instance (for classification models)
+    """
+
+    # Register internal callbacks for all plugins
+    for plugin in plugins:
+        plugin.register_internal_callbacks()
+
+    # Separate plugins by type - ScatterPlot and ConfusionMatrix need special handling
+    standard_plugins = [p for p in plugins if p not in [scatter_plot_plugin, confusion_matrix_plugin]]
+
+    # Callback to update standard plugins (model_details, shap_plot)
+    @callback(
+        [Output(component_id, prop) for p in standard_plugins for component_id, prop in p.properties],
+        State("model_details-dropdown", "value"),
+        Input("models_table", "selectedRows"),
+    )
+    def update_standard_plugin_properties(inference_run, selected_rows):
+        """Update properties for standard plugins that take a Model object."""
+        if not selected_rows or selected_rows[0] is None:
+            raise PreventUpdate
+
+        model_name = selected_rows[0]["name"]
+        model = CachedModel(model_name)
+
+        all_props = []
+        for p in standard_plugins:
+            all_props.extend(p.update_properties(model, inference_run=inference_run))
+
+        return all_props
+
+    # Build outputs list for the model plot callback
+    model_plot_outputs = [
+        Output("scatter-plot-container", "style"),
+        Output("confusion-matrix-container", "style"),
+    ]
+    model_plot_outputs.extend([Output(cid, prop) for cid, prop in scatter_plot_plugin.properties])
+    model_plot_outputs.extend([Output(cid, prop) for cid, prop in confusion_matrix_plugin.properties])
+
+    # Callback to toggle visibility and update ScatterPlot/ConfusionMatrix based on model type
+    @callback(
+        model_plot_outputs,
+        Input("model_details-dropdown", "value"),
+        Input("models_table", "selectedRows"),
+    )
+    def update_model_plot_plugins(inference_run, selected_rows):
+        """Update ScatterPlot or ConfusionMatrix based on model type, toggling visibility."""
+        if not selected_rows or selected_rows[0] is None:
+            raise PreventUpdate
+
+        model_name = selected_rows[0]["name"]
+        model = CachedModel(model_name)
+
+        # Determine visibility based on model type
+        is_classifier = model.model_type == ModelType.CLASSIFIER
+        scatter_style = {"display": "none"} if is_classifier else {"display": "block"}
+        confusion_style = {"display": "block"} if is_classifier else {"display": "none"}
+
+        if is_classifier:
+            # Update ConfusionMatrix, return no_update for ScatterPlot
+            cm_props = confusion_matrix_plugin.update_properties(model, inference_run=inference_run)
+            scatter_props = [no_update] * len(scatter_plot_plugin.properties)
+        else:
+            # Update ScatterPlot with regression data
+            df = model.get_inference_predictions(inference_run)
+            if df is None:
+                raise PreventUpdate
+
+            # Get target column (residual is already computed in CachedModel)
+            target = model.target()
+            if isinstance(target, list):
+                target = next((t for t in target if t in inference_run), target[0])
+
+            scatter_props = scatter_plot_plugin.update_properties(
+                df,
+                x=target,
+                y="prediction",
+                color="confidence",
+                regression_line=True,
+            )
+            cm_props = [no_update] * len(confusion_matrix_plugin.properties)
+
+        return [scatter_style, confusion_style] + scatter_props + cm_props

{workbench-0.8.218 → workbench-0.8.228}/applications/aws_dashboard/pages/models/layout.py

@@ -18,8 +18,8 @@ project_name = tm.branding().get("project_name", "Workbench")
 def models_layout(
     models_table: AGTable,
     model_details: html.Div,
-    model_plot: dcc.Graph,
-    shap_plot: dcc.Graph,
+    model_plot: html.Div,
+    shap_plot: html.Div,
 ) -> html.Div:
     layout = html.Div(
         children=[
@@ -37,8 +37,8 @@ def models_layout(
                 [
                     # Column 1: Model Details
                     dbc.Col(
-                        dcc.Loading(model_details, type="dot", color="#33aa33", delay_show=300),
-                        width=5,
+                        dcc.Loading(model_details, type="dot", color="#33aa33", delay_show=1000),
+                        width=4,
                         className="text-break workbench-container",
                         style={"margin": "20px 0px 0px 0px", "padding": "20px"},
                     ),
@@ -46,7 +46,11 @@ def models_layout(
                     dbc.Col(
                         [
                             dbc.Row(
-                                dcc.Loading(model_plot, type="graph", delay_show=500, style={"height": "400px"}),
+                                dcc.Loading(
+                                    model_plot,
+                                    type="graph",
+                                    delay_show=500,
+                                ),
                                 className="workbench-container",
                                 style={"margin": "20px 0px 10px 20px"},
                             ),
@@ -56,7 +60,7 @@ def models_layout(
                                 style={"margin": "20px 0px 10px 20px"},
                             ),
                         ],
-                        width=7,
+                        width=8,
                         style={"padding": "0px"},
                     ),
                 ],