Fix a bug in dash client

ulagbulag · Sep 20, 2023 · 7284db8 · 7284db8
1 parent e5be876
commit 7284db8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/dash/client/Cargo.toml b/dash/client/Cargo.toml
@@ -22,5 +22,6 @@ vine-api = { path = "../../vine/api" }
 
 anyhow = { workspace = true }
 reqwest = { workspace = true }
+schemars = { workspace = true }
 serde = { workspace = true, features = [] }
 serde_json = { workspace = true }
diff --git a/dash/client/src/lib.rs b/dash/client/src/lib.rs
@@ -6,7 +6,8 @@ use ark_core::result::Result as SessionResult;
 use dash_api::{function::FunctionCrd, job::DashJobCrd, model::ModelCrd};
 use dash_provider_api::job::Payload;
 use reqwest::{Client, Method, Url};
-use serde::{de::DeserializeOwned, Serialize};
+use schemars::JsonSchema;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 use vine_api::user_session::{UserSessionCommandBatch, UserSessionRef};
 
@@ -50,7 +51,7 @@ impl DashClient {
         self.get(format!("/function/{name}/")).await
     }
 
-    pub async fn get_function_list(&self) -> Result<Vec<String>> {
+    pub async fn get_function_list(&self) -> Result<ObjectRef> {
         self.get("/function/").await
     }
 }
@@ -104,7 +105,7 @@ impl DashClient {
         self.get(format!("/model/{name}/function/")).await
     }
 
-    pub async fn get_model_list(&self) -> Result<Vec<String>> {
+    pub async fn get_model_list(&self) -> Result<ObjectRef> {
         self.get("/model/").await
     }
 
@@ -205,3 +206,12 @@ impl DashClient {
         url
     }
 }
+
+#[derive(
+    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
+)]
+#[serde(rename_all = "camelCase")]
+pub struct ObjectRef {
+    pub name: String,
+    pub namespace: String,
+}