Skip to content

collection.register_model() now returns the created or found model id #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2023
Merged

collection.register_model() now returns the created or found model id #759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions pgml-sdks/rust/pgml/src/collection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ impl Collection {
task: Option<String>,
model_name: Option<String>,
model_params: Option<HashMap<String, String>>,
) -> anyhow::Result<()> {
) -> anyhow::Result<i64> {
let task = task.unwrap_or("embedding".to_string());
let model_name = model_name.unwrap_or("intfloat/e5-small".to_string());
let model_params = match model_params {
Expand All @@ -507,27 +507,30 @@ impl Collection {
);

match current_model {
Some(_model) => {
Some(model) => {
warn!(
"Model with name: {} and parameters: {:?} already exists",
model_name, model_params
);
Ok(model.id)
}
None => {
let id;
transaction_wrapper!(
sqlx::query(&query_builder!(
"INSERT INTO %s (task, name, parameters) VALUES ($1, $2, $3)",
id,
sqlx::query_as::<_, (i64,)>(&query_builder!(
"INSERT INTO %s (task, name, parameters) VALUES ($1, $2, $3) RETURNING id",
self.models_table_name
))
.bind(task)
.bind(model_name)
.bind(model_params),
self.pool.borrow()
self.pool.borrow(),
fetch_one
);
Ok(id.0)
}
}

Ok(())
}

/// Gets all registered [models::Model]s
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy