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

Refactor tool router key serialization and deserialization #765

Merged
merged 2 commits into from
Dec 30, 2024
Merged

Refactor tool router key serialization and deserialization #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e35e074
Refactor tool router key serialization and deserialization
guillevalin Dec 30, 2024
71ec3c3
Merge branch 'main' into fix/tool-router-keys-serializer
guillevalin Dec 30, 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
45 changes: 45 additions & 0 deletions shinkai-libs/shinkai-message-primitives/src/schemas/tool_router_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,51 @@ impl ToolRouterKey {
}
}

pub fn deserialize_tool_router_keys<'de, D>(deserializer: D) -> Result<Option<Vec<Self>>, D::Error>
where
D: serde::Deserializer<'de>,
{
let string_vec: Option<Vec<String>> = Option::deserialize(deserializer)?;

match string_vec {
Some(vec) => {
let router_keys = vec
.into_iter()
.map(|s| Self::from_string(&s))
.collect::<Result<Vec<_>, _>>()
.map_err(serde::de::Error::custom)?;
Ok(Some(router_keys))
}
None => Ok(None),
}
}

pub fn serialize_tool_router_keys<S>(
keys: &Option<Vec<ToolRouterKey>>,
serializer: S
) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
match keys {
Some(keys) => {
let strings: Vec<String> = keys
.iter()
.map(|k| {
// If version is Some, use to_string_with_version()
if k.version.is_some() {
k.to_string_with_version()
} else {
k.to_string_without_version()
}
})
.collect();
strings.serialize(serializer)
}
None => serializer.serialize_none(),
}
}

fn sanitize(input: &str) -> String {
input.chars()
.map(|c| if c.is_ascii_alphanumeric() || c == '_' { c } else { '_' })
Expand Down
21 changes: 2 additions & 19 deletions shinkai-libs/shinkai-tools-primitives/src/tools/deno_tools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ pub struct DenoTool {
pub version: String,
pub js_code: String,
#[serde(default)]
#[serde(deserialize_with = "deserialize_tool_router_keys")]
#[serde(deserialize_with = "ToolRouterKey::deserialize_tool_router_keys")]
#[serde(serialize_with = "ToolRouterKey::serialize_tool_router_keys")]
pub tools: Option<Vec<ToolRouterKey>>,
pub config: Vec<ToolConfig>,
pub description: String,
Expand All @@ -48,24 +49,6 @@ pub struct DenoTool {
pub assets: Option<Vec<String>>,
}

fn deserialize_tool_router_keys<'de, D>(deserializer: D) -> Result<Option<Vec<ToolRouterKey>>, D::Error>
where
D: Deserializer<'de>,
{
let string_vec: Option<Vec<String>> = Option::deserialize(deserializer)?;

match string_vec {
Some(vec) => {
let router_keys = vec
.into_iter()
.filter_map(|s| ToolRouterKey::from_string(&s).ok())
.collect();
Ok(Some(router_keys))
}
None => Ok(None),
}
}

impl DenoTool {
/// Default name of the rust toolkit
pub fn toolkit_name(&self) -> String {
Expand Down
24 changes: 3 additions & 21 deletions shinkai-libs/shinkai-tools-primitives/src/tools/python_tools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use std::time::{SystemTime, UNIX_EPOCH};
use std::{env, thread};

use crate::tools::error::ToolError;
use serde::Deserialize;
use shinkai_message_primitives::schemas::shinkai_name::ShinkaiName;
use shinkai_message_primitives::schemas::tool_router_key::ToolRouterKey;
use shinkai_tools_runner::tools::code_files::CodeFiles;
Expand All @@ -30,7 +29,9 @@ pub struct PythonTool {
pub name: String,
pub author: String,
pub py_code: String,
#[serde(deserialize_with = "deserialize_tool_router_keys")]
#[serde(default)]
#[serde(deserialize_with = "ToolRouterKey::deserialize_tool_router_keys")]
#[serde(serialize_with = "ToolRouterKey::serialize_tool_router_keys")]
pub tools: Option<Vec<ToolRouterKey>>,
pub config: Vec<ToolConfig>,
pub description: String,
Expand All @@ -47,25 +48,6 @@ pub struct PythonTool {
pub assets: Option<Vec<String>>,
}

fn deserialize_tool_router_keys<'de, D>(deserializer: D) -> Result<Option<Vec<ToolRouterKey>>, D::Error>
where
D: serde::Deserializer<'de>,
{
let string_vec: Option<Vec<String>> = Option::deserialize(deserializer)?;

match string_vec {
Some(vec) => {
let router_keys = vec
.into_iter()
.map(|s| ToolRouterKey::from_string(&s))
.collect::<Result<Vec<_>, _>>()
.map_err(serde::de::Error::custom)?;
Ok(Some(router_keys))
}
None => Ok(None),
}
}

impl PythonTool {
/// Default name of the rust toolkit
pub fn toolkit_name(&self) -> String {
Expand Down