update dependencies
This commit is contained in:
+2
-2
@@ -7,7 +7,7 @@ license = "GPL-3.0"
|
||||
[dependencies]
|
||||
ollama-rs = { version = "0.3.4", features = ["macros", "headers"] }
|
||||
tokio = { version = "1.50.0", features = ["rt", "rt-multi-thread", "macros", "io-std"] }
|
||||
rmcp = { version = "1.3.0", features = ["client"] }
|
||||
rmcp = { version = "2.2.0", features = ["client"] }
|
||||
log = { version = "0.4.29" }
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
url = "2.5.8"
|
||||
@@ -20,7 +20,7 @@ indicatif = "0.18.4"
|
||||
console = "0.16.3"
|
||||
clap = { version = "4.6.0", features = ["derive"] }
|
||||
base64 = "0.22.1"
|
||||
cpal = "0.17.3"
|
||||
cpal = "0.18.1"
|
||||
rodio = "0.22.2"
|
||||
tokio-util = { version = "0.7.18", optional = true }
|
||||
|
||||
|
||||
+11
-8
@@ -10,11 +10,11 @@ use crate::model::create_model_from_config;
|
||||
use base64::Engine;
|
||||
use clap::Parser;
|
||||
use cpal::traits::HostTrait;
|
||||
use mcp_server_collection::McpServerError;
|
||||
use own_assist_common::{exit_msg, init_tracing_subscriber};
|
||||
use own_mcp::AgentChat;
|
||||
use tokio::task::JoinHandle;
|
||||
use tokio_util::sync::CancellationToken;
|
||||
use mcp_server_collection::McpServerError;
|
||||
|
||||
/// partial mcp client with cli and voice interaction
|
||||
#[derive(Parser, Debug)]
|
||||
@@ -68,7 +68,9 @@ async fn chat_loop(mut human_interface: impl HumanInterface, mut agent_chat: Age
|
||||
}
|
||||
|
||||
#[cfg(feature = "built-in-mcp-collection")]
|
||||
async fn launch_mcp_server(config: mcp_server_collection::config::Config) -> Result<(CancellationToken, JoinHandle<std::io::Result<()>>), McpServerError> {
|
||||
async fn launch_mcp_server(
|
||||
config: mcp_server_collection::config::Config,
|
||||
) -> Result<(CancellationToken, JoinHandle<std::io::Result<()>>), McpServerError> {
|
||||
let handle = mcp_server_collection::serve_in_background(config).await?;
|
||||
|
||||
Ok(handle)
|
||||
@@ -85,13 +87,14 @@ async fn main() {
|
||||
init_tracing_subscriber();
|
||||
|
||||
#[cfg(feature = "built-in-mcp-collection")]
|
||||
let mcp_config = mcp_server_collection::config::Config::from_file().inspect_err(exit_msg!("error loading server.toml"))
|
||||
.unwrap();
|
||||
let mcp_config = mcp_server_collection::config::Config::from_file()
|
||||
.inspect_err(exit_msg!("error loading server.toml"))
|
||||
.unwrap();
|
||||
#[cfg(feature = "built-in-mcp-collection")]
|
||||
let (mcp_server_ct, mcp_server_task) = launch_mcp_server(mcp_config).await
|
||||
.inspect_err(exit_msg!("error launching mcp server"))
|
||||
.unwrap();
|
||||
|
||||
let (mcp_server_ct, mcp_server_task) = launch_mcp_server(mcp_config)
|
||||
.await
|
||||
.inspect_err(exit_msg!("error launching mcp server"))
|
||||
.unwrap();
|
||||
|
||||
let config = Config::from_file()
|
||||
.inspect_err(exit_msg!("error loading assist.toml"))
|
||||
|
||||
Reference in New Issue
Block a user