diff --git a/airlock_libs/Cargo.lock b/airlock_libs/Cargo.lock index e2386f3..eaaadaa 100644 --- a/airlock_libs/Cargo.lock +++ b/airlock_libs/Cargo.lock @@ -26,7 +26,7 @@ dependencies = [ [[package]] name = "airlock_libs" -version = "6.1.1" +version = "7.1.0" dependencies = [ "chrono", "crossbeam", diff --git a/airlock_libs/Cargo.toml b/airlock_libs/Cargo.toml index cf49ac1..4833a01 100644 --- a/airlock_libs/Cargo.toml +++ b/airlock_libs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "airlock_libs" -version = "6.1.1" +version = "7.1.0" edition = "2024" [dependencies] diff --git a/airlock_libs/pyproject.toml b/airlock_libs/pyproject.toml index 5ed6be4..aee7519 100644 --- a/airlock_libs/pyproject.toml +++ b/airlock_libs/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "airlock_libs" -version = "6.1.1" +version = "7.1.0" description = "Airlock Digital API Wrapper" readme = "README.md" license = { text = "AGPL-3.0-only" } diff --git a/airlock_libs/src/services.rs b/airlock_libs/src/services.rs index c567f41..767598d 100644 --- a/airlock_libs/src/services.rs +++ b/airlock_libs/src/services.rs @@ -5,7 +5,7 @@ use crate::prelude::*; pub fn pull_policy_exec_histories( py: Python<'_>, py_self: Py, - policy_names: String, + policy_names: Option, exec_types: String, days: i64, ) -> Py { @@ -73,8 +73,8 @@ pub fn pull_policy_exec_histories( .set_draw_target(ProgressDrawTarget::stderr()); progress_bar.lock().unwrap().set_style( ProgressStyle::default_bar() - .template("Total Completion: {spinner:.green} [{elapsed_precise}] [{bar:40.green/blue}] {pos}/{len} {message}") - .unwrap(), + .template("Total - Policy Name: {msg}: {spinner:.green} [{elapsed_precise}] [{bar:40.green/blue}] {pos}/{len}") + .unwrap().progress_chars("⣿⣦⣀") ); let client: Client = tracer.in_span("Building HTTP Client", |cx| { let client_result: Result = build_client(headers); @@ -179,9 +179,18 @@ pub fn pull_policy_exec_histories( .lock() .unwrap() .enable_steady_tick(std::time::Duration::from_millis(100)); + pb_clone + .lock() + .unwrap() + .set_message(policy_names.clone().unwrap_or("Statistics".to_string())); let span: opentelemetry::trace::SpanRef<'_> = cx.span(); span.set_attribute(KeyValue::new("Days", days.to_string())); - span.set_attribute(KeyValue::new("Policy Name", policy_names.clone())); + span.set_attribute(KeyValue::new( + "Policy Name", + policy_names + .clone() + .unwrap_or("Statistics Monitoring".to_string()), + )); loop { let execution_histories = tracer.in_span(checkpoint_number.to_string(), |cx| { let results: ApiResponse = history_logging( @@ -259,16 +268,20 @@ async fn history_logging( base_url: &String, exec_types: &String, checkpoint_number: &String, - policy_names: &String, + policy_names: &Option, client: &Client, ) -> ApiResponse { + let policy_json = match policy_names { + Some(name) => format!(r#"[ "{}" ]"#, name), // JSON array with one element + None => "[]".to_string(), // Empty JSON array + }; let payload = format!( r#"{{ "type": {}, "checkpoint": "{}", - "policy": ["{}"] + "policy": {} }}"#, - exec_types, checkpoint_number, policy_names + exec_types, checkpoint_number, policy_json ); let res: Result = client .post(format!("{}/v1/logging/exechistories", base_url)) diff --git a/requirements.txt b/requirements.txt index 30d5f35..6862175 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,4 @@ pyperclip==1.11.0 # Custom/Private packages --extra-index-url https://git.racooncity.org/api/packages/brotoskyj/pypi/simple/ -airlock_libs==6.1.1 \ No newline at end of file +airlock_libs==7.1.0 \ No newline at end of file