uses eyre now for errors

Author: erhant

.github/workflows/build_dev_container.yml

@@ -3,11 +3,11 @@ on:
   push:
     branches: ["master"]
     paths:
-      - 'src/**'
-      - 'Cargo.lock'
-      - 'Cargo.toml'
-      - 'Dockerfile'
-      - 'compose.yml'
+      - "src/**"
+      - "Cargo.lock"
+      - "Cargo.toml"
+      - "Dockerfile"
+      - "compose.yml"
 
 jobs:
   build-and-push:

Cargo.lock

@@ -33,9 +33,10 @@ urlencoding = "2.1.3"
 uuid = { version = "1.8.0", features = ["v4"] }
 rand = "0.8.5"
 
-# logging
+# logging & errors
 env_logger = "0.11.3"
 log = "0.4.21"
+eyre = "0.6.12"
 
 # encryption (ecies) & signatures (ecdsa) & hashing & bloom-filters
 ecies = { version = "0.2", default-features = false, features = ["pure"] }
@@ -69,6 +70,7 @@ libp2p-identity = { version = "0.2.9", features = ["secp256k1"] }
 tracing = { version = "0.1.40" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 
+
 [dependencies.openssl]
 version = "*"
 features = ["vendored"]

Cargo.toml

@@ -1,4 +1,5 @@
 use crate::utils::split_comma_separated;
+use eyre::{eyre, Result};
 use ollama_workflows::{Model, ModelProvider};
 use rand::seq::IteratorRandom; // provides Vec<_>.choose
 
@@ -58,27 +59,27 @@ impl ModelConfig {
     /// If this is a provider, the first matching model in the node config is returned.
     ///
     /// If there are no matching models with this logic, an error is returned.
-    pub fn get_matching_model(
-        &self,
-        model_or_provider: String,
-    ) -> Result<(ModelProvider, Model), String> {
+    pub fn get_matching_model(&self, model_or_provider: String) -> Result<(ModelProvider, Model)> {
         if let Ok(provider) = ModelProvider::try_from(model_or_provider.clone()) {
             // this is a valid provider, return the first matching model in the config
             self.models
                 .iter()
                 .find(|(p, _)| *p == provider)
-                .ok_or_else(|| format!("Provider {} is not supported by this node.", provider))
+                .ok_or(eyre!(
+                    "Provider {} is not supported by this node.",
+                    provider
+                ))
                 .cloned()
         } else if let Ok(model) = Model::try_from(model_or_provider.clone()) {
             // this is a valid model, return it if it is supported by the node
             self.models
                 .iter()
                 .find(|(_, m)| *m == model)
-                .ok_or_else(|| format!("Model {} is not supported by this node.", model))
+                .ok_or(eyre!("Model {} is not supported by this node.", model))
                 .cloned()
         } else {
             // this is neither a valid provider or model for this node
-            Err(format!(
+            Err(eyre!(
                 "Given string '{}' is neither a model nor provider.",
                 model_or_provider
             ))
@@ -89,7 +90,7 @@ impl ModelConfig {
     pub fn get_any_matching_model(
         &self,
         list_model_or_provider: Vec<String>,
-    ) -> Result<(ModelProvider, Model), String> {
+    ) -> Result<(ModelProvider, Model)> {
         // filter models w.r.t supported ones
         let matching_models = list_model_or_provider
             .into_iter()
@@ -109,7 +110,7 @@ impl ModelConfig {
         matching_models
             .into_iter()
             .choose(&mut rand::thread_rng())
-            .ok_or_else(|| "No matching models found.".to_string())
+            .ok_or(eyre!("No matching models found."))
     }
 
     /// Returns the list of unique providers in the config.

src/config/models.rs

@@ -7,13 +7,13 @@ pub use pingpong::PingpongHandler;
 mod workflow;
 pub use workflow::WorkflowHandler;
 
-use crate::{errors::NodeResult, p2p::P2PMessage, DriaComputeNode};
+use crate::{p2p::P2PMessage, DriaComputeNode};
 
 #[async_trait]
 pub trait ComputeHandler {
     async fn handle_compute(
         node: &mut DriaComputeNode,
         message: P2PMessage,
         result_topic: &str,
-    ) -> NodeResult<MessageAcceptance>;
+    ) -> eyre::Result<MessageAcceptance>;
 }

src/errors/mod.rs

@@ -1,7 +1,6 @@
-use crate::{
-    errors::NodeResult, node::DriaComputeNode, p2p::P2PMessage, utils::get_current_time_nanos,
-};
+use crate::{node::DriaComputeNode, p2p::P2PMessage, utils::get_current_time_nanos};
 use async_trait::async_trait;
+use eyre::Result;
 use libp2p::gossipsub::MessageAcceptance;
 use ollama_workflows::{Model, ModelProvider};
 use serde::{Deserialize, Serialize};
@@ -29,7 +28,7 @@ impl ComputeHandler for PingpongHandler {
         node: &mut DriaComputeNode,
         message: P2PMessage,
         result_topic: &str,
-    ) -> NodeResult<MessageAcceptance> {
+    ) -> Result<MessageAcceptance> {
         let pingpong = message.parse_payload::<PingpongPayload>(true)?;
 
         // check deadline

src/handlers/mod.rs

@@ -1,9 +1,9 @@
 use async_trait::async_trait;
+use eyre::{eyre, Result};
 use libp2p::gossipsub::MessageAcceptance;
 use ollama_workflows::{Entry, Executor, ModelProvider, ProgramMemory, Workflow};
 use serde::Deserialize;
 
-use crate::errors::NodeResult;
 use crate::node::DriaComputeNode;
 use crate::p2p::P2PMessage;
 use crate::utils::get_current_time_nanos;
@@ -32,7 +32,7 @@ impl ComputeHandler for WorkflowHandler {
         node: &mut DriaComputeNode,
         message: P2PMessage,
         result_topic: &str,
-    ) -> NodeResult<MessageAcceptance> {
+    ) -> Result<MessageAcceptance> {
         let task = message.parse_payload::<TaskRequestPayload<WorkflowPayload>>(true)?;
 
         // check if deadline is past or not
@@ -102,10 +102,10 @@ impl ComputeHandler for WorkflowHandler {
             exec_result = executor.execute(entry.as_ref(), task.input.workflow, &mut memory) => {
                 match exec_result {
                     Ok(exec_result) => {
-                        result =  exec_result;
+                        result = exec_result;
                     }
                     Err(e) => {
-                        return Err(format!("Workflow failed with error {}", e).into());
+                        return Err(eyre!("Workflow failed with error {}", e));
                     }
                 }
             }

src/handlers/pingpong.rs

@@ -2,7 +2,6 @@
 // TODO: this line breaks docker, find a way to ignore during compose?
 
 pub(crate) mod config;
-pub(crate) mod errors;
 pub(crate) mod handlers;
 pub(crate) mod node;
 pub(crate) mod p2p;