chore: use modelfile crate

covercash2 · Nov 20, 2024 · accf12b · accf12b
1 parent 08ddb97
commit accf12b
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 2,189 deletions.
diff --git a/ollama/ollama-cli/Cargo.lock b/ollama/ollama-cli/Cargo.lock
diff --git a/ollama/ollama-cli/Cargo.toml b/ollama/ollama-cli/Cargo.toml
@@ -16,6 +16,7 @@ extend = "1.2.0"
 derive_builder = "0.20.2"
 futures = "0.3.30"
 itertools = "0.13.0"
+modelfile = "0.2.0"
 nom = "7.1.3"
 ollama-rs = { version = "0.2.1", features = ["stream"] }
 ratatui = { version = "0.28.1", features = ["unstable-widget-ref"] }

diff --git a/ollama/ollama-cli/src/error.rs b/ollama/ollama-cli/src/error.rs
@@ -1,8 +1,9 @@
+use modelfile::modelfile::error::ModelfileError;
 use ollama_rs::error::OllamaError;
 use thiserror::Error;
 use tokio::sync::mpsc::error::SendError;
 
-use crate::{lm::Response, ollama::modelfile::error::ModelfileError};
+use crate::lm::Response;
 
 pub type Result<T> = std::result::Result<T, Error>;
 

diff --git a/ollama/ollama-cli/src/ollama/mod.rs b/ollama/ollama-cli/src/ollama/mod.rs
@@ -12,7 +12,6 @@ use crate::error::Result;
 pub mod chat;
 pub mod embeddings;
 pub mod generate;
-pub mod modelfile;
 
 pub const DEFAULT_MODEL: &str = "mistral-nemo";
 pub const DEFAULT_DOMAIN: &str = "hoss";

diff --git a/ollama/ollama-cli/src/ollama/modelfile/error.rs b/ollama/ollama-cli/src/ollama/modelfile/error.rs