deploy specific models

montanalow · montanalow · commit fa70526a3d15 · 2024-01-02T22:47:18.000-08:00
diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       packageVersion:
-        default: "2.8.1"
+        default: "2.8.2"
 jobs:
   #
   # PostgresML extension.
diff --git a/.github/workflows/ubuntu-postgresml-python-package.yaml b/.github/workflows/ubuntu-postgresml-python-package.yaml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       packageVersion:
-        default: "2.8.1"
+        default: "2.8.2"
 
 jobs:
   postgresml-python:
diff --git a/pgml-extension/Cargo.lock b/pgml-extension/Cargo.lock
diff --git a/pgml-extension/Cargo.toml b/pgml-extension/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgml"
-version = "2.8.1"
+version = "2.8.2"
 edition = "2021"
 
 [lib]
diff --git a/pgml-extension/sql/pgml--2.8.1--2.8.2.sql b/pgml-extension/sql/pgml--2.8.1--2.8.2.sql
@@ -0,0 +1,27 @@
+-- src/api.rs:317
+-- pgml::api::deploy
+DROP FUNCTION IF EXISTS pgml."deploy"(BIGINT);
+CREATE  FUNCTION pgml."deploy"(
+    "model_id" BIGINT /* i64 */
+) RETURNS TABLE (
+                    "project" TEXT,  /* alloc::string::String */
+                    "strategy" TEXT,  /* alloc::string::String */
+                    "algorithm" TEXT  /* alloc::string::String */
+                )
+    LANGUAGE c /* Rust */
+AS 'MODULE_PATHNAME', 'deploy_model_wrapper';
+
+DROP FUNCTION IF EXISTS pgml."deploy"(text, pgml.Strategy, pgml.Algorithm);
+CREATE  FUNCTION pgml."deploy"(
+    "project_name" TEXT, /* &str */
+    "strategy" pgml.Strategy, /* pgml::orm::strategy::Strategy */
+    "algorithm" pgml.Algorithm DEFAULT NULL /* core::option::Option<pgml::orm::algorithm::Algorithm> */
+) RETURNS TABLE (
+                    "project" TEXT,  /* alloc::string::String */
+                    "strategy" TEXT,  /* alloc::string::String */
+                    "algorithm" TEXT  /* alloc::string::String */
+                )
+    LANGUAGE c /* Rust */
+AS 'MODULE_PATHNAME', 'deploy_strategy_wrapper';
+
+ALTER TYPE pgml.strategy ADD VALUE 'specific';
diff --git a/pgml-extension/src/api.rs b/pgml-extension/src/api.rs
@@ -287,7 +287,7 @@ fn train_joint(
     };
 
     if deploy {
-        project.deploy(model.id);
+        project.deploy(model.id, Strategy::new_score);
     } else {
         warning!("Not deploying newly trained model.");
     }
@@ -300,8 +300,40 @@ fn train_joint(
     )])
 }
 
