Skip to content
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

Fix parsing for streaming of objects more stable #1031

Merged
merged 3 commits into from
Oct 12, 2024
Merged

Fix parsing for streaming of objects more stable #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
916851c
Make streaming of objects more stable. We penelize objects that are t…
hellovai Oct 12, 2024
7f83cdd
Merge branch 'canary' into stable-stream
hellovai Oct 12, 2024
5cd5e65
Improve union disambiguation
hellovai Oct 12, 2024
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
107 changes: 88 additions & 19 deletions engine/baml-lib/jsonish/src/deserializer/coercer/array_helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::any::Any;

use crate::deserializer::{deserialize_flags::Flag, types::BamlValueWithFlags};
use anyhow::Result;
use internal_baml_core::ir::FieldType;
use internal_baml_core::{ast::Field, ir::FieldType};

use super::{ParsingContext, ParsingError};

Expand Down Expand Up @@ -59,25 +59,94 @@ pub(super) fn pick_best(
// Sort by (false, score, index)
all_valid_scores.sort_by(
|&(a, a_score, a_default, a_val), &(b, b_score, b_default, b_val)| {
if a_val.r#type() == b_val.r#type() && matches!(a_val, BamlValueWithFlags::List(_, _)) {
let a_is_single = a_val
.conditions()
.flags
.iter()
.any(|f| matches!(f, Flag::SingleToArray));
let b_is_single = b_val
.conditions()
.flags
.iter()
.any(|f| matches!(f, Flag::SingleToArray));

match (a_is_single, b_is_single) {
// Return B
(true, false) => return std::cmp::Ordering::Greater,
// Return A
(false, true) => return std::cmp::Ordering::Less,
_ => {}
if a_val.r#type() == b_val.r#type() {
if matches!(a_val, BamlValueWithFlags::List(_, _)) {
let a_is_single = a_val
.conditions()
.flags
.iter()
.any(|f| matches!(f, Flag::SingleToArray));
let b_is_single = b_val
.conditions()
.flags
.iter()
.any(|f| matches!(f, Flag::SingleToArray));

match (a_is_single, b_is_single) {
// Return B
(true, false) => return std::cmp::Ordering::Greater,
// Return A
(false, true) => return std::cmp::Ordering::Less,
_ => {}
}
}
}

// De-value default values when comparing
match (a_val, b_val) {
(
BamlValueWithFlags::Class(_, a_conds, a_props),
BamlValueWithFlags::Class(_, b_conds, b_props),
) => {
// If matching on a union, and one of the choices is picking an object that only
// had a single string coerced from JSON, prefer the other one
// (since string cost is low, its better to pick the other one if possible)
if matches!(target, FieldType::Union(_)) {
let a_is_coerced_string = a_props.len() == 1
&& a_props.iter().all(|(_, cond)| {
matches!(cond, BamlValueWithFlags::String(..))
&& cond
.conditions()
.flags
.iter()
.any(|f| matches!(f, Flag::ImpliedKey(..)))
});

let b_is_coerced_string = b_props.len() == 1
&& b_props.iter().all(|(_, cond)| {
matches!(cond, BamlValueWithFlags::String(..))
&& cond
.conditions()
.flags
.iter()
.any(|f| matches!(f, Flag::ImpliedKey(..)))
});

match (a_is_coerced_string, b_is_coerced_string) {
// Return B
(true, false) => return std::cmp::Ordering::Greater,
// Return A
(false, true) => return std::cmp::Ordering::Less,
_ => {}
}
}

let a_is_default = a_props.iter().all(|(k, cond)| {
cond.conditions().flags.iter().any(|f| {
matches!(
f,
Flag::OptionalDefaultFromNoValue | Flag::DefaultFromNoValue
)
})
});
let b_is_default = b_props.iter().all(|(k, cond)| {
cond.conditions().flags.iter().any(|f| {
matches!(
f,
Flag::OptionalDefaultFromNoValue | Flag::DefaultFromNoValue
)
})
});

match (a_is_default, b_is_default) {
// Return B
(true, false) => return std::cmp::Ordering::Greater,
// Return A
(false, true) => return std::cmp::Ordering::Less,
_ => {}
}
}
_ => {}
}

match a_default.cmp(&b_default) {
Expand Down
3 changes: 2 additions & 1 deletion engine/baml-lib/jsonish/src/tests/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ macro_rules! test_partial_deserializer {
assert!(result.is_ok(), "Failed to parse: {:?}", result);

let value = result.unwrap();
log::trace!("Score: {}", value.score());
let value: BamlValue = value.into();
println!("{:#?}", value);
log::info!("{}", value);
let json_value = json!(value);

let expected = serde_json::json!($($json)+);
Expand Down
125 changes: 125 additions & 0 deletions engine/baml-lib/jsonish/src/tests/test_partials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,3 +232,128 @@ test_partial_deserializer!(
"wordCounts": []
}
);

const CHOPPY_BAML_FILE: &str = r##"
class Error {
code int
message string
}

// Technically, everything can cast to this object.
class ErrorBasic {
message string
}

class GraphJson {
vertices Vertex[]
edges Edge[]
}

class Vertex {
id string @description(#"
A unique human-readable identifier for the vertex, like 'peter'
"#)
metadata map<string, string> @description(#"
Arbitrary metadata for the vertex, like 'name' or 'age'
"#)
}

class Edge {
source_id string
target_id string
// note, you could use an enum here if you know what rthe relationships are
relationship string @description(#"
A human-readable label for the edge, like 'knows' or "works_with", etc..
"#)
}
"##;

const TRIMMED_CHOPPY_RESULT: &str = r#"
```json
{
"vertices": [
{
"id": "stephanie_morales",
"metadata": {
"name": "Stephanie Morales",
"affiliation": "Made Space"
}
},
{
"id":
"#;

test_partial_deserializer!(
test_partial_choppy,
CHOPPY_BAML_FILE,
TRIMMED_CHOPPY_RESULT,
FieldType::Class("GraphJson".to_string()),
{
"vertices": [
{
"id": "stephanie_morales",
"metadata": {
"name": "Stephanie Morales",
"affiliation": "Made Space"
}
},
{
"id": null,
"metadata": {
}
}
],
"edges": [
]
}
);

test_partial_deserializer!(
test_partial_choppy_union,
CHOPPY_BAML_FILE,
TRIMMED_CHOPPY_RESULT,
FieldType::union(vec![FieldType::Class("GraphJson".to_string()), FieldType::Class("GraphJson".to_string()).as_list(), FieldType::Class("Error".to_string())]),
{
"vertices": [
{
"id": "stephanie_morales",
"metadata": {
"name": "Stephanie Morales",
"affiliation": "Made Space"
}
},
{
"id": null,
"metadata": {
}
}
],
"edges": [
]
}
);

test_partial_deserializer!(
test_partial_choppy_union_2,
CHOPPY_BAML_FILE,
TRIMMED_CHOPPY_RESULT,
FieldType::union(vec![FieldType::Class("GraphJson".to_string()), FieldType::Class("ErrorBasic".to_string())]),
{
"vertices": [
{
"id": "stephanie_morales",
"metadata": {
"name": "Stephanie Morales",
"affiliation": "Made Space"
}
},
{
"id": null,
"metadata": {
}
}
],
"edges": [
]
}
);
Loading