Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow Ollama Model KeepAlive to be None, defaulting to indefinite (#13059)

Browse source 
Putting this back to `Option<KeepAlive>` to make existing configs keep
working.

Release Notes:

- N/A
This commit is contained in:
Kyle Kelley 2024-06-14 10:33:28 -07:00 • committed by GitHub
parent b03653321f
commit 53f702c92f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/assistant/src/completion_provider/ollama.rs
View file

@ -240,7 +240,7 @@ impl OllamaCompletionProvider {
}, },
}) })
.collect(), .collect(),
keep_alive: model.keep_alive, keep_alive: model.keep_alive.unwrap_or_default(),
stream: true, stream: true,
options: Some(ChatOptions { options: Some(ChatOptions {
num_ctx: Some(model.max_tokens), num_ctx: Some(model.max_tokens),

4
crates/ollama/src/ollama.rs
View file

@ -66,7 +66,7 @@ impl Default for KeepAlive {
pub struct Model { pub struct Model {
pub name: String, pub name: String,
pub max_tokens: usize, pub max_tokens: usize,
pub keep_alive: KeepAlive, pub keep_alive: Option<KeepAlive>,
} }
impl Model { impl Model {
@ -74,7 +74,7 @@ impl Model {
Self { Self {
name: name.to_owned(), name: name.to_owned(),
max_tokens: 2048, max_tokens: 2048,
keep_alive: KeepAlive::indefinite(), keep_alive: Some(KeepAlive::indefinite()),
} }
} }