postgresml · montanalow · Jun 30, 2023 · Jun 30, 2023
diff --git a/.github/workflows/package-extension.yml b/.github/workflows/package-extension.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       packageVersion:
-        default: "2.6.0"
+        default: "2.7.0"
 
 jobs:
   build:

diff --git a/pgml-dashboard/Cargo.lock b/pgml-dashboard/Cargo.lock
diff --git a/pgml-dashboard/Cargo.toml b/pgml-dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgml-dashboard"
-version = "2.6.0"
+version = "2.7.0"
 edition = "2021"
 authors = ["PostgresML <team@postgresml.org>"]
 license = "MIT"

diff --git a/pgml-dashboard/content/docs/guides/setup/developers.md b/pgml-dashboard/content/docs/guides/setup/developers.md
@@ -127,7 +127,7 @@ SELECT pgml.version();
 postgres=# select pgml.version();
       version
 -------------------
- 2.6.0
+ 2.7.0
 (1 row)
 ```
 

diff --git a/pgml-dashboard/content/docs/guides/setup/v2/installation.md b/pgml-dashboard/content/docs/guides/setup/v2/installation.md
@@ -217,7 +217,7 @@ SELECT pgml.version();
 postgres=# select pgml.version();
       version
 -------------------
- 2.6.0
+ 2.7.0
 (1 row)
 ```
 

