points api fix, rm old test

Author: erhant

Cargo.lock

@@ -7,7 +7,7 @@ default-members = ["compute"]
 
 [workspace.package]
 edition = "2021"
-version = "0.5.3"
+version = "0.5.4"
 license = "Apache-2.0"
 readme = "README.md"
 

Cargo.toml

@@ -138,7 +138,7 @@ impl DriaComputeNode {
                     "$DRIA Points".purple(),
                     steps.score,
                     steps.score - self.points_client.initial,
-                    steps.percentile.unwrap_or("100".to_string())
+                    steps.percentile
                 );
             }
             Err(err) => {

compute/src/node/diagnostic.rs

@@ -1,9 +1,6 @@
 use eyre::Context;
 
-/// Points URL, use with an `address` query parameter.
-const POINTS_API_BASE_URL: &str =
-    "https://mainnet.dkn.dria.co/dashboard/supply/v0/leaderboard/steps";
-// TODO: support testnet here?
+const POINTS_API_BASE_URL: &str = "https://mainnet.dkn.dria.co/points/v0/total/node/";
 
 pub struct DriaPointsClient {
     pub url: String,
@@ -12,13 +9,21 @@ pub struct DriaPointsClient {
     pub initial: f64,
 }
 
+#[derive(Debug, serde::Deserialize)]
+pub struct DriaPoints {
+    /// Indicates in which top percentile your points are.
+    pub percentile: usize,
+    /// The total number of points you have accumulated.
+    pub score: f64,
+}
+
 impl DriaPointsClient {
     /// Creates a new `DriaPointsClient` for the given address.
     pub fn new(address: &str) -> eyre::Result<Self> {
         const USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
 
         let url = format!(
-            "{}?address=0x{}",
+            "{}/0x{}",
             POINTS_API_BASE_URL,
             address.trim_start_matches("0x")
         );
@@ -55,26 +60,15 @@ impl DriaPointsClient {
     }
 }
 
-#[derive(Debug, serde::Deserialize)]
-pub struct DriaPoints {
-    /// Indicates in which top percentile your points are.
-    ///
-    /// TODO: can be number in API
-    /// TODO: API sometimes returns `null` here?
-    pub percentile: Option<String>,
-    /// The total number of points you have accumulated.
-    pub score: f64,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[tokio::test]
-    #[ignore = "waiting for API"]
     async fn test_get_points() {
         let client = DriaPointsClient::new("0xa43536a6032a3907ccf60e8109429ee1047b207c").unwrap();
         let steps = client.get_points().await.unwrap();
-        assert!(steps.score != 0.0);
+        assert!(steps.score >= 0.0);
+        assert!(steps.percentile <= 100);
     }
 }

compute/src/utils/points.rs

@@ -249,21 +249,4 @@ mod tests {
             "Should not find anything for inexisting model"
         );
     }
-
-    #[test]
-    #[ignore = "TODO: fix this test"]
-    fn test_get_any_matching_model() {
-        let cfg = DriaWorkflowsConfig::new_from_csv("gpt-4o-mini,llama3.2:1b-instruct-q4_K_M");
-        let result = cfg.get_any_matching_model(vec![
-            "i-dont-exist".to_string(),
-            "llama3.1:latest".to_string(),
-            "gpt-4o".to_string(),
-            "ollama".to_string(),
-        ]);
-        assert_eq!(
-            result.unwrap(),
-            Model::Llama3_2_1bInstructQ4Km,
-            "Should find existing model"
-        );
-    }
 }

workflows-v2/src/config.rs

@@ -279,7 +279,7 @@ mod tests {
 
     #[test]
     fn test_get_any_matching_model() {
-        let cfg = DriaWorkflowsConfig::new_from_csv("gpt-4o,llama3.1:8b-instruct-q4_K_M");
+        let cfg = DriaWorkflowsConfig::new_from_csv("gpt-4o,aaabbbccc");
         let result = cfg.get_any_matching_model(vec![
             "i-dont-exist".to_string(),
             "gpt-4o".to_string(),