masster 0.3.12__py3-none-any.whl → 0.3.13__py3-none-any.whl

masster/study/load.py

@@ -170,7 +170,7 @@ def add_sample(self, file, type=None, reset=False, adducts=None):
         self.logger.error(f"Unsupported file format: {file}")
         return
     if ddaobj.features_df is None and not reset:
-        self.logger.warning(
+        self.logger.debug(
             f"File {file} will be newly processed.",
         )
         ddaobj.features = None
@@ -278,8 +278,34 @@ def add_sample(self, file, type=None, reset=False, adducts=None):
         ).select(
             ["feature_uid"] + [col for col in f_df.columns if col != "feature_uid"],
         )
-        self.features_df = pl.concat([self.features_df, f_df])
         
+        # Reorganize f_df columns to match self.features_df column order and schema
+        target_columns = self.features_df.columns
+        target_schema = self.features_df.schema
+        f_df_columns = f_df.columns
+
+        # Create select expressions for reordering and type casting
+        select_exprs = []
+        for col in target_columns:
+            if col in f_df_columns:
+                # Cast to the expected type
+                expected_dtype = target_schema[col]
+                select_exprs.append(pl.col(col).cast(expected_dtype, strict=False))
+            else:
+                # Add missing columns with null values of the correct type
+                expected_dtype = target_schema[col]
+                select_exprs.append(pl.lit(None, dtype=expected_dtype).alias(col))
+
+        # Add any extra columns from f_df that aren't in target_columns (keep their original types)
+        for col in f_df_columns:
+            if col not in target_columns:
+                select_exprs.append(pl.col(col))
+
+        # Reorder and type-cast f_df columns
+        f_df = f_df.select(select_exprs)
+
+        self.features_df = pl.concat([self.features_df, f_df])
+            
     # Ensure features_df column order matches schema
     self._ensure_features_df_schema_order()
     

{masster-0.3.12.dist-info → masster-0.3.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: masster
-Version: 0.3.12
+Version: 0.3.13
 Summary: Mass spectrometry data analysis package
 Project-URL: homepage, https://github.com/zamboni-lab/masster
 Project-URL: repository, https://github.com/zamboni-lab/masster

{masster-0.3.12.dist-info → masster-0.3.13.dist-info}/RECORD

@@ -36,7 +36,7 @@ masster/study/export.py,sha256=9Bhz8wpO3ZHdwV0iWSX0E38GS3UfqfAFlW9VN8ht2-Y,28845
 masster/study/h5.py,sha256=UOc4tbeWr8Xa_5Aescz7rMMnkzpu8PSTsOAnTfPv0-E,67109
 masster/study/helpers.py,sha256=qf5_4DVW5X3MI3TgoZes5bNzuIt-r_esSeJoNOO8a6A,92540
 masster/study/helpers_optimized.py,sha256=sd87kNPIEPdMijekXzZWSyeZzJ_DTAW8HQjAry-jVyY,13922
-masster/study/load.py,sha256=w-HhyQqShgc2R2b3ko3Yy7t-MHLiO9HlSpuOMAdpnZQ,48429
+masster/study/load.py,sha256=bpiyMQU6rtiz4d_EdsI4w1p_T2l8YkRcDmdBUeI3pEk,49571
 masster/study/parameters.py,sha256=0elaF7YspTsB7qyajWAbRNL2VfKlGz5GJLifmO8IGkk,3276
 masster/study/plot.py,sha256=Vvbh19f94X8D4aX5mLVyPso-iC0ZpsyQCe3NTib34VU,68389
 masster/study/processing.py,sha256=EZlzcMmMWcCW0dMdC3tc4r8ii6kncWQC2_Lc_ybfLFc,52286
@@ -54,8 +54,8 @@ masster/study/defaults/integrate_chrom_def.py,sha256=0MNIWGTjty-Zu-NTQsIweuj3UVq
 masster/study/defaults/integrate_def.py,sha256=Vf4SAzdBfnsSZ3IRaF0qZvWu3gMDPHdgPfMYoPKeWv8,7246
 masster/study/defaults/merge_def.py,sha256=EBsKE3hsAkTEzN9dpdRD5W3_suTKy_WZ_96rwS0uBuE,8572
 masster/study/defaults/study_def.py,sha256=d8mQWIpvWEWI8grPTAcQa4jKTG7QrM98RRgHZVoh134,9519
-masster-0.3.12.dist-info/METADATA,sha256=gb3nbkBNDa0TARJGbCHRjoOym_L4bMX6mT6415BBvDg,44293
-masster-0.3.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-masster-0.3.12.dist-info/entry_points.txt,sha256=ZHguQ_vPmdbpqq2uGtmEOLJfgP-DQ1T0c07Lxh30wc8,58
-masster-0.3.12.dist-info/licenses/LICENSE,sha256=bx5iLIKjgAdYQ7sISn7DsfHRKkoCUm1154sJJKhgqnU,35184
-masster-0.3.12.dist-info/RECORD,,
+masster-0.3.13.dist-info/METADATA,sha256=3UgZrlVxDb1GIwA_8y6-LW0407iuS6s9RNBpOpMmijE,44293
+masster-0.3.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+masster-0.3.13.dist-info/entry_points.txt,sha256=ZHguQ_vPmdbpqq2uGtmEOLJfgP-DQ1T0c07Lxh30wc8,58
+masster-0.3.13.dist-info/licenses/LICENSE,sha256=bx5iLIKjgAdYQ7sISn7DsfHRKkoCUm1154sJJKhgqnU,35184
+masster-0.3.13.dist-info/RECORD,,