-#[pg_extern]
-fn deploy(
+#[pg_extern(name = "deploy")]
+fn deploy_model(
+    model_id: i64
+) -> TableIterator<
+    'static,
+    (
+        name!(project, String),
+        name!(strategy, String),
+        name!(algorithm, String),
+    ),
+> {
+    let model = unwrap_or_error!(Model::find_cached(model_id));
+
+    let project_id = Spi::get_one_with_args::<i64>(
+        "SELECT projects.id from pgml.projects JOIN pgml.models ON models.project_id = projects.id WHERE models.id = $1",
+        vec![(PgBuiltInOids::INT8OID.oid(), model_id.into_datum())],
+    )
+        .unwrap();
+
+    let project_id =
+        project_id.unwrap_or_else(|| error!("Project does not exist."));
+
+    let project = Project::find(project_id).unwrap();
+    project.deploy(model_id, Strategy::specific);
+
+    TableIterator::new(vec![(
+        project.name,
+        Strategy::specific.to_string(),
+        model.algorithm.to_string(),
+    )])
+}
+
+#[pg_extern(name = "deploy")]
+fn deploy_strategy(
     project_name: &str,
     strategy: Strategy,
     algorithm: default!(Option<Algorithm>, "NULL"),
@@ -378,7 +410,7 @@ fn deploy(
     let algorithm = algorithm.expect("No qualified models exist for this deployment.");
 
     let project = Project::find(project_id).unwrap();
-    project.deploy(model_id);
+    project.deploy(model_id, strategy);
 
     TableIterator::new(vec![(
         project_name.to_string(),
@@ -922,7 +954,7 @@ fn tune(
     };
 
     if deploy {
-        project.deploy(model.id);
+        project.deploy(model.id, Strategy::new_score);
     }
 
     TableIterator::new(vec![(
diff --git a/pgml-extension/src/orm/project.rs b/pgml-extension/src/orm/project.rs
@@ -89,14 +89,14 @@ impl Project {
             .unwrap()
     }
 
-    pub fn deploy(&self, model_id: i64) {
+    pub fn deploy(&self, model_id: i64, strategy: Strategy) {
         info!("Deploying model id: {:?}", model_id);
         Spi::get_one_with_args::<i64>(
             "INSERT INTO pgml.deployments (project_id, model_id, strategy) VALUES ($1, $2, $3::pgml.strategy) RETURNING id",
             vec![
                 (PgBuiltInOids::INT8OID.oid(), self.id.into_datum()),
                 (PgBuiltInOids::INT8OID.oid(), model_id.into_datum()),
-                (PgBuiltInOids::TEXTOID.oid(), Strategy::most_recent.to_string().into_datum()),
+                (PgBuiltInOids::TEXTOID.oid(), strategy.to_string().into_datum()),
             ],
         ).unwrap();
         let mut projects = PROJECT_ID_TO_DEPLOYED_MODEL_ID.exclusive();
diff --git a/pgml-extension/src/orm/strategy.rs b/pgml-extension/src/orm/strategy.rs
@@ -8,6 +8,7 @@ pub enum Strategy {
     best_score,
     most_recent,
     rollback,
+    specific,
 }
 
 impl std::str::FromStr for Strategy {
@@ -19,6 +20,7 @@ impl std::str::FromStr for Strategy {
             "best_score" => Ok(Strategy::best_score),
             "most_recent" => Ok(Strategy::most_recent),
             "rollback" => Ok(Strategy::rollback),
+            "specific" => Ok(Strategy::rollback),
             _ => Err(()),
         }
     }
@@ -31,6 +33,7 @@ impl std::string::ToString for Strategy {
             Strategy::best_score => "best_score".to_string(),
             Strategy::most_recent => "most_recent".to_string(),
             Strategy::rollback => "rollback".to_string(),
+            Strategy::specific => "specific".to_string(),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ on:`
`4`	`4`	`workflow_dispatch:`
`5`	`5`	`inputs:`
`6`	`6`	`packageVersion:`
`7`		`- default: "2.8.1"`
	`7`	`+ default: "2.8.2"`
`8`	`8`	`jobs:`
`9`	`9`	`#`
`10`	`10`	`# PostgresML extension.`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ pub enum Strategy {`
`8`	`8`	`best_score,`
`9`	`9`	`most_recent,`
`10`	`10`	`rollback,`
	`11`	`+ specific,`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`impl std::str::FromStr for Strategy {`
`@@ -19,6 +20,7 @@ impl std::str::FromStr for Strategy {`
`19`	`20`	`"best_score" => Ok(Strategy::best_score),`
`20`	`21`	`"most_recent" => Ok(Strategy::most_recent),`
`21`	`22`	`"rollback" => Ok(Strategy::rollback),`
	`23`	`+ "specific" => Ok(Strategy::rollback),`
`22`	`24`	`_ => Err(()),`
`23`	`25`	`}`
`24`	`26`	`}`
`@@ -31,6 +33,7 @@ impl std::string::ToString for Strategy {`
`31`	`33`	`Strategy::best_score => "best_score".to_string(),`
`32`	`34`	`Strategy::most_recent => "most_recent".to_string(),`
`33`	`35`	`Strategy::rollback => "rollback".to_string(),`
	`36`	`+ Strategy::specific => "specific".to_string(),`
`34`	`37`	`}`
`35`	`38`	`}`
`36`	`39`	`}`