pychemstation 0.10.7.dev1__py3-none-any.whl → 0.10.8.dev2__py3-none-any.whl

pychemstation/control/controllers/comm.py

@@ -173,5 +173,5 @@ class CommunicationController(ABCCommunicationController):
                         data_dirs[i] = "C:" + data_dir
                 return method_dir, sequence_dir, data_dirs
         raise ValueError(
-                f"One of the method: {method_dir}, sequence: {sequence_dir} or data directories: {data_dirs} could not be found, please provide your own."
-            )
+            f"One of the method: {method_dir}, sequence: {sequence_dir} or data directories: {data_dirs} could not be found, please provide your own."
+        )

pychemstation/control/controllers/data_aq/method.py

@@ -445,7 +445,7 @@ class MethodController(RunController):
             i = 0
             while folder.is_err() and i < 10:
                 folder = self._fuzzy_match_most_recent_folder(self.data_files[-1], None)
-                i+=1
+                i += 1
             if folder.is_ok():
                 self.data_files[-1] = folder.ok_value
             else:

pychemstation/control/controllers/data_aq/sequence.py

@@ -338,8 +338,10 @@ class SequenceController(RunController):
                         and set(most_recent_folder._data_files) == child_dirs
                     ):
                         most_recent_folder.child_dirs = [
-                            os.path.join(most_recent_folder.dir, f) for f in child_dirs
+                            os.path.join(most_recent_folder.dir, f) if not os.path.isdir(f) else f for f in child_dirs
                         ]
+                        for d in most_recent_folder.child_dirs:
+                            assert os.path.isdir(d)
                     else:
                         potential_folders: List[str] = sorted(
                             list(
@@ -427,6 +429,8 @@ class SequenceController(RunController):
                 ).ok_value
             )
         parent_dir = self.data_files[-1]
+        if len(parent_dir._data_files) != len(parent_dir.child_dirs) or len(parent_dir.child_dirs) == 0:
+            parent_dir = self._fuzzy_match_most_recent_folder(most_recent_folder=parent_dir, child_dirs=None)
         spectra = self.get_data()
         reports = []
         for i, child_dir in enumerate(parent_dir.child_dirs):

pychemstation/utils/sequence_types.py

@@ -78,10 +78,11 @@ class SequenceTable:
         for self_row, other_row in zip(self.rows, other.rows):
             equal &= self_row.vial_location == other_row.vial_location
             equal &= self_row.data_file == other_row.data_file
-            equal &= (
-                os.path.split(os.path.normpath(self_row.method))[-1]
-                == os.path.split(os.path.normpath(other_row.method))[-1]
-            )
+            if self_row.method and other_row.method:
+                equal &= (
+                    os.path.split(os.path.normpath(self_row.method))[-1]
+                    == os.path.split(os.path.normpath(other_row.method))[-1]
+                )
             equal &= self_row.num_inj == other_row.num_inj
             equal &= self_row.inj_vol == other_row.inj_vol
             equal &= self_row.inj_source == other_row.inj_source

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pychemstation
-Version: 0.10.7.dev1
+Version: 0.10.8.dev2
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Project-URL: Documentation, https://pychemstation-e5a086.gitlab.io/pychemstation.html
 Project-URL: Repository, https://gitlab.com/heingroup/device-api/pychemstation

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

@@ -8,10 +8,10 @@ pychemstation/control/__init__.py,sha256=7lSkY7Qa7Ikdz82-2FESc_oqktv7JndsjltCkiM
 pychemstation/control/hplc.py,sha256=Evmo_D6X2RDmPBFmo3vsKE9kxJzy36Ptz4MyF2IKNzA,13146
 pychemstation/control/controllers/README.md,sha256=S5cd4NJmPjs6TUH98BtPJJhiS1Lu-mxLCNS786ogOrQ,32
 pychemstation/control/controllers/__init__.py,sha256=q2TUEie3J-OLlxcGLkG7vIy8fazCEhHm61OGzJPbhD0,179
