added more specs info

Author: erhant

compute/src/node/mod.rs

@@ -126,6 +126,7 @@ impl DriaComputeNode {
             .map(|s| s.score)
             .unwrap_or_default();
 
+        let spec_collector = SpecCollector::new(model_names.clone(), config.version);
         Ok((
             DriaComputeNode {
                 config,
@@ -149,7 +150,7 @@ impl DriaComputeNode {
                 num_heartbeats: 0,
                 // specs
                 specs_reqs: HashSet::new(),
-                spec_collector: SpecCollector::new(model_names),
+                spec_collector,
             },
             p2p_client,
             task_batch_worker,

compute/src/reqres/specs.rs

@@ -27,7 +27,7 @@ impl SpecRequester {
         let specs_request = SpecsRequest {
             specs_id: uuid,
             specs,
-            models: node.config.workflows.get_model_names(), // FIXME: we have these in specs already?
+            address: node.config.address.clone(),
         };
 
         let specs_message = node.new_message(

compute/src/utils/specs.rs

@@ -1,4 +1,4 @@
-use dkn_utils::payloads::Specs;
+use dkn_utils::{payloads::Specs, SemanticVersion};
 use sysinfo::{CpuRefreshKind, MemoryRefreshKind, RefreshKind};
 
 pub struct SpecCollector {
@@ -7,21 +7,24 @@ pub struct SpecCollector {
     system: sysinfo::System,
     /// Used models.
     models: Vec<String>,
+    /// Version string.
+    version: String,
     // GPU adapter infos, showing information about the available GPUs.
     // gpus: Vec<wgpu::AdapterInfo>,
 }
 
-impl Default for SpecCollector {
-    fn default() -> Self {
-        Self::new(vec![])
-    }
-}
+// impl Default for SpecCollector {
+//     fn default() -> Self {
+//         Self::new(vec![], SemanticVersion::default())
+//     }
+// }
 
 impl SpecCollector {
-    pub fn new(models: Vec<String>) -> Self {
+    pub fn new(models: Vec<String>, version: SemanticVersion) -> Self {
         SpecCollector {
             system: sysinfo::System::new_with_specifics(Self::get_refresh_specifics()),
             models,
+            version: version.to_string(),
             // gpus: wgpu::Instance::default()
             //     .enumerate_adapters(wgpu::Backends::all())
             //     .into_iter()
@@ -51,6 +54,7 @@ impl SpecCollector {
             arch: std::env::consts::ARCH.to_string(),
             lookup: public_ip_address::perform_lookup(None).await.ok(),
             models: self.models.clone(),
+            version: self.version.clone(),
             // gpus: self.gpus.clone(),
         }
     }
@@ -61,7 +65,14 @@ mod tests {
 
     #[tokio::test]
     async fn test_print_specs() {
-        let mut spec_collector = SpecCollector::new(vec!["gpt-4o".to_string()]);
+        let mut spec_collector = SpecCollector::new(
+            vec!["gpt-4o".to_string()],
+            SemanticVersion {
+                major: 0,
+                minor: 1,
+                patch: 0,
+            },
+        );
         let specs = spec_collector.collect().await;
         assert!(specs.total_mem > 0);
         assert!(specs.free_mem > 0);
@@ -70,5 +81,7 @@ mod tests {
         assert!(!specs.os.is_empty());
         assert!(!specs.arch.is_empty());
         assert!(specs.lookup.is_some());
+        assert!(!specs.models.is_empty());
+        assert_eq!(specs.version, "0.1.0");
     }
 }

utils/src/payloads/specs.rs

@@ -8,10 +8,11 @@ pub const SPECS_TOPIC: &str = "specs";
 pub struct SpecsRequest {
     /// UUID of the specs request, prevents replays.
     pub specs_id: Uuid,
-    /// Node specs, flattened during serialization.
+    /// Node specs.
     pub specs: Specs,
-    /// Model names available in the node.
-    pub models: Vec<String>,
+    /// Address of the node, used by frontend etc.
+    /// instead of using the peer id.
+    pub address: String,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -20,7 +21,6 @@ pub struct SpecsResponse {
     pub specs_id: Uuid,
 }
 
-/// Machine info & location.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Specs {
     /// Total memory in bytes
@@ -37,8 +37,10 @@ pub struct Specs {
     pub arch: String,
     /// Public IP lookup response.
     pub lookup: Option<public_ip_address::response::LookupResponse>,
-    /// Used models.
+    /// Models server by this node.
     pub models: Vec<String>,
+    /// Node version, e.g. `0.1.0`.
+    pub version: String,
     // GPU adapter infos, showing information about the available GPUs.
     // gpus: Vec<wgpu::AdapterInfo>,
 }