From f5cf067dbda2221dc11cb053eb919370bf583d64 Mon Sep 17 00:00:00 2001 From: milan Date: Tue, 28 Jul 2026 18:11:19 +0200 Subject: [PATCH] configs now clonable --- Cargo.lock | 8 ++++---- common/Cargo.toml | 2 +- common/src/config.rs | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index efb2c37..335397c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1998,7 +1998,7 @@ dependencies = [ "log", "mcp_server_collection 0.2.2 (sparse+https://git.mboemer.de/api/packages/milan/cargo/)", "ollama-rs", - "own_assist_common 0.4.1 (sparse+https://git.mboemer.de/api/packages/milan/cargo/)", + "own_assist_common 0.4.1", "own_mcp 0.1.1 (sparse+https://git.mboemer.de/api/packages/milan/cargo/)", "rmcp", "rodio", @@ -2025,6 +2025,8 @@ dependencies = [ [[package]] name = "own_assist_common" version = "0.4.1" +source = "sparse+https://git.mboemer.de/api/packages/milan/cargo/" +checksum = "324156da8ebc00f6d5b6bd7709ffdf4dfe56bb0bb274315c133060d59ac8212b" dependencies = [ "log", "ollama-rs", @@ -2037,9 +2039,7 @@ dependencies = [ [[package]] name = "own_assist_common" -version = "0.4.1" -source = "sparse+https://git.mboemer.de/api/packages/milan/cargo/" -checksum = "324156da8ebc00f6d5b6bd7709ffdf4dfe56bb0bb274315c133060d59ac8212b" +version = "0.4.2" dependencies = [ "log", "ollama-rs", diff --git a/common/Cargo.toml b/common/Cargo.toml index 5f63a16..2d6617f 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "own_assist_common" -version = "0.4.1" +version = "0.4.2" edition = "2024" license = "GPL-3.0" diff --git a/common/src/config.rs b/common/src/config.rs index 918bc8e..d88dda9 100644 --- a/common/src/config.rs +++ b/common/src/config.rs @@ -4,7 +4,7 @@ use ollama_rs::models::create::{CreateModelRequest, CreateModelStatus}; use serde::Deserialize; use url::Url; -#[derive(Debug, Deserialize)] +#[derive(Debug, Clone, Deserialize)] pub struct AudioClientConfig { pub url: Url, pub authorization: Option, @@ -14,7 +14,7 @@ fn ollama_default_url() -> Url { Url::parse("http://127.0.0.1:11434").unwrap() } -#[derive(Debug, Deserialize)] +#[derive(Debug, Clone, Deserialize)] pub struct OllamaConfig { #[serde(default = "ollama_default_url")] pub url: Url, @@ -72,7 +72,7 @@ impl OllamaConfig { } } -#[derive(Debug, Deserialize)] +#[derive(Debug, Clone, Deserialize)] pub struct OllamaModelConfig { #[serde(rename = "from-model")] pub from_model: String, @@ -82,9 +82,9 @@ pub struct OllamaModelConfig { pub temperature: Option, } -#[derive(Debug, Deserialize)] +#[derive(Debug, Clone, Deserialize)] pub struct MCPClientConfig { pub name: Option, pub url: Url, pub authorization: Option, // should probably implement oauth some time // actually, fuck oauth -} +} \ No newline at end of file