Merge pull request 'RustImplementation' (#49) from RustImplementation into master

Reviewed-on: brotoskyj/AirlockTools#49

airlock_libs/Cargo.lock

@@ -26,7 +26,7 @@ dependencies = [
 
 [[package]]
 name = "airlock_libs"
-version = "7.1.0"
+version = "6.1.1"
 dependencies = [
  "chrono",
  "crossbeam",

airlock_libs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "airlock_libs"
-version = "7.1.0"
+version = "6.1.1"
 edition = "2024"
 
 [dependencies]

airlock_libs/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "airlock_libs"
-version = "7.1.0"
+version = "6.1.1"
 description = "Airlock Digital API Wrapper"
 readme = "README.md"
 license = { text = "AGPL-3.0-only" }

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: Option<String>,
+    policy_names: String,
     exec_types: String,
     days: i64,
 ) -> Py<PyString> {
@@ -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 - Policy Name: {msg}: {spinner:.green} [{elapsed_precise}] [{bar:40.green/blue}] {pos}/{len}")
-                .unwrap().progress_chars("⣿⣦⣀")
+                .template("Total Completion: {spinner:.green} [{elapsed_precise}] [{bar:40.green/blue}] {pos}/{len} {message}")
+                .unwrap(),
         );
         let client: Client = tracer.in_span("Building HTTP Client", |cx| {
             let client_result: Result<Client, reqwest::Error> = build_client(headers);
@@ -179,18 +179,9 @@ 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()
-                    .unwrap_or("Statistics Monitoring".to_string()),
-            ));
+            span.set_attribute(KeyValue::new("Policy Name", policy_names.clone()));
             loop {
                 let execution_histories = tracer.in_span(checkpoint_number.to_string(), |cx| {
                     let results: ApiResponse = history_logging(
@@ -268,20 +259,16 @@ async fn history_logging(
     base_url: &String,
     exec_types: &String,
     checkpoint_number: &String,
-    policy_names: &Option<String>,
+    policy_names: &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_json
+        exec_types, checkpoint_number, policy_names
     );
     let res: Result<reqwest::Response, reqwest::Error> = client
         .post(format!("{}/v1/logging/exechistories", base_url))

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==7.1.0
+airlock_libs==6.1.1