masster 0.4.6__py3-none-any.whl → 0.4.9__py3-none-any.whl

masster/_version.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 
-__version__ = "0.4.4"
+__version__ = "0.4.8"
 
 
 def get_version():

masster/logger.py

@@ -25,7 +25,7 @@ import datetime
 from typing import Any
 
 
-class MasterLogger:
+class MassterLogger:
     """Simple logger wrapper for Study/Sample instances.
     Each instance gets its own Python logger to avoid conflicts.
 
@@ -74,7 +74,7 @@ class MasterLogger:
         self.handler = logging.StreamHandler(self.sink)
 
         # Create formatter that matches the original masster style
-        class masterFormatter(logging.Formatter):
+        class massterFormatter(logging.Formatter):
             def __init__(self, label):
                 super().__init__()
                 self.label = label
@@ -124,7 +124,7 @@ class MasterLogger:
                     f"{level_color}{record.getMessage()}\x1b[0m"
                 )  # colored message
 
-        self.handler.setFormatter(masterFormatter(self.label))
+        self.handler.setFormatter(massterFormatter(self.label))
         self.logger_instance.addHandler(self.handler)
 
         # Prevent propagation to avoid duplicate messages
@@ -143,7 +143,7 @@ class MasterLogger:
         self.label = label
 
         # Update formatter with new label
-        class masterFormatter(logging.Formatter):
+        class massterFormatter(logging.Formatter):
             def __init__(self, label):
                 super().__init__()
                 self.label = label
@@ -192,7 +192,7 @@ class MasterLogger:
                     f"{level_color}{record.getMessage()}\x1b[0m"
                 )  # colored message
 
-        self.handler.setFormatter(masterFormatter(self.label))
+        self.handler.setFormatter(massterFormatter(self.label))
 
     def update_sink(self, sink: Any):
         """Update the output sink for log messages."""
@@ -207,7 +207,7 @@ class MasterLogger:
         self.handler = logging.StreamHandler(self.sink)
 
         # Apply formatter
-        class masterFormatter(logging.Formatter):
+        class massterFormatter(logging.Formatter):
             def __init__(self, label):
                 super().__init__()
                 self.label = label
@@ -256,7 +256,7 @@ class MasterLogger:
                     f"{level_color}{record.getMessage()}\x1b[0m"
                 )  # colored message
 
-        self.handler.setFormatter(masterFormatter(self.label))
+        self.handler.setFormatter(massterFormatter(self.label))
         self.logger_instance.addHandler(self.handler)
 
     # Logger method delegates
@@ -329,4 +329,4 @@ class MasterLogger:
             self.handler = None
 
     def __repr__(self):
-        return f"MasterLogger(type={self.instance_type}, id={self.instance_id}, level={self.level})"
+        return f"MassterLogger(type={self.instance_type}, id={self.instance_id}, level={self.level})"

masster/sample/h5.py

@@ -33,7 +33,7 @@ def _save_sample5(
             Set to True if you need to maintain featureXML files for legacy workflows.
 
     Stores:
-        - metadata/format (str): Data format identifier (master-sample-1)
+        - metadata/format (str): Data format identifier (masster-sample-1)
         - metadata/file_path (str): Source file path
         - metadata/file_type (str): Source file type
         - metadata/label (str): Sample label
@@ -85,7 +85,7 @@ def _save_sample5(
         ms1_group = f.create_group("ms1")
 
         # Store metadata
-        metadata_group.attrs["format"] = "master-sample-1"
+        metadata_group.attrs["format"] = "masster-sample-1"
         if self.file_path is not None:
             metadata_group.attrs["file_path"] = str(self.file_path)
         else:
@@ -2213,7 +2213,7 @@ def create_h5_metadata_group(
         label: Sample label
     """
     metadata_group = f.create_group("metadata")
-    metadata_group.attrs["format"] = "master-sample5-1"
+    metadata_group.attrs["format"] = "masster-sample5-1"
     metadata_group.attrs["file_path"] = str(file_path) if file_path is not None else ""
     metadata_group.attrs["file_source"] = (
         str(file_source) if file_source is not None else ""

masster/sample/load.py

@@ -557,9 +557,9 @@ def _load_wiff(
 ):
     try:
         # Use masster's own implementation first
-        from masster.sample.sciex import SciexWiffData as MasterSciexWiffData
+        from masster.sample.sciex import SciexWiffData as MassterSciexWiffData
 
-        SciexWiffDataClass = MasterSciexWiffData
+        SciexWiffDataClass = MassterSciexWiffData
     except ImportError:
         # Fallback to alpharaw if masster implementation fails
         from alpharaw.sciex import SciexWiffData as AlpharawSciexWiffData

masster/sample/sample.py

@@ -39,7 +39,7 @@ import sys
 import polars as pl
 
 from masster._version import get_version
-from masster.logger import MasterLogger
+from masster.logger import MassterLogger
 
 from masster.sample.defaults.sample_def import sample_defaults
 from masster.sample.defaults.find_features_def import find_features_defaults
@@ -180,7 +180,7 @@ class Sample:
         self.log_sink = params.log_sink
 
         # Initialize independent logger
-        self.logger = MasterLogger(
+        self.logger = MassterLogger(
             instance_type="sample",
             level=params.log_level.upper(),
             label=params.log_label if params.log_label else "",

masster/study/export.py

@@ -1171,7 +1171,7 @@ def export_xlsx(self, filename: str = None) -> None:
                 "get_id() returned empty data, skipping identification worksheet",
             )
     except Exception as e:
-        self.logger.warning(
+        self.logger.debug(
             f"Error getting identification data: {e}. Skipping identification worksheet.",
         )
 

masster/study/h5.py

@@ -1145,7 +1145,7 @@ def _save_study5_compressed(self, filename):
             id_group = f.create_group("id")
 
             # Store metadata
-            metadata_group.attrs["format"] = "master-study-1"
+            metadata_group.attrs["format"] = "masster-study-1"
             metadata_group.attrs["folder"] = (
                 str(self.folder) if self.folder is not None else ""
             )
@@ -1387,7 +1387,7 @@ def _save_study5(self, filename):
         filename (str, optional): Target file name. If None, uses default based on folder.
 
     Stores:
-        - metadata/format (str): Data format identifier ("master-study-1")
+        - metadata/format (str): Data format identifier ("masster-study-1")
         - metadata/folder (str): Study default folder path
         - metadata/label (str): Study label
         - metadata/parameters (str): JSON-serialized parameters dictionary
@@ -1476,7 +1476,7 @@ def _save_study5(self, filename):
             id_group = f.create_group("id")
 
             # Store metadata
-            metadata_group.attrs["format"] = "master-study-1"
+            metadata_group.attrs["format"] = "masster-study-1"
             metadata_group.attrs["folder"] = (
                 str(self.folder) if self.folder is not None else ""
             )