From 729b45f52afed33f7c644f9cb149a0f05b993647 Mon Sep 17 00:00:00 2001
From: brotoskyj <jbrotosky@gmail.com>
Date: Thu, 18 Dec 2025 10:14:58 -0500
Subject: [PATCH] Features - Optional Policy Name in Execution Histories closes
 #48

---
 airlock_libs/Cargo.lock      |  2 +-
 airlock_libs/Cargo.toml      |  2 +-
 airlock_libs/pyproject.toml  |  2 +-
 airlock_libs/src/services.rs | 29 ++++++++++++++++++++---------
 requirements.txt             |  2 +-
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/airlock_libs/Cargo.lock b/airlock_libs/Cargo.lock
index 391d9b4..d263687 100644
--- a/airlock_libs/Cargo.lock
+++ b/airlock_libs/Cargo.lock
@@ -26,7 +26,7 @@ dependencies = [
 
 [[package]]
 name = "airlock_libs"
-version = "6.2.0"
+version = "7.0.0"
 dependencies = [
  "chrono",
  "crossbeam",
diff --git a/airlock_libs/Cargo.toml b/airlock_libs/Cargo.toml
index 888c19c..2e6b4f0 100644
--- a/airlock_libs/Cargo.toml
+++ b/airlock_libs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "airlock_libs"
-version = "6.2.0"
+version = "7.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/airlock_libs/pyproject.toml b/airlock_libs/pyproject.toml
index 1c2fcd2..95fce4f 100644
--- a/airlock_libs/pyproject.toml
+++ b/airlock_libs/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "airlock_libs"
-version = "6.2.0"
+version = "7.0.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 3ddcf1e..657f9b3 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<PyAny>,
-    policy_names: String,
+    policy_names: Option<String>,
     exec_types: String,
     days: i64,
 ) -> Py<PyString> {
@@ -73,9 +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/cyan}] {pos}/{len} - Current Policy: {msg}")
-                .unwrap()
-                .progress_chars("#> ")
+                .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<Client, reqwest::Error> = build_client(headers);
@@ -109,7 +108,6 @@ pub fn pull_policy_exec_histories(
             Local::now().naive_local() - chrono::Duration::days(days);
         let (tx, rx) = unbounded::<Vec<Group>>();
         let pb_clone = progress_bar.clone();
-        pb_clone.lock().unwrap().set_message(policy_names.clone());
         thread::spawn(move || {
             let mut seen: HashMap<(String, String, String), Group> = if writeable_filepath.exists()
             {
@@ -181,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(
@@ -261,16 +268,20 @@ async fn history_logging(
     base_url: &String,
     exec_types: &String,
     checkpoint_number: &String,
-    policy_names: &String,
+    policy_names: &Option<String>,
     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<reqwest::Response, reqwest::Error> = client
         .post(format!("{}/v1/logging/exechistories", base_url))
diff --git a/requirements.txt b/requirements.txt
index 83a2071..0357766 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.2.0
\ No newline at end of file
+airlock_libs==7.0.0
\ No newline at end of file