diff --git a/pgml-dashboard/content/docs/guides/training/algorithm_selection.md b/pgml-dashboard/content/docs/guides/training/algorithm_selection.md
@@ -2,7 +2,7 @@
 
 We currently support regression and classification algorithms from [scikit-learn](https://scikit-learn.org/), [XGBoost](https://xgboost.readthedocs.io/), and [LightGBM](https://lightgbm.readthedocs.io/).
 
-## Algorithms
+## Supervised Algorithms
 
 ### Gradient Boosting
 Algorithm | Regression | Classification
@@ -54,6 +54,18 @@ Algorithm | Regression | Classification
 `kernel_ridge` | [KernelRidge](https://scikit-learn.org/stable/modules/generated/sklearn.kernel_ridge.KernelRidge.html) | -
 `gaussian_process` | [GaussianProcessRegressor](https://scikit-learn.org/stable/modules/generated/sklearn.gaussian_process.GaussianProcessRegressor.html) | [GaussianProcessClassifier](https://scikit-learn.org/stable/modules/generated/sklearn.gaussian_process.GaussianProcessClassifier.html)
 
+## Unsupervised Algorithms
+
+### Clustering
+
+|Algorithm | Reference                                                                                                         | 
+|---|-------------------------------------------------------------------------------------------------------------------|
+`affinity_propagation` | [AffinityPropagation](https://scikit-learn.org/stable/modules/generated/sklearn.cluster.AffinityPropagation.html) 
+`birch` | [Birch](https://scikit-learn.org/stable/modules/generated/sklearn.cluster.Birch.html)
+`kmeans` | [K-Means](https://scikit-learn.org/stable/modules/generated/sklearn.cluster.KMeans.html)
+`mini_batch_kmeans` | [MiniBatchKMeans](https://scikit-learn.org/stable/modules/generated/sklearn.cluster.MiniBatchKMeans.html)
+
+
 ## Comparing Algorithms
 
 Any of the above algorithms can be passed to our `pgml.train()` function using the `algorithm` parameter. If the parameter is omitted, linear regression is used by default.

diff --git a/pgml-dashboard/src/models.rs b/pgml-dashboard/src/models.rs
@@ -57,6 +57,7 @@ impl Project {
             "summarization" => Ok("rouge_ngram_f1"),
             "translation" => Ok("bleu"),
             "text_generation" | "text2text" => Ok("perplexity"),
+            "cluster" => Ok("silhouette"),
             task => Err(anyhow::anyhow!("Unhandled task: {}", task)),
         }
     }
@@ -68,6 +69,7 @@ impl Project {
             "summarization" => Ok("Rouge Ngram F<sup>1</sup>"),
             "translation" => Ok("Bleu"),
             "text_generation" | "text2text" => Ok("Perplexity"),
+            "cluster" => Ok("silhouette"),
             task => Err(anyhow::anyhow!("Unhandled task: {}", task)),
         }
     }
@@ -544,7 +546,7 @@ impl Model {
 pub struct Snapshot {
     pub id: i64,
     pub relation_name: String,
-    pub y_column_name: Vec<String>,
+    pub y_column_name: Option<Vec<String>>,
     pub test_size: f32,
     pub test_sampling: Option<String>,
     pub status: String,
@@ -686,28 +688,42 @@ impl Snapshot {
         }
     }
 
-    pub fn features<'a>(&'a self) -> Option<Vec<&'a serde_json::Map<String, serde_json::Value>>> {
+    pub fn features(&self) -> Option<Vec<&serde_json::Map<String, serde_json::Value>>> {
         match self.columns() {
-            Some(columns) => Some(
-                columns
-                    .into_iter()
-                    .filter(|column| {
-                        !self
-                            .y_column_name
-                            .contains(&column["name"].as_str().unwrap().to_string())
-                    })
-                    .collect(),
-            ),
+            Some(columns) => {
+                if self.y_column_name.is_none() {
+                    return Some(columns.into_iter().collect());
+                }
+
+                Some(
+                    columns
+                        .into_iter()
+                        .filter(|column| {
+                            !self
+                                .y_column_name
+                                .as_ref()
+                                .unwrap()
+                                .contains(&column["name"].as_str().unwrap().to_string())
+                        })
+                        .collect(),
+                )
+            }
             None => None,
         }
     }
 
-    pub fn labels<'a>(&'a self) -> Option<Vec<&'a serde_json::Map<String, serde_json::Value>>> {
+    pub fn labels(&self) -> Option<Vec<&serde_json::Map<String, serde_json::Value>>> {
+        if self.y_column_name.is_none() {
+            return Some(Vec::new());
+        }
+
         self.columns().map(|columns| {
             columns
                 .into_iter()
                 .filter(|column| {
                     self.y_column_name
+                        .as_ref()
+                        .unwrap()
                         .contains(&column["name"].as_str().unwrap().to_string())
                 })
                 .collect()

diff --git a/pgml-dashboard/templates/content/dashboard/panels/snapshot.html b/pgml-dashboard/templates/content/dashboard/panels/snapshot.html
@@ -73,9 +73,11 @@ <h2><span class="material-symbols-outlined">bubble_chart</span>Features</h2>
     %>
       <h3><%= name %>&nbsp;<code><%= feature["pg_type"].as_str().unwrap() | upper %></code></h3>
       <figure id="<%= name_machine %>_distribution"></figure>
-      <% for y_column_name in snapshot.y_column_name.iter() { %>
+      <% if snapshot.y_column_name.as_ref().is_some() { %>
+      <% for y_column_name in snapshot.y_column_name.as_ref().unwrap().iter() { %>
       <figure id="<%= name_machine %>_correlation_<%= y_column_name %>"></figure>
       <% } %>
+      <% } %>
     <% } %>
   </section>
 
@@ -102,11 +104,13 @@ <h3><%= name %>&nbsp;<code><%= feature["pg_type"].as_str().unwrap() | upper %></
       renderModel(<%= model.id %>, <%= model.key_metric(project).unwrap() %>, [0, 1]);
     <% } %>
 
-    <% for y_column_name in snapshot.y_column_name.iter() { %>
+    <% if snapshot.y_column_name.as_ref().is_some() { %>
+    <% for y_column_name in snapshot.y_column_name.as_ref().unwrap().iter() { %>
       setTimeout(renderDistribution, delay, "<%= y_column_name %>", <%= y_column_name %>_samples, NaN);
       setTimeout(renderOutliers, delay, "<%= y_column_name %>", <%= y_column_name %>_samples, <%= snapshot.target_stddev(y_column_name) %>)
     <% } %>
-
+    <% } %>
+
       var delay = 600;
 
     <% for feature in snapshot.features().unwrap().iter() {
@@ -116,9 +120,11 @@ <h3><%= name %>&nbsp;<code><%= feature["pg_type"].as_str().unwrap() | upper %></
       delay += 200;
 
       setTimeout(renderDistribution, delay, "<%= name_machine %>", <%= name_machine %>_samples, NaN);
-      <% for y_column_name in snapshot.y_column_name.iter() { %>
+      <% if snapshot.y_column_name.as_ref().is_some() { %>
+      <% for y_column_name in snapshot.y_column_name.as_ref().unwrap().iter() { %>
       setTimeout(renderCorrelation, delay, "<%= name_machine %>", "<%= y_column_name %>", <%= name_machine %>_samples, <%= y_column_name %>_samples);
       <% } %>
+      <% } %>
     <% } %>
     }
     renderCharts();
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,7 +127,7 @@ SELECT pgml.version(); @@
     postgres=# select pgml.version();
           version
     -------------------
-.6.0
+.7.0
     (1 row)
     ```
@@ Expand Down @@