Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add V2 API endpoint for retrieving node storage location #878

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions shinkai-bin/shinkai-node/src/network/handle_commands_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2109,6 +2109,12 @@ impl Node {
let _ = Node::v2_api_list_wallets(db_clone, wallet_manager_clone, bearer, res).await;
});
}
NodeCommand::V2ApiGetStorageLocation { bearer, res } => {
let db_clone = Arc::clone(&self.db);
tokio::spawn(async move {
let _ = Node::v2_api_get_storage_location(db_clone, bearer, res).await;
});
}
NodeCommand::V2ApiRequestInvoice {
bearer,
tool_key_name,
Expand Down
22 changes: 21 additions & 1 deletion shinkai-bin/shinkai-node/src/network/v2_api/api_v2_commands.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::fs::File;
use std::fs::{File, canonicalize};
use std::io::Write;
use std::{env, sync::Arc};
use std::path::PathBuf;

use async_std::println;
use rusqlite::params;
Expand Down Expand Up @@ -282,6 +283,25 @@ impl Node {
}
}

pub async fn v2_api_get_storage_location(
db: Arc<SqliteManager>,
bearer: String,
res: Sender<Result<String, APIError>>,
) -> Result<(), NodeError> {
// Validate the bearer token
if Self::validate_bearer_token(&bearer, db.clone(), &res).await.is_err() {
return Ok(());
}
let node_storage_path: Option<String> = match env::var("NODE_STORAGE_PATH").ok() {
Some(val) => Some(val),
None => Some("storage".to_string()),
};
let base_path = tokio::fs::canonicalize(node_storage_path.as_ref().unwrap()).await.unwrap();
let _ = res.send(Ok(base_path.to_string_lossy().to_string())).await;

Ok(())
}

pub async fn v2_api_get_default_embedding_model(
db: Arc<SqliteManager>,
bearer: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ pub fn general_routes(
.and(warp::body::json())
.and_then(initial_registration_handler);

let get_storage_location_route = warp::path("storage_location")
.and(warp::get())
.and(with_sender(node_commands_sender.clone()))
.and(warp::header::<String>("authorization"))
.and_then(get_storage_location_handler);

let get_default_embedding_model_route = warp::path("default_embedding_model")
.and(warp::get())
.and(with_sender(node_commands_sender.clone()))
Expand Down Expand Up @@ -206,6 +212,7 @@ pub fn general_routes(
public_keys_route
.or(health_check_route)
.or(initial_registration_route)
.or(get_storage_location_route)
.or(get_default_embedding_model_route)
.or(get_supported_embedding_models_route)
.or(update_default_embedding_model_route)
Expand Down Expand Up @@ -332,6 +339,36 @@ pub async fn initial_registration_handler(
}
}

#[utoipa::path(
get,
path = "/v2/storage_location",
responses(
(status = 200, description = "Successfully retrieved storage location", body = String),
(status = 500, description = "Internal server error", body = APIError),
)
)]
pub async fn get_storage_location_handler(
sender: Sender<NodeCommand>,
authorization: String,
) -> Result<impl warp::Reply, warp::Rejection> {
let bearer = authorization.strip_prefix("Bearer ").unwrap_or("").to_string();
let (res_sender, res_receiver) = async_channel::bounded(1);
sender
.send(NodeCommand::V2ApiGetStorageLocation {
bearer,
res: res_sender,
})
.await
.map_err(|_| warp::reject::reject())?;

let result = res_receiver.recv().await.map_err(|_| warp::reject::reject())?;

match result {
Ok(response) => Ok(warp::reply::json(&json!({ "storage_location": response }))),
Err(error) => Err(warp::reject::custom(error)),
}
}

#[utoipa::path(
get,
path = "/v2/default_embedding_model",
Expand Down
4 changes: 4 additions & 0 deletions shinkai-libs/shinkai-http-api/src/node_commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,10 @@ pub enum NodeCommand {
V2ApiHealthCheck {
res: Sender<Result<serde_json::Value, APIError>>,
},
V2ApiGetStorageLocation {
bearer: String,
res: Sender<Result<String, APIError>>,
},
V2ApiScanOllamaModels {
bearer: String,
res: Sender<Result<Vec<serde_json::Value>, APIError>>,
Expand Down