From 98bb01118395d53f80598f07ee2ecbdcafa0bb9d Mon Sep 17 00:00:00 2001 From: Ian Later Date: Fri, 13 Nov 2026 14:49:06 -0800 Subject: [PATCH 1/2] rust(feat): keep a run open across file imports `import` accepts `--leave-run-open`. A finished import marks its run stopped unless the flag is set. The import docs point at one Python call when several files share a run. --- rust/crates/sift_cli/CHANGELOG.md | 4 +++ .../assets/docs/src/data/import-csv.md | 3 +++ .../assets/docs/src/data/import-mcap.md | 3 +++ .../assets/docs/src/data/import-tdms.md | 3 +++ .../assets/docs/src/data/import-ulog.md | 3 +++ .../assets/docs/src/data/importing.md | 27 +++++++++++++++++++ rust/crates/sift_cli/src/cli/mod.rs | 18 +++++++++++++ rust/crates/sift_cli/src/cmd/import/csv.rs | 6 +++++ .../sift_cli/src/cmd/import/hdf5/import.rs | 9 +++++-- .../sift_cli/src/cmd/import/hdf5/tests.rs | 1 + .../sift_cli/src/cmd/import/mcap/import.rs | 9 +++++-- .../sift_cli/src/cmd/import/mcap/tests.rs | 1 + .../import/parquet/channel_per_row_dataset.rs | 1 + .../src/cmd/import/parquet/flat_dataset.rs | 1 + .../sift_cli/src/cmd/import/parquet/tests.rs | 2 ++ .../src/cmd/import/tdms/detect_tdms_config.rs | 9 +++++-- .../sift_cli/src/cmd/import/tdms/tests.rs | 1 + .../sift_cli/src/cmd/import/ulog/import.rs | 9 +++++-- .../sift_cli/src/cmd/import/ulog/tests.rs | 1 + 19 files changed, 103 insertions(+), 8 deletions(-) diff --git a/rust/crates/sift_cli/CHANGELOG.md b/rust/crates/sift_cli/CHANGELOG.md index d72ad12397..e32cb2ce21 100644 --- a/rust/crates/sift_cli/CHANGELOG.md +++ b/rust/crates/sift_cli/CHANGELOG.md @@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### What's New +- `import` accepts `--leave-run-open`. A finished import marks its run stopped + and fires run-stop automations unless the flag is set. Stop the run after + the last import. The flag does nothing when the import has no run. + ## [v0.9.0] - November 16, 2026 ### What's New diff --git a/rust/crates/sift_cli/assets/docs/src/data/import-csv.md b/rust/crates/sift_cli/assets/docs/src/data/import-csv.md index e63171df6c..fbfe8a184f 100644 --- a/rust/crates/sift_cli/assets/docs/src/data/import-csv.md +++ b/rust/crates/sift_cli/assets/docs/src/data/import-csv.md @@ -32,6 +32,9 @@ sift-cli import csv ./telemetry.csv \ --wait ``` +If you have more than one file for that run, import them together. See +[Several files in one run](./importing.md#several-files-in-one-run). + ## Pointing at the right rows and time column If your file has metadata rows above the header, or the timestamp is not the diff --git a/rust/crates/sift_cli/assets/docs/src/data/import-mcap.md b/rust/crates/sift_cli/assets/docs/src/data/import-mcap.md index c666949ae7..6dadaef198 100644 --- a/rust/crates/sift_cli/assets/docs/src/data/import-mcap.md +++ b/rust/crates/sift_cli/assets/docs/src/data/import-mcap.md @@ -27,6 +27,9 @@ sift-cli import mcap ./recording.mcap \ --wait ``` +If you have more than one file for that run, import them together. See +[Several files in one run](./importing.md#several-files-in-one-run). + ## Previewing the detected channels `--preview` (`-p`) parses the file locally and prints the channels the import diff --git a/rust/crates/sift_cli/assets/docs/src/data/import-tdms.md b/rust/crates/sift_cli/assets/docs/src/data/import-tdms.md index c1de6ca6a7..a6bcc3f118 100644 --- a/rust/crates/sift_cli/assets/docs/src/data/import-tdms.md +++ b/rust/crates/sift_cli/assets/docs/src/data/import-tdms.md @@ -23,6 +23,9 @@ sift-cli import tdms ./measurement.tdms \ --wait ``` +If you have more than one file for that run, import them together. See +[Several files in one run](./importing.md#several-files-in-one-run). + ## Channels with missing timing When a channel lacks timing metadata, choose how the CLI should respond with diff --git a/rust/crates/sift_cli/assets/docs/src/data/import-ulog.md b/rust/crates/sift_cli/assets/docs/src/data/import-ulog.md index d313c8a17f..b26e592f45 100644 --- a/rust/crates/sift_cli/assets/docs/src/data/import-ulog.md +++ b/rust/crates/sift_cli/assets/docs/src/data/import-ulog.md @@ -24,6 +24,9 @@ sift-cli import ulog ./flight.ulg \ --wait ``` +If you have more than one file for that run, import them together. See +[Several files in one run](./importing.md#several-files-in-one-run). + ## Anchoring timestamps ULog records boot-relative timestamps. The import anchors them to UTC using diff --git a/rust/crates/sift_cli/assets/docs/src/data/importing.md b/rust/crates/sift_cli/assets/docs/src/data/importing.md index 9ef21c1e7b..4a398f3988 100644 --- a/rust/crates/sift_cli/assets/docs/src/data/importing.md +++ b/rust/crates/sift_cli/assets/docs/src/data/importing.md @@ -53,6 +53,33 @@ queryable immediately afterward. sift-cli import csv ./telemetry.csv --asset rover-1 --wait ``` +### Several files in one run + +If the files are available together, import them in one call from the Python +client. Pass the paths to `client.data_import.import_from_path` or +`Run.import_data`. That upload is one import into one run. + +```python +client.data_import.import_from_path( + ["part-1.csv", "part-2.csv"], + asset="rover-1", + run_name="sortie-4", +) +``` + +Pass a mapping of path to config when a file needs a column mapping or +channel list you set. Files you leave out of the mapping are detected. + +The CLI imports one file per command. When a later file is not available yet, +pass `--leave-run-open`. A finished import then does not mark the run stopped +and does not fire run-stop automations. Omit the flag on the last import. +The flag does nothing when the import has no run. + +```sh +sift-cli import csv ./part-1.csv --asset rover-1 --run sortie-4 --leave-run-open +sift-cli import csv ./part-2.csv --asset rover-1 --run sortie-4 +``` + ### Time formats Imports that parse a time column accept a `--time-format` describing how diff --git a/rust/crates/sift_cli/src/cli/mod.rs b/rust/crates/sift_cli/src/cli/mod.rs index 2387c9319a..e1c3ffcbca 100644 --- a/rust/crates/sift_cli/src/cli/mod.rs +++ b/rust/crates/sift_cli/src/cli/mod.rs @@ -486,6 +486,15 @@ pub struct ImportCsvArgs { /// Preview the parsed schema without uploading #[arg(short, long)] pub preview: bool, + + /// Leave the run open when the import finishes. + /// + /// By default a finished import marks its run stopped, which fires + /// run-stop automations. Set this when more files are coming to the run, + /// then stop the run after the last import. Ignored when the import has + /// no run. + #[arg(long)] + pub leave_run_open: bool, } #[derive(clap::Args)] @@ -544,6 +553,15 @@ pub struct CommonImportArgs { /// Preview the parsed schema without uploading #[arg(short, long)] pub preview: bool, + + /// Leave the run open when the import finishes. + /// + /// By default a finished import marks its run stopped, which fires + /// run-stop automations. Set this when more files are coming to the run, + /// then stop the run after the last import. Ignored when the import has + /// no run. + #[arg(long)] + pub leave_run_open: bool, } #[derive(Subcommand)] diff --git a/rust/crates/sift_cli/src/cmd/import/csv.rs b/rust/crates/sift_cli/src/cmd/import/csv.rs index deb9b0bee0..584de078fe 100644 --- a/rust/crates/sift_cli/src/cmd/import/csv.rs +++ b/rust/crates/sift_cli/src/cmd/import/csv.rs @@ -346,6 +346,7 @@ fn create_data_import_request( }), ..Default::default() }), + leave_run_open: args.leave_run_open, ..Default::default() }) } @@ -391,10 +392,12 @@ mod test_create_data_import_request { relative_start_time: None, wait: false, preview: false, + leave_run_open: true, }, ) .expect("expected Result::Ok"); + assert!(req.leave_run_open); let csv_config = req.csv_config.expect("expected Option::Some"); assert_eq!(String::from("test_asset"), csv_config.asset_name); assert!(csv_config.run_id.is_empty()); @@ -441,6 +444,7 @@ mod test_create_data_import_request { relative_start_time: None, wait: false, preview: false, + leave_run_open: false, }, ) .expect("expected Result::Ok"); @@ -485,6 +489,7 @@ mod test_create_data_import_request { relative_start_time: None, wait: false, preview: false, + leave_run_open: false, }, ) .expect("expected Result::Ok"); @@ -545,6 +550,7 @@ mod test_create_data_import_request { relative_start_time: None, wait: false, preview: false, + leave_run_open: false, }, ) .expect("expected Result::Ok"); diff --git a/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs b/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs index 803883eefe..d3e189431f 100644 --- a/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs +++ b/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs @@ -98,7 +98,8 @@ pub async fn run(ctx: Context, args: ImportHdf5Args) -> Result { let file = File::open(&args.common.path).context("failed to open hdf5 file")?; - let create_data_import_req = create_data_import_request(hdf5_config); + let create_data_import_req = + create_data_import_request(hdf5_config, args.common.leave_run_open); let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -154,9 +155,13 @@ pub fn build_hdf5_config(args: &ImportHdf5Args) -> Result { }) } -fn create_data_import_request(config: Hdf5Config) -> CreateDataImportFromUploadRequest { +fn create_data_import_request( + config: Hdf5Config, + leave_run_open: bool, +) -> CreateDataImportFromUploadRequest { CreateDataImportFromUploadRequest { hdf5_config: Some(config), + leave_run_open, ..Default::default() } } diff --git a/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs b/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs index 1f05fa45a4..54b5a49608 100644 --- a/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs @@ -23,6 +23,7 @@ fn make_args() -> ImportHdf5Args { run_id: None, wait: false, preview: false, + leave_run_open: false, }, schema: Hdf5Schema::OneD, time_format: Some(TimeFormat::AbsoluteRfc3339), diff --git a/rust/crates/sift_cli/src/cmd/import/mcap/import.rs b/rust/crates/sift_cli/src/cmd/import/mcap/import.rs index 99096b4588..60da12a361 100644 --- a/rust/crates/sift_cli/src/cmd/import/mcap/import.rs +++ b/rust/crates/sift_cli/src/cmd/import/mcap/import.rs @@ -72,7 +72,8 @@ pub async fn run(ctx: Context, args: ImportMcapArgs) -> Result { let file = File::open(&args.common.path).context("failed to open mcap file")?; - let create_data_import_req = create_data_import_request(mcap_config); + let create_data_import_req = + create_data_import_request(mcap_config, args.common.leave_run_open); let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -179,9 +180,13 @@ pub fn channel_configs( configs } -fn create_data_import_request(config: McapConfig) -> CreateDataImportFromUploadRequest { +fn create_data_import_request( + config: McapConfig, + leave_run_open: bool, +) -> CreateDataImportFromUploadRequest { CreateDataImportFromUploadRequest { mcap_config: Some(config), + leave_run_open, ..Default::default() } } diff --git a/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs b/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs index bee76998b3..1469b2b622 100644 --- a/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs @@ -24,6 +24,7 @@ fn make_args() -> ImportMcapArgs { run_id: None, wait: false, preview: false, + leave_run_open: false, }, relative_start_time: None, metadata_record: Vec::new(), diff --git a/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs b/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs index 5d7ccc738b..a4f0f8f8e4 100644 --- a/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs +++ b/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs @@ -155,6 +155,7 @@ fn create_data_import_request( .into(), config: config.config, }), + leave_run_open: args.common.leave_run_open, ..Default::default() }) } diff --git a/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs b/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs index 4fbba63017..8e7adc36c8 100644 --- a/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs +++ b/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs @@ -255,6 +255,7 @@ fn create_data_import_request( .into(), config: config.config, }), + leave_run_open: args.common.leave_run_open, ..Default::default() }; Ok(req) diff --git a/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs b/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs index 53939c2234..39fc0572e4 100644 --- a/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs @@ -28,6 +28,7 @@ fn make_test_args(time_path: Option<&str>, time_format: Option) -> F run_id: None, wait: false, preview: false, + leave_run_open: false, }, channel_path: vec![], data_type: vec![], @@ -551,6 +552,7 @@ fn make_channel_per_row_args( run_id: None, wait: false, preview: false, + leave_run_open: false, }, mode, time_path: time_path.map(|s| s.to_string()), diff --git a/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs b/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs index 62d4cf54dd..9e4ae6ce4a 100644 --- a/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs +++ b/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs @@ -59,7 +59,8 @@ pub async fn run(ctx: Context, args: ImportTdmsArgs) -> Result { let file = File::open(&args.common.path).context("failed to open tdms file")?; let create_data_import_req = - create_data_import_request(tdms_config).context("failed to create data import req")?; + create_data_import_request(tdms_config, args.common.leave_run_open) + .context("failed to create data import req")?; let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -133,9 +134,13 @@ pub fn build_tdms_config(args: &ImportTdmsArgs) -> Result { }) } -fn create_data_import_request(config: TdmsConfig) -> Result { +fn create_data_import_request( + config: TdmsConfig, + leave_run_open: bool, +) -> Result { let req = CreateDataImportFromUploadRequest { tdms_config: Some(config), + leave_run_open, ..Default::default() }; Ok(req) diff --git a/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs b/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs index 2b90cff5f6..31b5c7e6b6 100644 --- a/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs @@ -23,6 +23,7 @@ fn make_args() -> ImportTdmsArgs { run_id: None, wait: false, preview: false, + leave_run_open: false, }, start_time_override: None, fallback_method: TdmsFallbackMethod::FailOnError, diff --git a/rust/crates/sift_cli/src/cmd/import/ulog/import.rs b/rust/crates/sift_cli/src/cmd/import/ulog/import.rs index ea80b46785..fa0d37ea28 100644 --- a/rust/crates/sift_cli/src/cmd/import/ulog/import.rs +++ b/rust/crates/sift_cli/src/cmd/import/ulog/import.rs @@ -55,7 +55,8 @@ pub async fn run(ctx: Context, args: ImportUlogArgs) -> Result { let file = File::open(&args.common.path).context("failed to open ulog file")?; - let create_data_import_req = create_data_import_request(ulog_config); + let create_data_import_req = + create_data_import_request(ulog_config, args.common.leave_run_open); let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -114,9 +115,13 @@ pub fn build_ulog_config(args: &ImportUlogArgs) -> Result { }) } -fn create_data_import_request(config: UlogConfig) -> CreateDataImportFromUploadRequest { +fn create_data_import_request( + config: UlogConfig, + leave_run_open: bool, +) -> CreateDataImportFromUploadRequest { CreateDataImportFromUploadRequest { ulog_config: Some(config), + leave_run_open, ..Default::default() } } diff --git a/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs b/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs index fa66a8d781..b16b21f60d 100644 --- a/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs @@ -19,6 +19,7 @@ fn make_args() -> ImportUlogArgs { run_id: None, wait: false, preview: false, + leave_run_open: false, }, relative_start_time: None, info_key: Vec::new(), From e058e61a0583e74e7d276eb85751f4a29252fa00 Mon Sep 17 00:00:00 2001 From: Ian Later Date: Mon, 16 Nov 2026 11:51:12 -0800 Subject: [PATCH 2/2] rust(feat): join an open run from import csv --run creates a new run each time, because run names are not unique. --run-id adds a file to the run left open by --leave-run-open. The other import builders read that flag from the shared args. --- rust/crates/sift_cli/CHANGELOG.md | 3 ++ .../assets/docs/src/data/importing.md | 13 ++++-- rust/crates/sift_cli/src/cli/mod.rs | 7 +++ rust/crates/sift_cli/src/cmd/import/csv.rs | 45 +++++++++++++++++++ .../sift_cli/src/cmd/import/hdf5/import.rs | 11 +++-- .../sift_cli/src/cmd/import/hdf5/tests.rs | 12 ++++- .../sift_cli/src/cmd/import/mcap/import.rs | 11 +++-- .../sift_cli/src/cmd/import/mcap/tests.rs | 12 ++++- .../import/parquet/channel_per_row_dataset.rs | 2 +- .../src/cmd/import/parquet/flat_dataset.rs | 2 +- .../sift_cli/src/cmd/import/parquet/tests.rs | 32 +++++++++++++ .../src/cmd/import/tdms/detect_tdms_config.rs | 13 +++--- .../sift_cli/src/cmd/import/tdms/tests.rs | 13 +++++- .../sift_cli/src/cmd/import/ulog/import.rs | 11 +++-- .../sift_cli/src/cmd/import/ulog/tests.rs | 12 ++++- 15 files changed, 164 insertions(+), 35 deletions(-) diff --git a/rust/crates/sift_cli/CHANGELOG.md b/rust/crates/sift_cli/CHANGELOG.md index e32cb2ce21..78e247f5a2 100644 --- a/rust/crates/sift_cli/CHANGELOG.md +++ b/rust/crates/sift_cli/CHANGELOG.md @@ -10,6 +10,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - `import` accepts `--leave-run-open`. A finished import marks its run stopped and fires run-stop automations unless the flag is set. Stop the run after the last import. The flag does nothing when the import has no run. +- `import csv` accepts `--run-id`, the id of an existing run. `--run` creates + a new run each time, because run names are not unique. Use `--run-id` to + add a file to a run left open with `--leave-run-open`. ## [v0.9.0] - November 16, 2026 diff --git a/rust/crates/sift_cli/assets/docs/src/data/importing.md b/rust/crates/sift_cli/assets/docs/src/data/importing.md index 4a398f3988..498487428c 100644 --- a/rust/crates/sift_cli/assets/docs/src/data/importing.md +++ b/rust/crates/sift_cli/assets/docs/src/data/importing.md @@ -70,14 +70,19 @@ client.data_import.import_from_path( Pass a mapping of path to config when a file needs a column mapping or channel list you set. Files you leave out of the mapping are detected. -The CLI imports one file per command. When a later file is not available yet, -pass `--leave-run-open`. A finished import then does not mark the run stopped -and does not fire run-stop automations. Omit the flag on the last import. +The CLI imports one file per command. `--run` creates a new run each time, +because run names are not unique. A second command with the same `--run` +does not add data to the first run. Pass `--run-id` with the id of the +open run. + +When a later file is not available yet, pass `--leave-run-open` on the +first import. A finished import then does not mark the run stopped and +does not fire run-stop automations. Omit the flag on the last import. The flag does nothing when the import has no run. ```sh sift-cli import csv ./part-1.csv --asset rover-1 --run sortie-4 --leave-run-open -sift-cli import csv ./part-2.csv --asset rover-1 --run sortie-4 +sift-cli import csv ./part-2.csv --asset rover-1 --run-id ``` ### Time formats diff --git a/rust/crates/sift_cli/src/cli/mod.rs b/rust/crates/sift_cli/src/cli/mod.rs index e1c3ffcbca..f2ce2c3ccb 100644 --- a/rust/crates/sift_cli/src/cli/mod.rs +++ b/rust/crates/sift_cli/src/cli/mod.rs @@ -433,6 +433,13 @@ pub struct ImportCsvArgs { #[arg(short, long)] pub run: Option, + /// The id of an existing run to add this data to. Mutually exclusive with --run. + /// + /// `--run` creates a new run each time, because run names are not unique. + /// Use this to add a file to a run left open with `--leave-run-open`. + #[arg(long, conflicts_with = "run")] + pub run_id: Option, + /// Row number containing column headers (1-based) #[arg(long, default_value_t = 1, help_heading = "Layout")] pub header_row: usize, diff --git a/rust/crates/sift_cli/src/cmd/import/csv.rs b/rust/crates/sift_cli/src/cmd/import/csv.rs index 584de078fe..522c9e9516 100644 --- a/rust/crates/sift_cli/src/cmd/import/csv.rs +++ b/rust/crates/sift_cli/src/cmd/import/csv.rs @@ -338,6 +338,7 @@ fn create_data_import_request( data_columns, first_data_row: args.first_data_row as u32, run_name: args.run.clone().unwrap_or_default(), + run_id: args.run_id.clone().unwrap_or_default(), time_column: Some(CsvTimeColumn { relative_start_time, column_number: args.time_column as u32, @@ -379,6 +380,7 @@ mod test_create_data_import_request { path: PathBuf::default(), asset: "test_asset".into(), run: None, + run_id: None, header_row: 1, first_data_row: 2, channel_column: Vec::default(), @@ -415,6 +417,46 @@ mod test_create_data_import_request { assert_eq!(String::from("channel"), config.name); } + #[test] + fn run_id_is_set_on_the_request() { + let test_csv = indoc! {" + time,channel + 2025-10-04T21:58:13Z,1.0 + "}; + let csv_reader = csv::ReaderBuilder::new() + .has_headers(false) + .from_reader(test_csv.as_bytes()); + + let req = create_data_import_request( + csv_reader, + &ImportCsvArgs { + path: PathBuf::default(), + asset: "test_asset".into(), + run: None, + run_id: Some("run-1".into()), + header_row: 1, + first_data_row: 2, + channel_column: Vec::default(), + data_type: Vec::default(), + unit: Vec::default(), + description: Vec::default(), + enum_config: Vec::default(), + bit_field_config: Vec::default(), + time_column: 1, + time_format: TimeFormat::default(), + relative_start_time: None, + wait: false, + preview: false, + leave_run_open: false, + }, + ) + .expect("expected Result::Ok"); + + let csv_config = req.csv_config.expect("expected Option::Some"); + assert_eq!(csv_config.run_id, "run-1"); + assert!(csv_config.run_name.is_empty()); + } + #[test] fn simple_type_override() { let test_csv = indoc! {" @@ -431,6 +473,7 @@ mod test_create_data_import_request { path: PathBuf::default(), asset: "test_asset".into(), run: Some("test_run".into()), + run_id: None, header_row: 1, first_data_row: 2, channel_column: vec![2], @@ -476,6 +519,7 @@ mod test_create_data_import_request { path: PathBuf::default(), asset: "test_asset".into(), run: Some("test_run".into()), + run_id: None, header_row: 1, first_data_row: 2, channel_column: vec![2], @@ -537,6 +581,7 @@ mod test_create_data_import_request { path: PathBuf::default(), asset: "test_asset".into(), run: Some("test_run".into()), + run_id: None, header_row: 1, first_data_row: 2, channel_column: vec![2, 3], diff --git a/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs b/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs index d3e189431f..a98fadaf5c 100644 --- a/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs +++ b/rust/crates/sift_cli/src/cmd/import/hdf5/import.rs @@ -13,7 +13,7 @@ use sift_rs::{ }; use crate::{ - cli::ImportHdf5Args, + cli::{CommonImportArgs, ImportHdf5Args}, cmd::{ Context, import::{ @@ -98,8 +98,7 @@ pub async fn run(ctx: Context, args: ImportHdf5Args) -> Result { let file = File::open(&args.common.path).context("failed to open hdf5 file")?; - let create_data_import_req = - create_data_import_request(hdf5_config, args.common.leave_run_open); + let create_data_import_req = create_data_import_request(hdf5_config, &args.common); let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -155,13 +154,13 @@ pub fn build_hdf5_config(args: &ImportHdf5Args) -> Result { }) } -fn create_data_import_request( +pub(crate) fn create_data_import_request( config: Hdf5Config, - leave_run_open: bool, + common: &CommonImportArgs, ) -> CreateDataImportFromUploadRequest { CreateDataImportFromUploadRequest { hdf5_config: Some(config), - leave_run_open, + leave_run_open: common.leave_run_open, ..Default::default() } } diff --git a/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs b/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs index 54b5a49608..7215fb73fa 100644 --- a/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/hdf5/tests.rs @@ -12,7 +12,9 @@ use crate::cmd::import::utils::group_path_to_channel_name; use chrono::DateTime; use hdf5::types::{EnumMember, EnumType, FloatSize, IntSize, TypeDescriptor}; use sift_rs::common::r#type::v1::{ChannelConfig, ChannelDataType}; -use sift_rs::data_imports::v2::TimeFormat as ProtoTimeFormat; +use sift_rs::data_imports::v2::{Hdf5Config, TimeFormat as ProtoTimeFormat}; + +use crate::cmd::import::hdf5::import::create_data_import_request; fn make_args() -> ImportHdf5Args { ImportHdf5Args { @@ -463,3 +465,11 @@ fn weave_empty_returns_empty() { let woven = weave_time_channel_rows(&[], &[]); assert!(woven.is_empty()); } + +#[test] +fn leave_run_open_is_set_on_the_request() { + let mut args = make_args(); + args.common.leave_run_open = true; + let req = create_data_import_request(Hdf5Config::default(), &args.common); + assert!(req.leave_run_open); +} diff --git a/rust/crates/sift_cli/src/cmd/import/mcap/import.rs b/rust/crates/sift_cli/src/cmd/import/mcap/import.rs index 60da12a361..f32c669150 100644 --- a/rust/crates/sift_cli/src/cmd/import/mcap/import.rs +++ b/rust/crates/sift_cli/src/cmd/import/mcap/import.rs @@ -15,7 +15,7 @@ use sift_rs::{ }; use crate::{ - cli::{ImportMcapArgs, mcap::McapComplexTypesMode}, + cli::{CommonImportArgs, ImportMcapArgs, mcap::McapComplexTypesMode}, cmd::{ Context, import::{ @@ -72,8 +72,7 @@ pub async fn run(ctx: Context, args: ImportMcapArgs) -> Result { let file = File::open(&args.common.path).context("failed to open mcap file")?; - let create_data_import_req = - create_data_import_request(mcap_config, args.common.leave_run_open); + let create_data_import_req = create_data_import_request(mcap_config, &args.common); let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -180,13 +179,13 @@ pub fn channel_configs( configs } -fn create_data_import_request( +pub(crate) fn create_data_import_request( config: McapConfig, - leave_run_open: bool, + common: &CommonImportArgs, ) -> CreateDataImportFromUploadRequest { CreateDataImportFromUploadRequest { mcap_config: Some(config), - leave_run_open, + leave_run_open: common.leave_run_open, ..Default::default() } } diff --git a/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs b/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs index 1469b2b622..64ba7499ac 100644 --- a/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/mcap/tests.rs @@ -4,11 +4,13 @@ use chrono::DateTime; use sift_rs::{ common::r#type::v1::ChannelDataType, data_imports::v2::{ - McapComplexTypesImportMode as ProtoMcapComplexTypesImportMode, + McapComplexTypesImportMode as ProtoMcapComplexTypesImportMode, McapConfig, McapParseErrorPolicy as ProtoMcapParseErrorPolicy, }, }; +use crate::cmd::import::mcap::import::create_data_import_request; + use crate::cli::mcap::{McapComplexTypesMode, McapParseErrorPolicy}; use crate::cli::{CommonImportArgs, ImportMcapArgs}; use crate::cmd::import::mcap::detect_mcap_config::DetectedChannel; @@ -797,3 +799,11 @@ float64 z ); } } + +#[test] +fn leave_run_open_is_set_on_the_request() { + let mut args = make_args(); + args.common.leave_run_open = true; + let req = create_data_import_request(McapConfig::default(), &args.common); + assert!(req.leave_run_open); +} diff --git a/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs b/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs index a4f0f8f8e4..e1e21efa66 100644 --- a/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs +++ b/rust/crates/sift_cli/src/cmd/import/parquet/channel_per_row_dataset.rs @@ -136,7 +136,7 @@ pub async fn run(ctx: Context, args: ChannelPerRowArgs) -> Result { .await } -fn create_data_import_request( +pub(crate) fn create_data_import_request( args: &ChannelPerRowArgs, config: ParquetConfig, footer_md: FooterMetadata, diff --git a/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs b/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs index 8e7adc36c8..542f25ee6d 100644 --- a/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs +++ b/rust/crates/sift_cli/src/cmd/import/parquet/flat_dataset.rs @@ -236,7 +236,7 @@ fn update_config_with_overrides( Ok(()) } -fn create_data_import_request( +pub(crate) fn create_data_import_request( args: &FlatDatasetArgs, config: ParquetConfig, footer_md: FooterMetadata, diff --git a/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs b/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs index 39fc0572e4..fa434c9a67 100644 --- a/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/parquet/tests.rs @@ -1016,3 +1016,35 @@ fn test_channel_per_row_multi_auto_detect_column_with_explicit_format() { ProtoTimeFormat::AbsoluteUnixMilliseconds as i32 ); } + +#[test] +fn flat_dataset_leave_run_open_is_set_on_the_request() { + let mut args = make_test_args(None, None); + args.common.leave_run_open = true; + let req = crate::cmd::import::parquet::flat_dataset::create_data_import_request( + &args, + sift_rs::data_imports::v2::ParquetConfig::default(), + super::FooterMetadata { + offset: 0, + length: 0, + }, + ) + .expect("request should build"); + assert!(req.leave_run_open); +} + +#[test] +fn channel_per_row_leave_run_open_is_set_on_the_request() { + let mut args = make_channel_per_row_args(ChannelMode::Single, None, None); + args.common.leave_run_open = true; + let req = crate::cmd::import::parquet::channel_per_row_dataset::create_data_import_request( + &args, + sift_rs::data_imports::v2::ParquetConfig::default(), + super::FooterMetadata { + offset: 0, + length: 0, + }, + ) + .expect("request should build"); + assert!(req.leave_run_open); +} diff --git a/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs b/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs index 9e4ae6ce4a..dc3eebd5a7 100644 --- a/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs +++ b/rust/crates/sift_cli/src/cmd/import/tdms/detect_tdms_config.rs @@ -16,7 +16,7 @@ use tdms::data_type::TdmsDataType; use tdms::segment::Channel; use crate::{ - cli::{ImportTdmsArgs, tdms::TdmsFallbackMethod}, + cli::{CommonImportArgs, ImportTdmsArgs, tdms::TdmsFallbackMethod}, cmd::{ Context, import::{ @@ -58,9 +58,8 @@ pub async fn run(ctx: Context, args: ImportTdmsArgs) -> Result { let file = File::open(&args.common.path).context("failed to open tdms file")?; - let create_data_import_req = - create_data_import_request(tdms_config, args.common.leave_run_open) - .context("failed to create data import req")?; + let create_data_import_req = create_data_import_request(tdms_config, &args.common) + .context("failed to create data import req")?; let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -134,13 +133,13 @@ pub fn build_tdms_config(args: &ImportTdmsArgs) -> Result { }) } -fn create_data_import_request( +pub(crate) fn create_data_import_request( config: TdmsConfig, - leave_run_open: bool, + common: &CommonImportArgs, ) -> Result { let req = CreateDataImportFromUploadRequest { tdms_config: Some(config), - leave_run_open, + leave_run_open: common.leave_run_open, ..Default::default() }; Ok(req) diff --git a/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs b/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs index 31b5c7e6b6..fb287d21cc 100644 --- a/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/tdms/tests.rs @@ -9,8 +9,10 @@ use crate::cmd::import::tdms::detect_tdms_config::{ use chrono::DateTime; use sift_rs::common::r#type::v1::ChannelDataType; use sift_rs::data_imports::v2::{ - TdmsFallbackMethod as ProtoFallbackMethod, TimeFormat as ProtoTimeFormat, + TdmsConfig, TdmsFallbackMethod as ProtoFallbackMethod, TimeFormat as ProtoTimeFormat, }; + +use crate::cmd::import::tdms::detect_tdms_config::create_data_import_request; use tdms::data_type::{TDMSValue, TdmsDataType}; use tdms::segment::{Channel, Endianness, MetadataProperty}; @@ -336,3 +338,12 @@ fn test_is_waveform_channel() { ); assert!(is_waveform_channel(&ch)); } + +#[test] +fn leave_run_open_is_set_on_the_request() { + let mut args = make_args(); + args.common.leave_run_open = true; + let req = create_data_import_request(TdmsConfig::default(), &args.common) + .expect("request should build"); + assert!(req.leave_run_open); +} diff --git a/rust/crates/sift_cli/src/cmd/import/ulog/import.rs b/rust/crates/sift_cli/src/cmd/import/ulog/import.rs index fa0d37ea28..295b38e694 100644 --- a/rust/crates/sift_cli/src/cmd/import/ulog/import.rs +++ b/rust/crates/sift_cli/src/cmd/import/ulog/import.rs @@ -13,7 +13,7 @@ use sift_rs::{ }; use crate::{ - cli::ImportUlogArgs, + cli::{CommonImportArgs, ImportUlogArgs}, cmd::{ Context, import::{ @@ -55,8 +55,7 @@ pub async fn run(ctx: Context, args: ImportUlogArgs) -> Result { let file = File::open(&args.common.path).context("failed to open ulog file")?; - let create_data_import_req = - create_data_import_request(ulog_config, args.common.leave_run_open); + let create_data_import_req = create_data_import_request(ulog_config, &args.common); let CreateDataImportFromUploadResponse { upload_url, .. } = data_imports_client .create_data_import_from_upload(create_data_import_req) @@ -115,13 +114,13 @@ pub fn build_ulog_config(args: &ImportUlogArgs) -> Result { }) } -fn create_data_import_request( +pub(crate) fn create_data_import_request( config: UlogConfig, - leave_run_open: bool, + common: &CommonImportArgs, ) -> CreateDataImportFromUploadRequest { CreateDataImportFromUploadRequest { ulog_config: Some(config), - leave_run_open, + leave_run_open: common.leave_run_open, ..Default::default() } } diff --git a/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs b/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs index b16b21f60d..faa9c77ca1 100644 --- a/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs +++ b/rust/crates/sift_cli/src/cmd/import/ulog/tests.rs @@ -8,7 +8,9 @@ use crate::cmd::import::ulog::detect_ulog_config::{ use crate::cmd::import::ulog::import::build_ulog_config; use chrono::DateTime; use sift_rs::common::r#type::v1::ChannelDataType; -use sift_rs::data_imports::v2::UlogParseErrorPolicy as ProtoUlogParseErrorPolicy; +use sift_rs::data_imports::v2::{UlogConfig, UlogParseErrorPolicy as ProtoUlogParseErrorPolicy}; + +use crate::cmd::import::ulog::import::create_data_import_request; fn make_args() -> ImportUlogArgs { ImportUlogArgs { @@ -606,3 +608,11 @@ fn detect_errors_on_cyclic_formats() { "expected cyclic format error, got: {err:#}" ); } + +#[test] +fn leave_run_open_is_set_on_the_request() { + let mut args = make_args(); + args.common.leave_run_open = true; + let req = create_data_import_request(UlogConfig::default(), &args.common); + assert!(req.leave_run_open); +}