pychemstation 0.7.0.dev1__py3-none-any.whl → 0.7.0.dev2__py3-none-any.whl

pychemstation/control/controllers/tables/sequence.py

@@ -192,18 +192,15 @@ class SequenceController(TableController):
     def get_data(self, custom_path: Optional[str] = None,
                  read_uv: bool = False) -> list[AgilentChannelChromatogramData]:
         parent_dir = self.data_files[-1].dir if not custom_path else custom_path
-        child_dirs = self.data_files[-1].child_dirs
-        if len(child_dirs) == 0:
-            subdirs = []
-            for d in self.data_dirs:
+
+        potential_folders = []
+        for d in self.data_dirs:
                 subdirs = [x[0] for x in os.walk(d)]
-                if len(subdirs) > 0:
+                potential_folders = sorted(list(filter(lambda d: parent_dir in d, subdirs)))
+                if len(potential_folders) > 0:
                     break
-            assert len(subdirs) > 0
-            potential_folders = sorted(list(filter(lambda d: parent_dir in d, subdirs)))
-            self.data_files[-1].child_dirs = [f for f in potential_folders if
-                                              parent_dir in f and ".M" not in f and ".D" in f]
-
+        assert len(potential_folders) > 0
+        self.data_files[-1].child_dirs = [f for f in potential_folders if parent_dir in f and ".M" not in f and ".D" in f]
         spectra: list[Union[AgilentChannelChromatogramData, ChromData]] = []
         all_w_spectra: list[Union[AgilentChannelChromatogramData, ChromData]] = []
         for row in self.data_files[-1].child_dirs:

pychemstation/control/controllers/tables/table.py

@@ -258,13 +258,13 @@ class TableController(abc.ABC):
         if os.path.exists(most_recent_folder):
             return Ok(most_recent_folder)
 
-        subdirs = []
+        potential_folders = []
         for d in self.data_dirs:
             subdirs = [x[0] for x in os.walk(d)]
-            if len(subdirs) > 0:
+            potential_folders = sorted(list(filter(lambda d: most_recent_folder in d, subdirs)))
+            if len(potential_folders) > 0:
                 break
-        assert len(subdirs) > 0
-        potential_folders = sorted(list(filter(lambda d: most_recent_folder in d, subdirs)))
+        assert len(potential_folders) > 0
         parent_dirs = []
         for folder in potential_folders:
             path = os.path.normpath(folder)

{pychemstation-0.7.0.dev1.dist-info → pychemstation-0.7.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.7.0.dev1
+Version: 0.7.0.dev2
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao

{pychemstation-0.7.0.dev1.dist-info → pychemstation-0.7.0.dev2.dist-info}/RECORD

@@ -21,8 +21,8 @@ pychemstation/control/controllers/devices/pump.py,sha256=DJQh4lNXEraeC1CWrsKmsIT
 pychemstation/control/controllers/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pychemstation/control/controllers/tables/method.py,sha256=CVyln3TI-lWuaYiSINDJWGdvXSVa7o-yVEyy4TNNhG8,16492
 pychemstation/control/controllers/tables/ms.py,sha256=JFD-tOhu8uRyKdl-E3-neRssii8MNqVRIlsrnFhNY_M,682
-pychemstation/control/controllers/tables/sequence.py,sha256=zKv0KPSRzCL0UKAUWL3g5T35XUe30aUwHfidf3dzRDs,9349
-pychemstation/control/controllers/tables/table.py,sha256=CchpkYabgzVgX6m-vQQIOikJX2Z_Zbaw9K62zED2lgQ,12171
+pychemstation/control/controllers/tables/sequence.py,sha256=svDHwIWsElXveJ-I4odtf_hP5MLmv_7TKJrCdoki4Yk,9236
+pychemstation/control/controllers/tables/table.py,sha256=tVcvb2119t2NOGxOJvSqy432yR1rAvfj-Vr1CTnG1DY,12205
 pychemstation/control/table/__init__.py,sha256=RgMN4uIWHdNUHpGRBWdzmzAbk7XEKl6Y-qtqWCxzSZU,124
 pychemstation/control/table/method.py,sha256=THVoGomSXff_CTU3eAYme0BYwkPzab5UgZKsiZ29QSk,12196
 pychemstation/control/table/sequence.py,sha256=Eri52AnbE3BGthfrRSvYKYciquUzvHKo0lYUTySYYE8,10542
@@ -50,9 +50,9 @@ tests/test_nightly.py,sha256=WpLZfs-n9oPrwz-64gWJB5oxJGYz_ab4sLZ4E-xFBpY,2654
 tests/test_proc_rep.py,sha256=sxRiTBybVm6lyAqmgrri-T2EfZgs27oSgbYXSsN9CwU,1380
 tests/test_runs_stable.py,sha256=sT9gNt7Rscz73BybpRGYj8RSGPBR58wrzvIAFFK-_pM,5530
 tests/test_sequence.py,sha256=vs5-dqkItRds_tPM2-N6MNJ37FB0nLRFaDzBV8d42i8,4880
-tests/test_stable.py,sha256=ZPuZFNzmEO-EOih_pQ15VGj9vg6Fdtc-rOVPX7lMlkU,12468
-pychemstation-0.7.0.dev1.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.7.0.dev1.dist-info/METADATA,sha256=C0qGCLwFcyueIsAiVdCTU8J8BEqE1HZH7HJQZyLT2D8,4409
-pychemstation-0.7.0.dev1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pychemstation-0.7.0.dev1.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
-pychemstation-0.7.0.dev1.dist-info/RECORD,,
+tests/test_stable.py,sha256=UFb9rUBnOk7JabcweNIYZLWpBHWGbqKAtsTNfxDhEFg,12208
+pychemstation-0.7.0.dev2.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.7.0.dev2.dist-info/METADATA,sha256=A6ZUpxSn1kImFamlVNU1jnXB_oDHrqeSIj9gy6rRu3I,4409
+pychemstation-0.7.0.dev2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pychemstation-0.7.0.dev2.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
+pychemstation-0.7.0.dev2.dist-info/RECORD,,

tests/test_stable.py

@@ -52,14 +52,6 @@ class TestStable(unittest.TestCase):
         except Exception as e:
             self.fail(f"Should not throw error: {e}")
 
-    def test_load_method_from_disk(self):
-        self.hplc_controller.switch_method(DEFAULT_METHOD)
-        try:
-            gp_mtd = self.hplc_controller.method_controller.load_from_disk(DEFAULT_METHOD)
-            self.assertTrue(gp_mtd.params.organic_modifier == 5)
-        except Exception as e:
-            self.fail(f"Should have not failed, {e}")
-
     def test_edit_method(self):
         self.hplc_controller.method_controller.switch(DEFAULT_METHOD)
         new_method = MethodDetails(name=DEFAULT_METHOD + ".M",
@@ -273,6 +265,7 @@ class TestStable(unittest.TestCase):
             check_folder = self.hplc_controller.sequence_controller.fuzzy_match_most_recent_folder(
                 most_recent_folder=most_recent_folder)
             self.assertEqual(check_folder.ok_value, path)
+            self.hplc_controller.sequence_controller.data_files[-1].dir = check_folder.ok_value
             chrom = self.hplc_controller.get_last_run_sequence_data()
             self.assertTrue(chrom)
         except Exception: