Hare/llm_worker_rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: Merge worker-types crate into worker crate

Browse Source
This commit is contained in:
Hare
2026-01-08 22:15:11 +09:00
parent a01f19b112
commit 7d398fa6de
41 changed files with 1195 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
worker-macros/Cargo.toml
-1
View File
@@ -11,4 +11,3 @@ proc-macro = true
proc-macro2 = "1"
quote = "1"
syn = { version = "2", features = ["full"] }
worker-types = { path = "../worker-types" }
worker-macros/src/lib.rs
+4 -4
View File
@@ -193,7 +193,7 @@ fn generate_tool_impl(self_ty: &Type, method: &syn::ImplItemFn) -> proc_macro2::
quote! {
match result {
Ok(val) => Ok(format!("{:?}", val)),
Err(e) => Err(worker_types::ToolError::ExecutionFailed(format!("{}", e))),
Err(e) => Err(::worker::tool::ToolError::ExecutionFailed(format!("{}", e))),
}
}
} else {
@@ -230,7 +230,7 @@ fn generate_tool_impl(self_ty: &Type, method: &syn::ImplItemFn) -> proc_macro2::
} else {
quote! {
let args: #args_struct_name = serde_json::from_str(input_json)
.map_err(|e| worker_types::ToolError::InvalidArgument(e.to_string()))?;
.map_err(|e| ::worker::tool::ToolError::InvalidArgument(e.to_string()))?;
let result = self.ctx.#method_name(#(#arg_names),*)#awaiter;
#result_handling
@@ -246,7 +246,7 @@ fn generate_tool_impl(self_ty: &Type, method: &syn::ImplItemFn) -> proc_macro2::
}
#[async_trait::async_trait]
impl worker_types::Tool for #tool_struct_name {
impl ::worker::tool::Tool for #tool_struct_name {
fn name(&self) -> &str {
#tool_name
}
@@ -260,7 +260,7 @@ fn generate_tool_impl(self_ty: &Type, method: &syn::ImplItemFn) -> proc_macro2::
serde_json::to_value(schema).unwrap_or(serde_json::json!({}))
}
async fn execute(&self, input_json: &str) -> Result<String, worker_types::ToolError> {
async fn execute(&self, input_json: &str) -> Result<String, ::worker::tool::ToolError> {
#execute_body
}
}