workbench 0.8.162__py3-none-any.whl → 0.8.220__py3-none-any.whl

workbench/web_interface/components/plugins/model_details.py

@@ -41,12 +41,10 @@ class ModelDetails(PluginInterface):
             id=self.component_id,
             children=[
                 html.H4(id=f"{self.component_id}-header", children="Model: Loading..."),
-                dcc.Markdown(id=f"{self.component_id}-summary"),
+                dcc.Markdown(id=f"{self.component_id}-summary", dangerously_allow_html=True),
                 html.H5(children="Inference Metrics", style={"marginTop": "20px"}),
                 dcc.Dropdown(id=f"{self.component_id}-dropdown", className="dropdown"),
                 dcc.Markdown(id=f"{self.component_id}-metrics"),
-                html.H5(children="Cross Fold Metrics", style={"marginTop": "20px"}),
-                dcc.Markdown(id=f"{self.component_id}-cross-metrics", dangerously_allow_html=True),
             ],
         )
 
@@ -57,7 +55,6 @@ class ModelDetails(PluginInterface):
             (f"{self.component_id}-dropdown", "options"),
             (f"{self.component_id}-dropdown", "value"),
             (f"{self.component_id}-metrics", "children"),
-            (f"{self.component_id}-cross-metrics", "children"),
         ]
         self.signals = [(f"{self.component_id}-dropdown", "value")]
 
@@ -84,10 +81,9 @@ class ModelDetails(PluginInterface):
         # Populate the inference runs dropdown
         inference_runs, default_run = self.get_inference_runs()
         metrics = self.inference_metrics(default_run)
-        cross_metrics = self.cross_metrics()
 
         # Return the updated property values for the plugin
