Merge pull request #113 from firstbatchxyz/erhant/update-workflows-fo…

…r-error

updated workflows with error handling, added new model

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dkn-compute"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 license = "Apache-2.0"
 readme = "README.md"
@@ -46,7 +46,7 @@ sha3 = "0.10.8"
 fastbloom-rs = "0.5.9"
 
 # workflows
-ollama-workflows = { git = "https://github.com/andthattoo/ollama-workflows", rev = "d6b2e1e" }
+ollama-workflows = { git = "https://github.com/andthattoo/ollama-workflows", rev = "ba038f7" }
 
 # peer-to-peer
 libp2p = { git = "https://github.com/anilaltuner/rust-libp2p.git", rev = "3c55e95", features = [

docs/NODE_GUIDE.md

@@ -136,6 +136,7 @@ Based on the resources of your machine, you must decide which models that you wi
 - `phi3:14b-medium-128k-instruct-q4_1`
 - `phi3:3.8b`
 - `llama3.1:latest`
+- `llama3.1:8b-instruct-q8_0`
 - `phi3.5:3.8b`
 - `phi3.5:3.8b-mini-instruct-fp16`
 

src/config/ollama.rs

@@ -210,11 +210,14 @@ impl OllamaConfig {
                 log::warn!("Ignoring model {}: Workflow timed out", model);
             },
             result = executor.execute(None, workflow, &mut memory) => {
-                if result.is_empty() {
-                    log::warn!("Ignoring model {}: Workflow returned empty result", model);
-                } else {
-                    log::info!("Accepting model {}", model);
-                    return true;
+                match result {
+                    Ok(_) => {
+                        log::info!("Accepting model {}", model);
+                        return true;
+                    }
+                    Err(e) => {
+                        log::warn!("Ignoring model {}: Workflow failed with error {}", model, e);
+                    }
                 }
             }
         };
@@ -292,6 +295,6 @@ mod tests {
         let mut memory = ProgramMemory::new();
 
         let result = exe.execute(None, workflow, &mut memory).await;
-        println!("Result: {}", result);
+        println!("Result: {}", result.unwrap());
     }
 }

src/handlers/workflow.rs

@@ -76,7 +76,7 @@ impl ComputeHandler for WorkflowHandler {
             .get_any_matching_model(task.input.model)?;
         log::info!("Using model {} for task {}", model, task.task_id);
 
-        // execute workflow with cancellation
+        // prepare workflow executor
         let executor = if model_provider == ModelProvider::Ollama {
             Executor::new_at(
                 model,
@@ -91,26 +91,28 @@ impl ComputeHandler for WorkflowHandler {
             .input
             .prompt
             .map(|prompt| Entry::try_value_or_str(&prompt));
-        let result: Option<String>;
+
+        // execute workflow with cancellation
+        let result: String;
         tokio::select! {
             _ = node.cancellation.cancelled() => {
                 log::info!("Received cancellation, quitting all tasks.");
                 return Ok(MessageAcceptance::Accept)
             },
             exec_result = executor.execute(entry.as_ref(), task.input.workflow, &mut memory) => {
-                if exec_result.is_empty() {
-                    return Err(format!("Got empty string result for task {}", task.task_id).into());
-                } else {
-                    result = Some(exec_result);
+                match exec_result {
+                    Ok(exec_result) => {
+                        result =  exec_result;
+                    }
+                    Err(e) => {
+                        return Err(format!("Workflow failed with error {}", e).into());
+                    }
                 }
             }
         }
-        let result = result.ok_or::<String>(format!("No result for task {}", task.task_id))?;
 
         // publish the result
         node.send_result(result_topic, &task.public_key, &task.task_id, result)?;
-
-        // accept message, someone else may be included in the filter
         Ok(MessageAcceptance::Accept)
     }
 }

start.sh

@@ -182,7 +182,7 @@ handle_ollama_env() {
 
     # if there is no ollama model given, do not add any ollama compose profile
     ollama_needed=false
-    ollama_models="nous-hermes2theta-llama3-8b phi3:medium phi3:medium-128k phi3:3.8b phi3.5 llama3.1:latest"
+    ollama_models="nous-hermes2theta-llama3-8b phi3:medium phi3:medium-128k phi3:3.8b phi3.5 llama3.1:latest llama3.1:8b-instruct-q8_0"
     for m in $(echo "$DKN_MODELS" | tr ',' ' '); do
         case " $ollama_models " in
             *" $m "*) ollama_needed=true; break;;