Skip to content

Move task verification out of internal binding #1368

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
Mar 13, 2024
Merged

Move task verification out of internal binding #1368

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions pgml-extension/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,10 @@ pub fn transform_json(
inputs: default!(Vec<&str>, "ARRAY[]::TEXT[]"),
cache: default!(bool, false),
) -> JsonB {
if let Err(err) = crate::bindings::transformers::whitelist::verify_task(&task.0) {
error!("{err}");
}

match crate::bindings::transformers::transform(&task.0, &args.0, inputs) {
Ok(output) => JsonB(output),
Err(e) => error!("{e}"),
Expand All @@ -663,6 +667,9 @@ pub fn transform_string(
cache: default!(bool, false),
) -> JsonB {
let task_json = json!({ "task": task });
if let Err(err) = crate::bindings::transformers::whitelist::verify_task(&task_json) {
error!("{err}");
}
match crate::bindings::transformers::transform(&task_json, &args.0, inputs) {
Ok(output) => JsonB(output),
Err(e) => error!("{e}"),
Expand All @@ -681,6 +688,9 @@ pub fn transform_conversational_json(
if !task.0["task"].as_str().is_some_and(|v| v == "conversational") {
error!("ARRAY[]::JSONB inputs for transform should only be used with a conversational task");
}
if let Err(err) = crate::bindings::transformers::whitelist::verify_task(&task.0) {
error!("{err}");
}
match crate::bindings::transformers::transform(&task.0, &args.0, inputs) {
Ok(output) => JsonB(output),
Err(e) => error!("{e}"),
Expand All @@ -700,6 +710,9 @@ pub fn transform_conversational_string(
error!("ARRAY[]::JSONB inputs for transform should only be used with a conversational task");
}
let task_json = json!({ "task": task });
if let Err(err) = crate::bindings::transformers::whitelist::verify_task(&task_json) {
error!("{err}");
}
match crate::bindings::transformers::transform(&task_json, &args.0, inputs) {
Ok(output) => JsonB(output),
Err(e) => error!("{e}"),
Expand Down
2 changes: 0 additions & 2 deletions pgml-extension/src/bindings/transformers/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ pub fn transform<T: serde::Serialize>(
args: &serde_json::Value,
inputs: T,
) -> Result<serde_json::Value> {
whitelist::verify_task(task)?;

let task = serde_json::to_string(task)?;
let args = serde_json::to_string(args)?;
let inputs = serde_json::to_string(&inputs)?;
Expand Down