some rfks and logs

Author: erhant

src/commands/coordinator.rs

@@ -92,20 +92,21 @@ pub async fn run_oracle(
     }
 
     // handle new tasks with subscription
-    let event_poller = node
-        .subscribe_to_tasks()
-        .await
-        .wrap_err("could not subscribe to tasks")?;
     log::info!(
-        "Subscribed to LLMOracleCoordinator ({}) as {}",
+        "Subscribing to LLMOracleCoordinator ({}) as {}",
         node.addresses.coordinator,
         kinds
             .iter()
             .map(|kind| kind.to_string())
             .collect::<Vec<String>>()
             .join(", ")
     );
+    let event_poller = node
+        .subscribe_to_tasks()
+        .await
+        .wrap_err("could not subscribe to tasks")?;
 
+    log::info!("Listening for events...");
     event_poller
         .into_stream()
         .for_each(|log| async {

src/compute/workflows/mod.rs

@@ -1,5 +1,6 @@
-mod chat;
 mod postprocess;
 
-mod request;
-pub use request::Request;
+mod presets;
+
+mod requests;
+pub use requests::Request;

src/compute/workflows/presets/mod.rs

@@ -0,0 +1,9 @@
+use dkn_workflows::Workflow;
+use lazy_static::lazy_static;
+
+lazy_static! {
+    pub static ref GENERATION_WORKFLOW: Workflow = {
+        serde_json::from_str(include_str!("generation.json"))
+            .expect("could not parse generation workflow")
+    };
+}

src/compute/workflows/chat.rs renamed to src/compute/workflows/requests/chat.rs

@@ -1,22 +1,17 @@
 use alloy::primitives::{Bytes, U256};
 use dkn_workflows::{Entry, Executor, Model, ProgramMemory, Workflow};
 use eyre::{eyre, Context, Result};
-use lazy_static::lazy_static;
 
-use super::{chat::*, postprocess::*};
+mod chat;
+use chat::*;
+
+use super::{postprocess::*, presets::GENERATION_WORKFLOW};
 use crate::{
     bytes_to_string,
     data::{Arweave, OracleExternalData},
     DriaOracle,
 };
 
-lazy_static! {
-    static ref GENERATION_WORKFLOW: Workflow = {
-        serde_json::from_str(include_str!("presets/generation.json"))
-            .expect("could not parse generation workflow")
-    };
-}
-
 /// An oracle request.
 #[derive(Debug)]
 pub enum Request {
@@ -53,13 +48,15 @@ impl Request {
                 .execute(None, workflow, &mut memory)
                 .await
                 .wrap_err("could not execute worfklow input"),
+
             Self::String(input) => {
                 let entry = Entry::String(input.clone());
                 executor
                     .execute(Some(&entry), &GENERATION_WORKFLOW, &mut memory)
                     .await
                     .wrap_err("could not execute worfklow for string input")
             }
+
             Self::ChatHistory(chat_history) => {
                 if let Some(node) = node {
                     // if task id is zero, there is no prior history
@@ -170,7 +167,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_parse_input_workflow() {
-        let workflow_str = include_str!("presets/generation.json");
+        let workflow_str = include_str!("../presets/generation.json");
         let expected_workflow = serde_json::from_str::<Workflow>(&workflow_str).unwrap();
 
         let entry = Request::try_parse_bytes(&workflow_str.as_bytes().into()).await;