slight renamings

Author: erhant

Cargo.toml

@@ -16,9 +16,12 @@ parking_lot = "0.12.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 async-trait = "0.1.81"
-dotenvy = "0.15.7"
 reqwest = "0.12.5"
+
+dotenvy = "0.15.7"
+
 rand = "0.8.5"
+
 env_logger = "0.11.3"
 log = "0.4.21"
 eyre = "0.6.12"

compute/Cargo.toml

@@ -28,17 +28,18 @@ async-trait = "0.1.81"
 reqwest = "0.12.5"
 
 # utilities
-dotenvy = "0.15.7"
+dotenvy.workspace = true
 base64 = "0.22.0"
 hex = "0.4.3"
 hex-literal = "0.4.1"
 url = "2.5.0"
 urlencoding = "2.1.3"
 uuid = { version = "1.8.0", features = ["v4"] }
-rand = "0.8.5"
+
 port_check = "0.2.1"
 
 # logging & errors
+rand.workspace = true
 env_logger.workspace = true
 log.workspace = true
 eyre.workspace = true

compute/src/config/mod.rs renamed to compute/src/config.rs

@@ -1,6 +1,6 @@
 use crate::utils::{address_in_use, crypto::to_address};
 use dkn_p2p::libp2p::Multiaddr;
-use dkn_workflows::ModelConfig;
+use dkn_workflows::DriaWorkflowsConfig;
 use eyre::{eyre, Result};
 use libsecp256k1::{PublicKey, SecretKey};
 
@@ -18,8 +18,8 @@ pub struct DriaComputeNodeConfig {
     pub admin_public_key: PublicKey,
     /// P2P listen address, e.g. `/ip4/0.0.0.0/tcp/4001`.
     pub p2p_listen_addr: Multiaddr,
-    /// Available LLM models & providers for the node.
-    pub model_config: ModelConfig,
+    /// Workflow configurations, e.g. models and providers.
+    pub workflows: DriaWorkflowsConfig,
 }
 
 /// The default P2P network listen address.
@@ -79,7 +79,8 @@ impl DriaComputeNodeConfig {
         let address = to_address(&public_key);
         log::info!("Node Address:     0x{}", hex::encode(address));
 
-        let model_config = ModelConfig::new_from_csv(&env::var("DKN_MODELS").unwrap_or_default());
+        let model_config =
+            DriaWorkflowsConfig::new_from_csv(&env::var("DKN_MODELS").unwrap_or_default());
         #[cfg(not(test))]
         if model_config.models.is_empty() {
             log::error!("No models were provided, make sure to restart with at least one model provided within DKN_MODELS.");
@@ -98,7 +99,7 @@ impl DriaComputeNodeConfig {
             secret_key,
             public_key,
             address,
-            model_config,
+            workflows: model_config,
             p2p_listen_addr,
         }
     }

compute/src/handlers/pingpong.rs

@@ -54,7 +54,7 @@ impl ComputeHandler for PingpongHandler {
         // respond
         let response_body = PingpongResponse {
             uuid: pingpong.uuid.clone(),
-            models: node.config.model_config.models.clone(),
+            models: node.config.workflows.models.clone(),
             timestamp: get_current_time_nanos(),
         };
 

compute/src/handlers/workflow.rs

@@ -66,18 +66,16 @@ impl ComputeHandler for WorkflowHandler {
         }
 
         // read model / provider from the task
-        let (model_provider, model) = config
-            .model_config
-            .get_any_matching_model(task.input.model)?;
+        let (model_provider, model) = config.workflows.get_any_matching_model(task.input.model)?;
         let model_name = model.to_string(); // get model name, we will pass it in payload
         log::info!("Using model {} for task {}", model_name, task.task_id);
 
         // prepare workflow executor
         let executor = if model_provider == ModelProvider::Ollama {
             Executor::new_at(
                 model,
-                &config.model_config.ollama.host,
-                config.model_config.ollama.port,
+                &config.workflows.ollama.host,
+                config.workflows.ollama.port,
             )
         } else {
             Executor::new(model)

compute/src/main.rs

@@ -54,7 +54,7 @@ async fn main() -> Result<()> {
             _ = service_check_token.cancelled() => {
                 log::info!("Service check cancelled.");
             }
-            result = config_clone.model_config.check_services() => {
+            result = config_clone.workflows.check_services() => {
                 if let Err(err) = result {
                     log::error!("Error checking services: {:?}", err);
                     panic!("Service check failed.")

compute/src/node.rs

@@ -1,4 +1,4 @@
-use dkn_p2p::{libp2p::gossipsub, P2PClient};
+use dkn_p2p::{libp2p::gossipsub, DriaP2P};
 use eyre::{eyre, Result};
 use std::time::Duration;
 use tokio_util::sync::CancellationToken;
@@ -27,7 +27,7 @@ const RPC_PEER_ID_REFRESH_INTERVAL_SECS: u64 = 30;
 /// ```
 pub struct DriaComputeNode {
     pub config: DriaComputeNodeConfig,
-    pub p2p: P2PClient,
+    pub p2p: DriaP2P,
     pub available_nodes: AvailableNodes,
     pub available_nodes_last_refreshed: tokio::time::Instant,
     pub cancellation: CancellationToken,
@@ -51,7 +51,7 @@ impl DriaComputeNode {
             )
             .sort_dedup();
 
-        let p2p = P2PClient::new(
+        let p2p = DriaP2P::new(
             keypair,
             config.p2p_listen_addr.clone(),
             &available_nodes.bootstrap_nodes,

p2p/src/client.rs

@@ -1,3 +1,4 @@
+use super::*;
 use eyre::Result;
 use libp2p::futures::StreamExt;
 use libp2p::gossipsub::{
@@ -12,10 +13,8 @@ use libp2p_identity::Keypair;
 use std::time::Duration;
 use std::time::Instant;
 
-use super::*;
-
 /// P2P client, exposes a simple interface to handle P2P communication.
-pub struct P2PClient {
+pub struct DriaP2P {
     /// `Swarm` instance, everything is accesses through this one.
     swarm: Swarm<DriaBehaviour>,
     /// Peer count for All and Mesh peers.
@@ -33,7 +32,7 @@ const IDLE_CONNECTION_TIMEOUT_SECS: u64 = 60;
 /// Number of seconds between refreshing the Kademlia DHT.
 const PEER_REFRESH_INTERVAL_SECS: u64 = 30;
 
-impl P2PClient {
+impl DriaP2P {
     /// Creates a new P2P client with the given keypair and listen address.
     pub fn new(
         keypair: Keypair,

p2p/src/lib.rs

@@ -2,14 +2,13 @@ mod behaviour;
 pub use behaviour::{DriaBehaviour, DriaBehaviourEvent};
 
 mod client;
-pub use client::P2PClient;
+pub use client::DriaP2P;
 
 mod versioning;
 pub use versioning::*;
 
-mod data_transform;
+mod transform;
 
 // re-exports
-
 pub use libp2p;
 pub use libp2p_identity;