dttlib 0.7.4__tar.gz → 0.7.5__tar.gz

{dttlib-0.7.4 → dttlib-0.7.5}/Cargo.lock

@@ -1408,7 +1408,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "dtt_macros"
-version = "0.7.4"
+version = "0.7.5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1417,7 +1417,7 @@ dependencies = [
 
 [[package]]
 name = "dttlib"
-version = "0.7.4"
+version = "0.7.5"
 dependencies = [
  "bindgen",
  "dtt_macros",
@@ -2969,7 +2969,7 @@ dependencies = [
 [[package]]
 name = "nds-cache-rs"
 version = "0.1.0"
-source = "git+https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git?tag=dev_13#f7092f72774243e17121648e93ffde1411aebaf0"
+source = "git+https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git?tag=dev_14#86f9f808047a3dc2a807a841e749236065cf5943"
 dependencies = [
  "arrakis",
  "bitcode",
@@ -3008,7 +3008,7 @@ dependencies = [
 
 [[package]]
 name = "nds_test"
-version = "0.7.4"
+version = "0.7.5"
 dependencies = [
  "dttlib",
  "eframe",
@@ -3572,7 +3572,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pipeline_macros"
-version = "0.7.4"
+version = "0.7.5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3581,7 +3581,7 @@ dependencies = [
 
 [[package]]
 name = "pipelines"
-version = "0.7.4"
+version = "0.7.5"
 dependencies = [
  "futures",
  "num-complex",
@@ -4860,7 +4860,7 @@ dependencies = [
 
 [[package]]
 name = "user_messages"
-version = "0.7.4"
+version = "0.7.5"
 dependencies = [
  "log",
  "pretty_env_logger",

{dttlib-0.7.4 → dttlib-0.7.5}/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Erik von Reis <erik.vonreis@ligo.org>"]
 edition = "2024"
 homepage = "https://git.ligo.org/cds/software/cr-tools/dtt_rust"
 repository = "https://git.ligo.org/cds/software/cr-tools/dtt_rust"
-version = "0.7.4"
+version = "0.7.5"
 
 [package]
 name = "dttlib"
@@ -82,7 +82,7 @@ num-rational = {version = "0.4"}
 
 # ligo
 nds2_client_rs = { git="https://git.ligo.org/erik.vonreis/nds_client_rs.git", tag = "dev_c", optional = true }
-nds-cache-rs = { git = "https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git", tag = "dev_13"}
+nds-cache-rs = { git = "https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git", tag = "dev_14"}
 ligo_hires_gps_time = {workspace = true}
 
 # workspace

{dttlib-0.7.4 → dttlib-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dttlib
-Version: 0.7.4
+Version: 0.7.5
 License-File: COPYING
 License-File: COPYING-GPL-3
 Summary: Advanced LIGO core library for online and offline frequency-domain diagnostics tool.

{dttlib-0.7.4 → dttlib-0.7.5}/build.rs

@@ -2,7 +2,6 @@ use std::env;
 use std::path::PathBuf;
 
 fn main() {
-
     //pyo3_build_config::add_extension_module_link_args();
 
     // for debug only
@@ -41,11 +40,13 @@ fn main() {
     //     println!("cargo:rustc-link-lib={}", &python_config.lib_name.as_ref().unwrap());
     // }
 
-    let bindings = bindgen::Builder::default()        
-        .header("wrapper.h")        
+    let bindings = bindgen::Builder::default()
+        .header("wrapper.h")
         .generate()
         .expect("Unable to generate bindings");
 
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
-    bindings.write_to_file(out_path.join("bindings.rs")).expect("Couldn't write bindings");
-}
+    bindings
+        .write_to_file(out_path.join("bindings.rs"))
+        .expect("Couldn't write bindings");
+}

dttlib-0.7.5/cycle.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -x
+
+cmd="timeout $@"
+echo $cmd
+while true
+do
+    $cmd
+    if [[ $? -ne 124 ]]
+    then
+	    break
+    fi
+    sleep 0.1
+    echo "***********************************************"
+done
+

{dttlib-0.7.4 → dttlib-0.7.5}/dtt_macros/src/builder_lite.rs

@@ -1,8 +1,8 @@
 //! create builder functions for every field in a struct
 //! except those with #[no_builder] attribute
-//! 
+//!
 //! # Examples
-//! 
+//!
 //! ```
 //! #[builder_lite]
 //! struct MyStruct {
@@ -14,9 +14,9 @@
 //!     field_d: DontModify
 //! }
 //! ```
-//! 
+//!
 //! expands to
-//! 
+//!
 //! ```
 //! struct MyStruct {
 //!     field_a: i32,
@@ -24,7 +24,7 @@
 //!     field_c: NeedsCustomFunc,
 //!     field_d: DontModify
 //! }
-//! 
+//!
 //! impl MyStruct {
 //!     pub fn with_field_a(mut self, field_a: i32) -> Self {
 //!         self.field_a = field_a;
@@ -40,10 +40,9 @@
 
 use proc_macro::TokenStream;
 use proc_macro2::Ident;
-use quote::{quote, quote_spanned, ToTokens};
-use syn::{ItemStruct, parse_macro_input};
+use quote::{ToTokens, quote, quote_spanned};
 use syn::spanned::Spanned;
-
+use syn::{ItemStruct, parse_macro_input};
 
 // return index into field attributes
 fn find_attribute(attrs: &Vec<syn::Attribute>, attr_name: &str) -> Vec<usize> {
@@ -57,8 +56,7 @@ fn find_attribute(attrs: &Vec<syn::Attribute>, attr_name: &str) -> Vec<usize> {
     indices
 }
 
-
-pub (crate) fn impl_builder_lite(item: TokenStream) -> TokenStream {
+pub(crate) fn impl_builder_lite(item: TokenStream) -> TokenStream {
     let mut strct = parse_macro_input!(item as ItemStruct);
 
     let strct_name = &strct.ident.to_token_stream();
@@ -78,7 +76,8 @@ pub (crate) fn impl_builder_lite(item: TokenStream) -> TokenStream {
 
         let field_name = &field.ident.clone().into_token_stream();
         let field_type = &field.ty.clone().into_token_stream();
-        let func_name = Ident::new(format!("with_{}", field_name).as_str(), field.span()).to_token_stream();
+        let func_name =
+            Ident::new(format!("with_{}", field_name).as_str(), field.span()).to_token_stream();
 
         builder_funcs.extend(quote_spanned! {
             field.ident.span()=>
@@ -94,10 +93,11 @@ pub (crate) fn impl_builder_lite(item: TokenStream) -> TokenStream {
     let struct_body = strct.clone().into_token_stream();
 
     quote! {
-    #struct_body
+        #struct_body
 
-    impl #strct_name {
-            #builder_funcs
+        impl #strct_name {
+                #builder_funcs
+        }
     }
-}.into()
-}
+    .into()
+}

{dttlib-0.7.4 → dttlib-0.7.5}/dtt_macros/src/lib.rs

@@ -1,8 +1,8 @@
 mod builder_lite;
 
 extern crate proc_macro;
-use proc_macro::TokenStream;
 use crate::builder_lite::impl_builder_lite;
+use proc_macro::TokenStream;
 
 /// Does nothing
 /// This macro is needed so that `#[staticmethod]` method attribute used by pyo3 still builds
@@ -53,9 +53,9 @@ pub fn builder_lite(_attr: TokenStream, input: TokenStream) -> TokenStream {
 
 /// Helper attribute for build_lite.
 /// Fields marked with no_builder don't get a builder function.
-/// 
+///
 /// Useful for private fields or fields that need a custom builder.
 #[proc_macro_attribute]
 pub fn no_builder(_attr: TokenStream, input: TokenStream) -> TokenStream {
     input
-}
+}

{dttlib-0.7.4 → dttlib-0.7.5}/pipeline_macros/src/box_async.rs

@@ -1,19 +1,18 @@
 use proc_macro::TokenStream;
 use quote::{quote, quote_spanned};
-use syn::{ItemFn, parse_macro_input, parse_quote, ReturnType,};
 use syn::spanned::Spanned;
+use syn::{ItemFn, ReturnType, parse_macro_input, parse_quote};
 
 //convert synchronous generators with arbitrary return values into async generators
 // with the correct return value
 // Function
-pub (crate) fn impl_box_async(item: TokenStream) -> TokenStream {
+pub(crate) fn impl_box_async(item: TokenStream) -> TokenStream {
     let fun: ItemFn = parse_macro_input!(item as ItemFn);
 
     // try to get the underlying PipeData type
     let ret_type = if let ReturnType::Type(_, bt) = &fun.sig.output {
         *bt.clone()
-    }
-    else {
+    } else {
         return quote_spanned!(
                    fun.sig.output.span() =>
                     compile_error!("A generator function must have an output that is Into<PipeResult<PipeData>>.")
@@ -25,13 +24,13 @@ pub (crate) fn impl_box_async(item: TokenStream) -> TokenStream {
         -> futures::future::BoxFuture<'_, #ret_type >
     );
 
-
     let mut new_sig = fun.sig.clone();
     new_sig.output = new_out;
-    let body = & fun.block;
+    let body = &fun.block;
     quote!(
         #new_sig {
             async move { #body }.boxed()
         }
-    ).into()
+    )
+    .into()
 }

{dttlib-0.7.4 → dttlib-0.7.5}/pipeline_macros/src/derive.rs

@@ -1,13 +1,13 @@
 use proc_macro::TokenStream;
 use proc_macro2::Span;
-use syn::{GenericParam, Generics, ItemStruct, parse_macro_input};
-use syn::Ident;
 use quote::quote;
+use syn::Ident;
 use syn::punctuated::Punctuated;
 use syn::token::{Comma, Gt, Lt};
+use syn::{GenericParam, Generics, ItemStruct, parse_macro_input};
 
 /// create an empty implementation for a flag or super trait
-pub (crate) fn empty_derive(item: TokenStream, tr: &str) -> TokenStream {
+pub(crate) fn empty_derive(item: TokenStream, tr: &str) -> TokenStream {
     let st: ItemStruct = parse_macro_input!(item);
 
     let trait_ident = Ident::new(tr, Span::call_site());
@@ -31,9 +31,9 @@ pub (crate) fn empty_derive(item: TokenStream, tr: &str) -> TokenStream {
                 let mut new_t = t.clone();
                 new_t.bounds.clear();
                 GenericParam::Type(new_t)
-                },
-                    _ => generic.clone(),
-            };
+            }
+            _ => generic.clone(),
+        };
         angle_args.push(new_gp);
     }
 
@@ -46,5 +46,6 @@ pub (crate) fn empty_derive(item: TokenStream, tr: &str) -> TokenStream {
 
     quote!(
         impl #st_gen #trait_ident for #st_id #new_gen {}
-    ).into()
-}
+    )
+    .into()
+}

{dttlib-0.7.4 → dttlib-0.7.5}/pipeline_macros/src/lib.rs

@@ -1,10 +1,10 @@
-mod derive;
 mod box_async;
+mod derive;
 
 extern crate proc_macro;
-use proc_macro::TokenStream;
 use crate::box_async::impl_box_async;
 use crate::derive::empty_derive;
+use proc_macro::TokenStream;
 
 #[proc_macro_derive(StateData)]
 pub fn state_data(input: TokenStream) -> TokenStream {
@@ -21,4 +21,4 @@ pub fn config_data(input: TokenStream) -> TokenStream {
 pub fn box_async(_attr: TokenStream, input: TokenStream) -> TokenStream {
     impl_box_async(input)
     //input
-}
+}

{dttlib-0.7.4 → dttlib-0.7.5}/pipelines/src/accumulator.rs

@@ -6,16 +6,16 @@
 //!
 //! This pipeline will only calculate one value at function call at a time.
 
-use std::sync::Arc;
-use futures::future::BoxFuture;
+use crate::pipe::Pipe1;
+use crate::{PipeData, PipeResult, PipelineOutput, PipelineSubscriber};
 use futures::FutureExt;
+use futures::future::BoxFuture;
+use std::sync::Arc;
 use tokio::runtime::Handle;
-use crate::{PipeData, PipelineOutput, PipelineSubscriber, PipeResult};
-use crate::pipe::Pipe1;
 use user_messages::UserMsgProvider;
 
-
-type AccumGenFn<I, T, U> = fn (Box<dyn UserMsgProvider>, Arc<I>, Option<Arc<T>>, n: f64) -> (Arc<T>, f64, PipeResult<U>);
+type AccumGenFn<I, T, U> =
+    fn(Box<dyn UserMsgProvider>, Arc<I>, Option<Arc<T>>, n: f64) -> (Arc<T>, f64, PipeResult<U>);
 
 /// # Accumulator
 /// a 1-input accumulator produces its new value for each segment as a pipeline output
@@ -27,36 +27,37 @@ pub struct Accumulator<I: PipeData, T: PipeData, U: PipeData> {
     n: f64,
 }
 
-fn accum_generate<I: PipeData, T:PipeData, U: PipeData>(rc: Box<dyn UserMsgProvider>, state: &'_ mut Accumulator<I,T, U>,
-                                           input: PipelineOutput<I>) -> BoxFuture<'_, PipeResult<U>> {
-
+fn accum_generate<I: PipeData, T: PipeData, U: PipeData>(
+    rc: Box<dyn UserMsgProvider>,
+    state: &'_ mut Accumulator<I, T, U>,
+    input: PipelineOutput<I>,
+) -> BoxFuture<'_, PipeResult<U>> {
     async move {
         let g = state.generate_ptr;
         let inp = input.clone();
         let accum_val = state.value.clone();
         let n = state.n;
-        let jh = Handle::current().spawn_blocking(
-            move || {
-                g(rc, inp.value, accum_val, n)
-            }
-        );
+        let jh = Handle::current().spawn_blocking(move || g(rc, inp.value, accum_val, n));
         let (value, new_n, output) = jh.await.unwrap();
         state.n = new_n;
         state.value = Some(value.clone());
         output
-    }.boxed()
+    }
+    .boxed()
 }
 
-
 impl<I: PipeData, T: PipeData, U: PipeData> Accumulator<I, T, U> {
-    pub async fn start(rc: Box<dyn UserMsgProvider>, name: String, input: &PipelineSubscriber<I>,
-                       generate: AccumGenFn<I, T, U>) -> PipelineSubscriber<U> {
+    pub async fn start(
+        rc: Box<dyn UserMsgProvider>,
+        name: String,
+        input: &PipelineSubscriber<I>,
+        generate: AccumGenFn<I, T, U>,
+    ) -> PipelineSubscriber<U> {
         let p = Accumulator {
-            n: 1.0,  // start at 1.  The generator is responsible for incrementing if needed.
+            n: 1.0, // start at 1.  The generator is responsible for incrementing if needed.
             generate_ptr: generate,
             value: None,
         };
-        Pipe1::create(rc, name, accum_generate::<I,T,U>, p, None, None, input).await
+        Pipe1::create(rc, name, accum_generate::<I, T, U>, p, None, None, input).await
     }
 }
-

{dttlib-0.7.4 → dttlib-0.7.5}/pipelines/src/complex.rs

@@ -1,7 +1,6 @@
 //! complex numbers defined here, because they must be made PipeData
 
-
-use num_complex::{Complex64, Complex32};
+use num_complex::{Complex32, Complex64};
 
 /// # Complex type aliases
 /// c128 is 128 bits long, represented by two 64-bit floats