-pychemstation/control/controllers/comm.py,sha256=jdKl9Islwk5tq2h1esm_-8gR4r4xZre0Ma5fMBqRzW4,6660
+pychemstation/control/controllers/comm.py,sha256=ySjgMBIfJ11sygXiZSPp9Rf6ABM4t6JhZRONRj1u2Cc,6652
 pychemstation/control/controllers/data_aq/__init__.py,sha256=w-Zgbit10niOQfz780ZmRHjUFxV1hMkdui7fOMPqeLA,132
-pychemstation/control/controllers/data_aq/method.py,sha256=oxRT3kSjyrDzpS01HgtT9IvGkhq_wHQ_6_63maNhVio,18249
-pychemstation/control/controllers/data_aq/sequence.py,sha256=zhilGZXUEttqrux8OI2ieAWktINsrD98fm_b6guZKlo,17209
+pychemstation/control/controllers/data_aq/method.py,sha256=hfLU5bnlmqKc1DPnK-HNpe-S2DollXyNx89hiLwhKWI,18251
+pychemstation/control/controllers/data_aq/sequence.py,sha256=3ieCzs__Z-c1OfbeUuZ41KfZ8gxcWLb0XOEvi7uVLGU,17571
 pychemstation/control/controllers/devices/__init__.py,sha256=QpgGnLXyWiB96KIB98wMccEi8oOUUaLxvBCyevJzcOg,75
 pychemstation/control/controllers/devices/injector.py,sha256=LyubM-fqf5ruseGx32deTDK-yevmaTOvdo6YKg2PF7I,4029
 pychemstation/generated/__init__.py,sha256=xnEs0QTjeuGYO3tVUIy8GDo95GqTV1peEjosGckpOu0,977
@@ -23,7 +23,7 @@ pychemstation/utils/macro.py,sha256=n2CcvB7MY4fl8Ds909K41aqqH7_6DlKK5R4aemLhOdM,
 pychemstation/utils/method_types.py,sha256=pXfZWmIPnZu3kIdGPxSPJMhL4WSt-u00If1JDUaLaMQ,1555
 pychemstation/utils/num_utils.py,sha256=OpqZwMPoxTYkpjpinA1CcoQAXDY_0sie6d-hTU547uo,2087
 pychemstation/utils/parsing.py,sha256=mzdpxrH5ux4-_i4CwZvnIYnIwAnRnOptKb3fZyYJcx0,9307
-pychemstation/utils/sequence_types.py,sha256=XBK9FCWgTstmquSL69sQHk4oKb5dimmB-RWvwxU3RV4,2655
+pychemstation/utils/sequence_types.py,sha256=JLGL7kCkPouHN7iBsnZfWe-nSjzF8XqFKzBPyF4SulE,2724
 pychemstation/utils/spec_utils.py,sha256=BtXgQndZy4kVKsrgEDxwNd0HctypnAt5upB9SOk1D9w,9700
 pychemstation/utils/table_types.py,sha256=obQrnwDNmy-7r1IDD3N6wY7gUPKfpcM6D9Ow0IN-T48,3609
 pychemstation/utils/tray_types.py,sha256=UeHM0hUYaNc9giT96ZiGpyWBPQwG-SyLA0rVGzDDAJk,6618
@@ -35,7 +35,7 @@ pychemstation/utils/abc_tables/table.py,sha256=4mfmegCdMppxgpxVDt7oULoxTBVia8_JT
 pychemstation/utils/mocking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pychemstation/utils/mocking/mock_comm.py,sha256=4DcKmUxp-LYNXjywT_za1_GpqKa4sFTj7F2V3r_qsA0,156
 pychemstation/utils/mocking/mock_hplc.py,sha256=Hx6127C7d3miYGCZYxbN-Q3PU8kpMgXYX2n6we2Twgw,25
-pychemstation-0.10.7.dev1.dist-info/METADATA,sha256=4q5zU2Ys8DnagN8Jqi-AFj8Updt1JxCDGAr-g3L9peQ,5757
-pychemstation-0.10.7.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pychemstation-0.10.7.dev1.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.10.7.dev1.dist-info/RECORD,,
+pychemstation-0.10.8.dev2.dist-info/METADATA,sha256=oo7RpP4dy0-_1rdACc2TyX5ezQO_hftIv35DcJ0ppQg,5757
+pychemstation-0.10.8.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pychemstation-0.10.8.dev2.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.10.8.dev2.dist-info/RECORD,,