apunkt/plano
1
0
Fork 0
mirror of https://github.com/katanemo/plano.git synced 2026-04-25 00:36:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use serde defaulting for null selection preference

Browse source
This commit is contained in:
Spherrrical 2026-03-31 14:33:03 -07:00
parent 9e066c86d4
commit 3fde960a19
2 changed files with 15 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/brightstaff/src/handlers/routing_service.rs
View file

@ -27,9 +27,8 @@ pub fn extract_routing_policy(
let routing_preferences = json_body
.as_object_mut()
.and_then(|o| o.remove("routing_preferences"))
.and_then(|mut value| {
normalize_null_prefer_to_none(&mut value);
match serde_json::from_value::<Vec<TopLevelRoutingPreference>>(value) {
.and_then(
|value| match serde_json::from_value::<Vec<TopLevelRoutingPreference>>(value) {
Ok(prefs) => {
info!(
num_routes = prefs.len(),
@ -41,43 +40,13 @@ pub fn extract_routing_policy(
warn!(error = %err, "failed to parse routing_preferences");
None
}
}
});
},
);
let bytes = Bytes::from(serde_json::to_vec(&json_body).unwrap());
Ok((bytes, routing_preferences))
}
fn normalize_null_prefer_to_none(routing_preferences: &mut serde_json::Value) {
let Some(preferences) = routing_preferences.as_array_mut() else {
return;
};
for preference in preferences {
let Some(preference_obj) = preference.as_object_mut() else {
continue;
};
let Some(selection_policy) = preference_obj.get_mut("selection_policy") else {
continue;
};
let Some(policy_obj) = selection_policy.as_object_mut() else {
continue;
};
if policy_obj
.get("prefer")
.is_some_and(serde_json::Value::is_null)
{
policy_obj.insert(
"prefer".to_string(),
serde_json::Value::String("none".to_string()),
);
}
}
}
#[derive(serde::Serialize)]
struct RoutingDecisionResponse {
/// Ranked model list — use first, fall back to next on 429/5xx.

12
crates/common/src/configuration.rs
View file

@ -1,5 +1,5 @@
use hermesllm::apis::openai::{ModelDetail, ModelObject, Models};
use serde::{Deserialize, Serialize};
use serde::{Deserialize, Deserializer, Serialize};
use std::collections::HashMap;
use std::fmt::Display;
@ -116,9 +116,19 @@ pub enum SelectionPreference {
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
pub struct SelectionPolicy {
#[serde(default, deserialize_with = "deserialize_selection_preference")]
pub prefer: SelectionPreference,
}
fn deserialize_selection_preference<'de, D>(
deserializer: D,
) -> Result<SelectionPreference, D::Error>
where
D: Deserializer<'de>,
{
Ok(Option::<SelectionPreference>::deserialize(deserializer)?.unwrap_or_default())
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct TopLevelRoutingPreference {
pub name: String,