Skip to content
Merged
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
3 changes: 3 additions & 0 deletions crates/ov_cli/src/commands/content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub async fn read(
client: &HttpClient,
uri: &str,
_output_format: OutputFormat,
_compact: bool,
) -> Result<()> {
let content = client.read(uri).await?;
println!("{}", content);
Expand All @@ -16,6 +17,7 @@ pub async fn abstract_content(
client: &HttpClient,
uri: &str,
_output_format: OutputFormat,
_compact: bool,
) -> Result<()> {
let content = client.abstract_content(uri).await?;
println!("{}", content);
Expand All @@ -26,6 +28,7 @@ pub async fn overview(
client: &HttpClient,
uri: &str,
_output_format: OutputFormat,
_compact: bool,
) -> Result<()> {
let content = client.overview(uri).await?;
println!("{}", content);
Expand Down
12 changes: 9 additions & 3 deletions crates/ov_cli/src/commands/filesystem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,29 @@ pub async fn ls(
simple: bool,
recursive: bool,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.ls(uri, simple, recursive).await?;
output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}

pub async fn tree(
client: &HttpClient,
uri: &str,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.tree(uri).await?;
output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}

pub async fn mkdir(
client: &HttpClient,
uri: &str,
_output_format: OutputFormat,
_compact: bool,
) -> Result<()> {
client.mkdir(uri).await?;
println!("Directory created: {}", uri);
Expand All @@ -39,6 +42,7 @@ pub async fn rm(
uri: &str,
recursive: bool,
_output_format: OutputFormat,
_compact: bool,
) -> Result<()> {
client.rm(uri, recursive).await?;
println!("Removed: {}", uri);
Expand All @@ -50,6 +54,7 @@ pub async fn mv(
from_uri: &str,
to_uri: &str,
_output_format: OutputFormat,
_compact: bool,
) -> Result<()> {
client.mv(from_uri, to_uri).await?;
println!("Moved: {} -> {}", from_uri, to_uri);
Expand All @@ -60,8 +65,9 @@ pub async fn stat(
client: &HttpClient,
uri: &str,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.stat(uri).await?;
output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}
12 changes: 8 additions & 4 deletions crates/ov_cli/src/commands/observer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,39 @@ use crate::output::{output_success, OutputFormat};
pub async fn queue(
client: &HttpClient,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let response: serde_json::Value = client.get("/api/v1/observer/queue", &[]).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

pub async fn vikingdb(
client: &HttpClient,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let response: serde_json::Value = client.get("/api/v1/observer/vikingdb", &[]).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

pub async fn vlm(
client: &HttpClient,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let response: serde_json::Value = client.get("/api/v1/observer/vlm", &[]).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

pub async fn system(
client: &HttpClient,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let response: serde_json::Value = client.get("/api/v1/observer/system", &[]).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}
6 changes: 4 additions & 2 deletions crates/ov_cli/src/commands/pack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ pub async fn export(
uri: &str,
to: &str,
format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.export_ovpack(uri, to).await?;
output_success(&result, format, false);
output_success(&result, format, compact);
Ok(())
}

Expand All @@ -20,11 +21,12 @@ pub async fn import(
force: bool,
no_vectorize: bool,
format: OutputFormat,
compact: bool,
) -> Result<()> {
let vectorize = !no_vectorize;
let result = client
.import_ovpack(file_path, target, force, vectorize)
.await?;
output_success(&result, format, false);
output_success(&result, format, compact);
Ok(())
}
13 changes: 8 additions & 5 deletions crates/ov_cli/src/commands/relations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ pub async fn list_relations(
client: &HttpClient,
uri: &str,
format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.relations(uri).await?;
output_success(&result, format, false);
output_success(&result, format, compact);
Ok(())
}

Expand All @@ -18,6 +19,7 @@ pub async fn link(
to_uris: &Vec<String>,
reason: &str,
format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.link(from_uri, to_uris, reason).await?;
// If the server returns null/empty, show a confirmation summary
Expand All @@ -27,9 +29,9 @@ pub async fn link(
"to": to_uris,
"reason": reason,
});
output_success(&summary, format, false);
output_success(&summary, format, compact);
} else {
output_success(&result, format, false);
output_success(&result, format, compact);
}
Ok(())
}
Expand All @@ -39,16 +41,17 @@ pub async fn unlink(
from_uri: &str,
to_uri: &str,
format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.unlink(from_uri, to_uri).await?;
if result.is_null() {
let summary = serde_json::json!({
"from": from_uri,
"to": to_uri,
});
output_success(&summary, format, false);
output_success(&summary, format, compact);
} else {
output_success(&result, format, false);
output_success(&result, format, compact);
}
Ok(())
}
6 changes: 4 additions & 2 deletions crates/ov_cli/src/commands/resources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ pub async fn add_resource(
wait: bool,
timeout: Option<f64>,
format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client
.add_resource(path, to, &reason, &instruction, wait, timeout)
.await?;
output_success(&result, format, false);
output_success(&result, format, compact);
Ok(())
}

Expand All @@ -25,8 +26,9 @@ pub async fn add_skill(
wait: bool,
timeout: Option<f64>,
format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.add_skill(data, wait, timeout).await?;
output_success(&result, format, false);
output_success(&result, format, compact);
Ok(())
}
12 changes: 8 additions & 4 deletions crates/ov_cli/src/commands/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ pub async fn find(
limit: i32,
threshold: Option<f64>,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.find(query.to_string(), uri.to_string(), limit, threshold).await?;
output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}

Expand All @@ -23,9 +24,10 @@ pub async fn search(
limit: i32,
threshold: Option<f64>,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.search(query.to_string(), uri.to_string(), session_id, limit, threshold).await?;
output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}

Expand All @@ -35,9 +37,10 @@ pub async fn grep(
pattern: &str,
ignore_case: bool,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.grep(uri, pattern, ignore_case).await?;
output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}

Expand All @@ -46,8 +49,9 @@ pub async fn glob(
pattern: &str,
uri: &str,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let result = client.glob(pattern, uri).await?;
output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}
18 changes: 12 additions & 6 deletions crates/ov_cli/src/commands/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,40 @@ use serde_json::json;
pub async fn new_session(
client: &HttpClient,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let response: serde_json::Value = client.post("/api/v1/sessions", &json!({})).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

pub async fn list_sessions(
client: &HttpClient,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let response: serde_json::Value = client.get("/api/v1/sessions", &[]).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

pub async fn get_session(
client: &HttpClient,
session_id: &str,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let path = format!("/api/v1/sessions/{}", url_encode(session_id));
let response: serde_json::Value = client.get(&path, &[]).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

pub async fn delete_session(
client: &HttpClient,
session_id: &str,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let path = format!("/api/v1/sessions/{}", url_encode(session_id));
let response: serde_json::Value = client.delete(&path, &[]).await?;
Expand All @@ -47,7 +51,7 @@ pub async fn delete_session(
response
};

output_success(&result, output_format, false);
output_success(&result, output_format, compact);
Ok(())
}

Expand All @@ -57,6 +61,7 @@ pub async fn add_message(
role: &str,
content: &str,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let path = format!("/api/v1/sessions/{}/messages", url_encode(session_id));
let body = json!({
Expand All @@ -65,18 +70,19 @@ pub async fn add_message(
});

let response: serde_json::Value = client.post(&path, &body).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

pub async fn commit_session(
client: &HttpClient,
session_id: &str,
output_format: OutputFormat,
compact: bool,
) -> Result<()> {
let path = format!("/api/v1/sessions/{}/commit", url_encode(session_id));
let response: serde_json::Value = client.post(&path, &json!({})).await?;
output_success(&response, output_format, false);
output_success(&response, output_format, compact);
Ok(())
}

Expand Down
Loading
Loading