From 95e97fc6341669b172e5f5eab09c4757283a5cb1 Mon Sep 17 00:00:00 2001 From: Tom Holland Date: Wed, 22 Jan 2025 12:16:48 +0000 Subject: [PATCH 1/2] fix: concat biologic MB files diagonally to prevent schema conflict errors --- pyprobe/cyclers/biologic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyprobe/cyclers/biologic.py b/pyprobe/cyclers/biologic.py index 2cf795de..b3831e2f 100644 --- a/pyprobe/cyclers/biologic.py +++ b/pyprobe/cyclers/biologic.py @@ -114,7 +114,7 @@ def get_imported_dataframe( for i, df in enumerate(dataframe_list): df = df.with_columns(pl.lit(i).alias("MB File")) df_list.append(df) - complete_df = pl.concat(df_list, how="vertical") + complete_df = pl.concat(df_list, how="diagonal") complete_df = self.apply_step_correction(complete_df) return complete_df From dbd16c9eeb85e9620f47e43f061e5cd32c100176 Mon Sep 17 00:00:00 2001 From: Tom Holland Date: Wed, 22 Jan 2025 12:17:22 +0000 Subject: [PATCH 2/2] chore: replace warnings with logger for missing columns in data --- pyprobe/cyclers/basecycler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyprobe/cyclers/basecycler.py b/pyprobe/cyclers/basecycler.py index 6aa55e81..3ce7cb71 100644 --- a/pyprobe/cyclers/basecycler.py +++ b/pyprobe/cyclers/basecycler.py @@ -210,7 +210,7 @@ def _get_dataframe_list(self) -> list[pl.DataFrame | pl.LazyFrame]: all_columns = set([col for df in list for col in df.collect_schema().names()]) for i in range(len(list)): if len(list[i].collect_schema().names()) < len(all_columns): - warnings.warn( + logger.warning( f"File {os.path.basename(files[i])} has missing columns, " "these have been filled with null values." )