export errors

Author: erhant

compute/src/reqres/task.rs

@@ -70,12 +70,7 @@ impl TaskResponder {
 
         // check if the model is available in this node, if so
         // it will return an executor that can run this model
-        let executor = node
-            .config
-            .executors
-            .get_executor(&task_body.model)
-            .await
-            .wrap_err("could not get an executor")?;
+        let executor = node.config.executors.get_executor(&task_body.model).await?;
 
         let task_metadata = TaskWorkerMetadata {
             task_id: task.task_id,

executor/src/executors/errors.rs

@@ -2,9 +2,6 @@ use crate::ModelProvider;
 use rig::completion::PromptError;
 use std::collections::HashSet;
 
-mod errors;
-pub use errors::DriaExecutorError;
-
 mod ollama;
 use ollama::OllamaClient;
 

executor/src/executors/mod.rs

@@ -1,5 +1,5 @@
 mod executors;
-pub use executors::{DriaExecutor, DriaExecutorError};
+pub use executors::DriaExecutor;
 
 mod manager;
 pub use manager::DriaExecutorsManager;
@@ -11,7 +11,7 @@ mod task;
 pub use task::{TaskBody, TaskResult};
 
 pub use rig::completion::CompletionModel;
-pub use rig::completion::PromptError;
+pub use rig::completion::{CompletionError, PromptError};
 
 // re-export ollama_rs
 pub use ollama_rs;

executor/src/lib.rs

@@ -1,7 +1,6 @@
+use crate::{executors::DriaExecutor, Model, ModelProvider};
 use std::collections::{HashMap, HashSet};
 
-use crate::{executors::DriaExecutor, DriaExecutorError, Model, ModelProvider};
-
 #[derive(Clone)]
 pub struct DriaExecutorsManager {
     /// List of all models supported by this node.
@@ -53,17 +52,17 @@ impl DriaExecutorsManager {
     ///
     /// If the model's provider is not supported, an error is returned.
     /// Likewise, if the provider is supported but the model is not, an error is returned.
-    pub async fn get_executor(&self, model: &Model) -> Result<DriaExecutor, DriaExecutorError> {
+    pub async fn get_executor(&self, model: &Model) -> eyre::Result<DriaExecutor> {
         let provider = model.provider();
         let (executor, models) = self
             .providers
-            .get(&model.provider())
-            .ok_or(DriaExecutorError::ProviderNotSupported(provider))?;
+            .get(&provider)
+            .ok_or_else(|| eyre::eyre!("Provider {provider} supported by this executor"))?;
 
         if models.contains(model) {
             Ok(executor.clone())
         } else {
-            Err(DriaExecutorError::ModelNotSupported(*model))
+            Err(eyre::eyre!("Model {model} not supported by this executor"))
         }
     }
 

executor/src/manager.rs

@@ -24,7 +24,7 @@ impl DriaBehaviour {
 
 /// Configures the request-response behaviour for the node.
 ///
-/// The protocol supports bytes only,
+/// The protocol supports bytes only.
 #[inline]
 fn create_request_response_behaviour(
     protocol_name: StreamProtocol,