masster 0.6.2__py3-none-any.whl → 0.6.3__py3-none-any.whl

masster/_version.py

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

masster/wizard/wizard.py

@@ -691,7 +691,7 @@ class Wizard:
             "        )",
             "        ",
             "        # Check that more than 1 file has been loaded",
-            "        if len(study.samples) <= 1:",
+            "        if len(study.samples_df) <= 1:",
             '            print("\\nWARNING: Study merging requires more than 1 sample file.")',
             '            print(f"Only {len(study.samples)} sample(s) loaded. Terminating execution.")',
             "            return False",
@@ -761,20 +761,23 @@ class Wizard:
     def _generate_interactive_notebook_content(self, source_info: Dict[str, Any]) -> str:
         """Generate the content for 2_interactive_analysis.py marimo notebook."""
 
+        # Get marimo version
+        try:
+            import marimo
+            marimo_version = marimo.__version__
+        except (ImportError, AttributeError):
+            marimo_version = "0.9.14"  # fallback version
+
         notebook_lines = [
-            "import marimo",
+            "import marimo as mo",
             "",
-            '__generated_with = "0.9.14"',
-            'app = marimo.App(width="medium")',
+            f'__generated_with = "{marimo_version}"',
+            'app = mo.App(width="medium")',
             "",
             "@app.cell",
             "def __(mo):",
             '    mo.md(r"""',
-            "    ## MASSter Interactive Analysis",
-            "    ",
-            f"    **Source:** {source_info.get('number_of_files', 0)} files detected",
-            f"    **Polarity:** {source_info.get('polarity', 'unknown')}",
-            "    ",
+            "    ### Interactive Analysis",
             "    This notebook provides interactive exploration of your processed study.",
             "    Make sure you have run `python 1_masster_workflow.py` first.",
             '    """)',
@@ -789,12 +792,8 @@ class Wizard:
             'def __(masster):',
             f'    study = masster.Study(folder={str(self.folder_path)!r})',
             '    study.load()',
-            '    return (study,)',
-            '',
-            '@app.cell',
-            'def __(study):',
             '    study.info()',
-            '    return ()',
+            '    return (study,)',
             '',
             'if __name__ == "__main__":',
             "    app.run()",

{masster-0.6.2.dist-info → masster-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: masster
-Version: 0.6.2
+Version: 0.6.3
 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.6.2.dist-info → masster-0.6.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 masster/__init__.py,sha256=B7zftzdElF2Wb5B7KvkD6TONnMIY-Jxeen3s49dgmzs,1029
-masster/_version.py,sha256=F1HdyCdWIoQe5IvLkXjg59Gp9roKbCXkIP_h-VUp0ME,256
+masster/_version.py,sha256=F5yXPDNAH_yxh-afUbD7lHwHIQszYzcte4_cj7i1mFw,256
 masster/chromatogram.py,sha256=iYpdv8C17zVnlWvOFgAn9ns2uFGiF-GgoYf5QVVAbHs,19319
 masster/logger.py,sha256=MbQ3uLI3N0G3tnvtGIJZN_HEwjKRfIhBVZmIzUev7oc,18827
 masster/spectrum.py,sha256=LlmxrI5MFS3aPrGSdqUSKVY0rJnKeBh3Frdh6a4dPvA,49722
@@ -61,9 +61,9 @@ masster/study/defaults/integrate_def.py,sha256=Vf4SAzdBfnsSZ3IRaF0qZvWu3gMDPHdgP
 masster/study/defaults/merge_def.py,sha256=99TJtIk7mSoq8NMJMJ4b-cy7gUUixQN69krxttBnkfA,12899
 masster/study/defaults/study_def.py,sha256=kSvhiqpFp8b84vUsE8608LQsSXwz9lAPcU2BqK0T8z0,16095
 masster/wizard/__init__.py,sha256=L9G_datyGSFJjrBVklEVpZVLGXzUhDiWobtiygBH8vQ,669
-masster/wizard/wizard.py,sha256=e-jh8MfKIkbN9MrPh2B_OKKMexXXMFBlOFJpen2pYa0,66679
-masster-0.6.2.dist-info/METADATA,sha256=OcaQpmk_8lPnlm-SS2eMAhiIQ3BOo1yRcVjtYPMdulY,50818
-masster-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-masster-0.6.2.dist-info/entry_points.txt,sha256=ZHguQ_vPmdbpqq2uGtmEOLJfgP-DQ1T0c07Lxh30wc8,58
-masster-0.6.2.dist-info/licenses/LICENSE,sha256=bx5iLIKjgAdYQ7sISn7DsfHRKkoCUm1154sJJKhgqnU,35184
-masster-0.6.2.dist-info/RECORD,,
+masster/wizard/wizard.py,sha256=YVmq-rCMhTzztq-GPdDmAkgQFHwOpdrWYDNOZ8VaVJw,66606
+masster-0.6.3.dist-info/METADATA,sha256=QrY0P0Ab3IXtBqq6wJGUBEir3fHe2-8TFhMuRpF7sic,50818
+masster-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+masster-0.6.3.dist-info/entry_points.txt,sha256=ZHguQ_vPmdbpqq2uGtmEOLJfgP-DQ1T0c07Lxh30wc8,58
+masster-0.6.3.dist-info/licenses/LICENSE,sha256=bx5iLIKjgAdYQ7sISn7DsfHRKkoCUm1154sJJKhgqnU,35184
+masster-0.6.3.dist-info/RECORD,,