-        return [header, details, inference_runs, default_run, metrics, cross_metrics]
+        return [header, details, inference_runs, default_run, metrics]
 
     def register_internal_callbacks(self):
         @callback(
@@ -110,63 +106,37 @@ class ModelDetails(PluginInterface):
         Returns:
             str: A markdown string
         """
-
-        # Get these fields from the model
-        show_fields = [
-            "health_tags",
-            "input",
-            "workbench_registered_endpoints",
-            "workbench_model_type",
-            "workbench_model_target",
-            "workbench_model_features",
-            "param_meta",
-            "workbench_tags",
-        ]
-
-        # Construct the markdown string
         summary = self.current_model.summary()
         markdown = ""
-        for key in show_fields:
-
-            # Special case for the health tags
-            if key == "health_tags":
-                markdown += health_tag_markdown(summary.get(key, []))
-                continue
-
-            # Special case for the features
-            if key == "workbench_model_features":
-                value = summary.get(key, [])
-                key = "features"
-                value = f"({len(value)}) {', '.join(value)[:100]}..."
-                markdown += f"**{key}:** {value}  \n"
-                continue
-
-            # Special case for Parameter Store Metadata
-            if key == "param_meta":
-                model_name = summary["name"]
-                meta_data = self.params.get(f"/workbench/models/{model_name}/meta", warn=False)
-                if meta_data:
-                    markdown += dict_to_markdown(meta_data, title="Additional Metadata")
-                continue
-
-            # Special case for tags
-            if key == "workbench_tags":
-                tags = summary.get(key, "")
-                markdown += tags_to_markdown(tags)
-                continue
-
-            # Get the value
-            value = summary.get(key, "-")
-
-            # If the value is a list, convert it to a comma-separated string
-            if isinstance(value, list):
-                value = ", ".join(value)
-
-            # Chop off the "workbench_" prefix
-            key = key.replace("workbench_", "")
-
-            # Add to markdown string
-            markdown += f"**{key}:** {value}  \n"
+
+        # Health tags
+        markdown += health_tag_markdown(summary.get("health_tags", []))
+
+        # Simple fields
+        markdown += f"**input:** {summary.get('input', '-')}  \n"
+        endpoints = ", ".join(summary.get("workbench_registered_endpoints", []))
+        markdown += f"**registered_endpoints:** {endpoints or '-'}  \n"
+        markdown += f"**model_type:** {summary.get('workbench_model_type', '-')}  \n"
+        markdown += f"**model_target:** {summary.get('workbench_model_target', '-')}  \n"
+
+        # Features (truncated)
+        features = summary.get("workbench_model_features", [])
+        features_str = f"({len(features)}) {', '.join(features)[:100]}..."
+        markdown += f"**features:** {features_str}  \n"
+
+        # Parameter Store metadata
+        model_name = summary["name"]
+        meta_data = self.params.get(f"/workbench/models/{model_name}/meta", warn=False)
+        if meta_data:
+            markdown += dict_to_markdown(meta_data, title="Additional Metadata")
+
+        # Tags
+        markdown += tags_to_markdown(summary.get("workbench_tags", "")) + "  \n"
+
+        # Hyperparameters
+        hyperparams = summary.get("hyperparameters")
+        if hyperparams and isinstance(hyperparams, dict):
+            markdown += dict_to_collapsible_html(hyperparams, title="Hyperparameters", collapse_all=True)
 
         return markdown
 
@@ -223,17 +193,6 @@ class ModelDetails(PluginInterface):
             markdown += dict_to_markdown(inference_data, title="Additional Inference Metrics")
         return markdown
 
-    def cross_metrics(self) -> str:
-        # Get cross fold metrics if they exist
-        model_name = self.current_model.name
-        cross_fold_data = self.params.get(f"/workbench/models/{model_name}/inference/cross_fold", warn=False)
-        if not cross_fold_data:
-            return "**No Cross Fold Data**"
-
-        # Convert the cross fold data to a markdown string
-        html = dict_to_collapsible_html(cross_fold_data)
-        return html
-
     def get_inference_runs(self):
         """Get the inference runs for the model
 
@@ -249,8 +208,13 @@ class ModelDetails(PluginInterface):
         if not inference_runs:
             return [], None
 
-        # Set "auto_inference" as the default, if that doesn't exist, set the first
-        default_inference_run = "auto_inference" if "auto_inference" in inference_runs else inference_runs[0]
+        # Default inference run (full_cross_fold if it exists, then auto_inference, then first)
+        if "full_cross_fold" in inference_runs:
+            default_inference_run = "full_cross_fold"
+        elif "auto_inference" in inference_runs:
+            default_inference_run = "auto_inference"
+        else:
+            default_inference_run = inference_runs[0]
 
         # Return the options for the dropdown and the selected value
         return inference_runs, default_inference_run

workbench/web_interface/components/plugins/scatter_plot.py

@@ -159,7 +159,7 @@ class ScatterPlot(PluginInterface):
         self.df = self.df.drop(columns=aws_cols, errors="ignore")
 
         # Set hover columns and custom data
-        self.hover_columns = kwargs.get("hover_columns", self.df.columns.tolist()[:10])
+        self.hover_columns = kwargs.get("hover_columns", sorted(self.df.columns.tolist()[:15]))
         self.suppress_hover_display = kwargs.get("suppress_hover_display", False)
         self.custom_data = kwargs.get("custom_data", [])
 
@@ -420,22 +420,18 @@ if __name__ == "__main__":
     df = pd.DataFrame(data)
 
     # Get a UQ regressor model
-    # from workbench.api import Endpoint, DFStore
-    # end = Endpoint("aqsol-uq")
-    # df = end.auto_inference()
-    # DFStore().upsert("/workbench/models/aqsol-uq/auto_inference", df)
+    from workbench.api import Model
 
-    from workbench.api import DFStore
-
-    df = DFStore().get("/workbench/models/aqsol-uq/auto_inference")
+    model = Model("logd-reg-xgb")
+    df = model.get_inference_predictions("full_cross_fold")
 
     # Run the Unit Test on the Plugin
     PluginUnitTest(
         ScatterPlot,
         input_data=df,
         theme="midnight_blue",
-        x="solubility",
+        x="logd",
         y="prediction",
-        color="residuals_abs",
+        color="prediction_std",
         suppress_hover_display=True,
     ).run()

{workbench-0.8.162.dist-info → workbench-0.8.220.dist-info}/METADATA

@@ -1,15 +1,37 @@
 Metadata-Version: 2.4
 Name: workbench
-Version: 0.8.162
+Version: 0.8.220
 Summary: Workbench: A Dashboard and Python API for creating and deploying AWS SageMaker Model Pipelines
 Author-email: SuperCowPowers LLC <support@supercowpowers.com>
-License-Expression: MIT
+License: MIT License
+        
+        Copyright (c) 2021-2026 SuperCowPowers LLC
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
 Project-URL: Homepage, https://github.com/SuperCowPowers/workbench
 Keywords: SageMaker,Machine Learning,AWS,Python,Utilities
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -20,20 +42,21 @@ Requires-Dist: redis>=5.0.1
 Requires-Dist: numpy>=1.26.4
 Requires-Dist: pandas>=2.2.1
 Requires-Dist: awswrangler>=3.4.0
-Requires-Dist: sagemaker>=2.143
+Requires-Dist: sagemaker<3.0,>=2.143
 Requires-Dist: cryptography>=44.0.2
-Requires-Dist: ipython>=9.0.0
+Requires-Dist: ipython>=8.37.0
 Requires-Dist: pyreadline3; sys_platform == "win32"
 Requires-Dist: scikit-learn>=1.5.2
+Requires-Dist: umap-learn>=0.5.8
 Requires-Dist: xgboost>=3.0.3
 Requires-Dist: joblib>=1.3.2
 Requires-Dist: requests>=2.26.0
 Requires-Dist: rdkit>=2024.9.5
 Requires-Dist: mordredcommunity>=2.0.6
-Requires-Dist: workbench-bridges>=0.1.8
+Requires-Dist: workbench-bridges>=0.1.16
 Provides-Extra: ui
 Requires-Dist: plotly>=6.0.0; extra == "ui"
-Requires-Dist: dash>3.0.0; extra == "ui"
+Requires-Dist: dash>=3.0.0; extra == "ui"
 Requires-Dist: dash-bootstrap-components>=1.6.0; extra == "ui"
 Requires-Dist: dash-bootstrap-templates>=1.3.0; extra == "ui"
 Requires-Dist: dash_ag_grid; extra == "ui"
@@ -48,8 +71,8 @@ Requires-Dist: flake8; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Provides-Extra: all
 Requires-Dist: networkx>=3.2; extra == "all"
-Requires-Dist: plotly>=5.18.0; extra == "all"
-Requires-Dist: dash<3.0.0,>=2.16.1; 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"
@@ -168,7 +191,6 @@ Using Workbench will minimize the time and manpower needed to incorporate AWS ML
 
 ```
 pip install workbench             # Installs Workbench with Core Dependencies
-pip install 'workbench[ml-tools]' # + Shap and NetworkX
 pip install 'workbench[ui]'       # + Plotly/Dash
 pip install 'workbench[dev]'      # + Pytest/flake8/black
 pip install 'workbench[all]'      # + All the things :)