add steps total / earned info

Author: erhant

compute/src/node/diagnostic.rs

@@ -31,9 +31,10 @@ impl DriaComputeNode {
 
         // print steps
         if let Ok(steps) = get_steps(&self.config.address).await {
+            let earned = steps.score - self.initial_steps;
             diagnostics.push(format!(
-                "Steps: {} (top {}%)",
-                steps.score, steps.percentile
+                "Steps: {} total (+{} this run), within top {}%",
+                steps.score, earned, steps.percentile
             ));
         }
 

compute/src/node/mod.rs

@@ -13,7 +13,7 @@ use tokio::{sync::mpsc, time::Instant};
 use crate::{
     config::*,
     gossipsub::*,
-    utils::{crypto::secret_to_keypair, refresh_dria_nodes, SpecCollector},
+    utils::{crypto::secret_to_keypair, get_steps, refresh_dria_nodes, SpecCollector},
     workers::task::{TaskWorker, TaskWorkerInput, TaskWorkerMetadata, TaskWorkerOutput},
 };
 
@@ -56,6 +56,8 @@ pub struct DriaComputeNode {
     completed_tasks_batch: usize,
     /// Specifications collector.
     spec_collector: SpecCollector,
+    /// Initial steps count.
+    initial_steps: u64,
 }
 
 impl DriaComputeNode {
@@ -114,6 +116,12 @@ impl DriaComputeNode {
         };
 
         let model_names = config.workflows.get_model_names();
+
+        let initial_steps = get_steps(&config.address)
+            .await
+            .map(|s| s.score)
+            .unwrap_or_default();
+
         Ok((
             DriaComputeNode {
                 config,
@@ -132,6 +140,7 @@ impl DriaComputeNode {
                 completed_tasks_single: 0,
                 completed_tasks_batch: 0,
                 // others
+                initial_steps,
                 spec_collector: SpecCollector::new(model_names),
                 last_pinged_at: Instant::now(),
             },

compute/src/utils/steps.rs

@@ -1,16 +1,34 @@
 use eyre::Context;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 const STEPS_API_BASE_URL: &str = "https://dkn.dria.co/dashboard/supply/v0/leaderboard/steps";
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct StepsScore {
+    #[serde(deserialize_with = "deserialize_percentile")]
     /// Indicates in which top percentile your steps are.
-    pub percentile: String,
+    pub percentile: u64,
     /// The total number of steps you have accumulated.
     pub score: u64,
 }
 
+// the API returns a stringified number due to frontend issues, so we need to parse it
+fn deserialize_percentile<'de, D>(deserializer: D) -> Result<u64, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let s: String = String::deserialize(deserializer)?;
+    let parsed = s.parse().map_err(serde::de::Error::custom)?;
+
+    if parsed > 100 {
+        return Err(serde::de::Error::custom(
+            "percentile must be between 0 and 100",
+        ));
+    }
+
+    Ok(parsed)
+}
+
 /// Returns the steps for the given address.
 pub async fn get_steps(address: &str) -> eyre::Result<StepsScore> {
     // the address can have 0x or not, we add it ourselves here