pychemstation 0.5.13.dev7__py3-none-any.whl → 0.5.14.dev1__py3-none-any.whl

pychemstation/control/controllers/devices/injector.py

@@ -0,0 +1,11 @@
+from ....control.controllers import CommunicationController
+from .device import DeviceController
+from ....utils.table_types import Table
+
+
+class InjectorController(DeviceController):
+    def get_row(self, row: int):
+        pass
+
+    def __init__(self, controller: CommunicationController, table: Table):
+        super().__init__(controller, table)

pychemstation/control/controllers/tables/ms.py

@@ -0,0 +1,21 @@
+from typing import Union
+
+from ....control.controllers import CommunicationController
+from ....control.controllers.tables.table import TableController
+from ....utils.chromatogram import AgilentChannelChromatogramData
+from ....utils.table_types import Table
+
+
+class MassSpecController(TableController):
+
+    def __init__(self, controller: CommunicationController, src: str, data_dir: str, table: Table):
+        super().__init__(controller, src, data_dir, table)
+
+    def get_row(self, row: int):
+        pass
+
+    def retrieve_recent_data_files(self):
+        pass
+
+    def get_data(self) -> Union[list[AgilentChannelChromatogramData], AgilentChannelChromatogramData]:
+        pass

pychemstation/control/controllers/tables/table.py

@@ -12,7 +12,6 @@ from typing import Union, Optional
 import numpy as np
 import polling
 import rainbow as rb
-from rainbow import DataFile
 from result import Result, Ok, Err
 
 from ....control.controllers.comm import CommunicationController
@@ -43,6 +42,9 @@ class TableController(abc.ABC):
         self.table_state: Optional[TableType] = None
 
         if not offline:
+            # Initialize row counter for table operations
+            self.send('Local Rows')
+
             if os.path.isdir(src):
                 self.src: str = src
             else:
@@ -53,7 +55,7 @@ class TableController(abc.ABC):
             else:
                 raise FileNotFoundError(f"dir: {data_dir} not found.")
 
-        self.spectra: dict[str, Optional[AgilentHPLCChromatogram]] = {
+            self.spectra: dict[str, Optional[AgilentHPLCChromatogram]] = {
             "A": AgilentHPLCChromatogram(self.data_dir),
             "B": AgilentHPLCChromatogram(self.data_dir),
             "C": AgilentHPLCChromatogram(self.data_dir),
@@ -63,13 +65,22 @@ class TableController(abc.ABC):
             "G": AgilentHPLCChromatogram(self.data_dir),
             "H": AgilentHPLCChromatogram(self.data_dir),
         }
-
+        else:
+            self.spectra: dict[str, Optional[AgilentHPLCChromatogram]] = {
+                "A": AgilentHPLCChromatogram(),
+                "B": AgilentHPLCChromatogram(),
+                "C": AgilentHPLCChromatogram(),
+                "D": AgilentHPLCChromatogram(),
+                "E": AgilentHPLCChromatogram(),
+                "F": AgilentHPLCChromatogram(),
+                "G": AgilentHPLCChromatogram(),
+                "H": AgilentHPLCChromatogram(),
+            }
         self.data_files: Union[list[SequenceDataFiles], list[str]] = []
 
         self.uv = None
 
-        # Initialize row counter for table operations
-        self.send('Local Rows')
+
 
     def receive(self) -> Result[Response, str]:
         for _ in range(10):
@@ -231,10 +242,15 @@ class TableController(abc.ABC):
             timeout *= len(sequence.rows)
 
         most_recent_folder = self.retrieve_recent_data_files()
-        finished_run = polling.poll(
-            lambda: self.controller.check_if_running(),
-            timeout=timeout,
-            step=50)
+
+        finished_run = False
+        try:
+            finished_run = polling.poll(
+                lambda: self.controller.check_if_running(),
+                timeout=timeout,
+                step=50)
+        except Exception:
+            pass
 
         check_folder = self.fuzzy_match_most_recent_folder(most_recent_folder)
         if check_folder.is_ok() and finished_run:
@@ -274,7 +290,7 @@ class TableController(abc.ABC):
         pass
 
     def get_uv_spectrum(self, path: str):
-        data_uv: DataFile = rb.agilent.chemstation.parse_file(os.path.join(path, "DAD1.UV"))
+        data_uv = rb.agilent.chemstation.parse_file(os.path.join(path, "DAD1.UV"))
         zipped_data = zip(data_uv.ylabels, data_uv.data)
         self.uv = {str(w_a[0]): ChromData(x=data_uv.xlabels, y=w_a[1]) for w_a in zipped_data}
 

{pychemstation-0.5.13.dev7.dist-info → pychemstation-0.5.14.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.13.dev7
+Version: 0.5.14.dev1
 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.5.13.dev7.dist-info → pychemstation-0.5.14.dev1.dist-info}/RECORD

@@ -14,11 +14,13 @@ pychemstation/control/controllers/table_controller.py,sha256=70ovnIjLKkJborS1ztk
 pychemstation/control/controllers/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pychemstation/control/controllers/devices/column.py,sha256=SCpCnVFZFUM9LM51MbWkVcBRayN3WFxy7lz9gs2PYeY,348
 pychemstation/control/controllers/devices/device.py,sha256=SF1JK93FjmACnYrlKvldX3gEeA21qnXZegeNhc9QJGQ,738
+pychemstation/control/controllers/devices/injector.py,sha256=PfkSQlpE1zMzwyJ55Km1AdtPtdOS2RNyHDwAt_ZNa6M,349
 pychemstation/control/controllers/devices/pump.py,sha256=DJQh4lNXEraeC1CWrsKmsITOjuYlRI3tih_XRB3F1hg,1404
 pychemstation/control/controllers/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pychemstation/control/controllers/tables/method.py,sha256=Woni_nAEWRZ79wf2WixLnJWZONNdGgZGGV9GG7m0qCQ,16189
+pychemstation/control/controllers/tables/ms.py,sha256=JFD-tOhu8uRyKdl-E3-neRssii8MNqVRIlsrnFhNY_M,682
 pychemstation/control/controllers/tables/sequence.py,sha256=vqwJeV38YWdFnaDXvZVOGYl-UCV9lmMbh8Fj5kQ3mqY,8815
-pychemstation/control/controllers/tables/table.py,sha256=7HvjtpRlWBgV2rC0mweBeshWfIziyCQFfms9OUXJJyw,11848
+pychemstation/control/controllers/tables/table.py,sha256=pJCtMDGHweBhm_BEo0qhh2AjCjYAx1QyIY0AShs707A,12411
 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
@@ -37,14 +39,14 @@ pychemstation/utils/sequence_types.py,sha256=4cNpmRdPLN5oGN7ozHgT21E65aBO8vV3ZcR
 pychemstation/utils/table_types.py,sha256=mlbxPAiPvO_EBba5OSzuJcpCL0srrC7uUfm_lKsOsmA,2557
 pychemstation/utils/tray_types.py,sha256=MaHN36rhcEI5mAY95VU8hfP9HhAlngQvMYq-2oyC0hc,764
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/constants.py,sha256=iU6knsNpQGnBfGcC8VAj5SrCDcHD3jBZLhQdF6UUwY4,2452
+tests/constants.py,sha256=4FPJjW97yn6QiHNQVSlqjjJUE-Bh9SmyjIvgAeaGQBU,2450
 tests/test_comb.py,sha256=EDE1Ve0A_EK4qro9imZsrD0xXrQN8hAowiOWPFtw3dM,5515
 tests/test_comm.py,sha256=EYOpVXzEMQLGhhKYDPO-KaLcJdPSMPTD9Y4jSI0yVQY,2516
 tests/test_inj.py,sha256=yaPGZoHiOC3ZSgsmrtiqp8QtSo2bMxB9FJhaFlOpad0,1412
-tests/test_method.py,sha256=r1Q1irqiVzs31QuTYLX3u_A0FpX8rIAQ1L4WOk9tLbk,2473
+tests/test_method.py,sha256=Up2EEysYwldPT9GJw27Mycs6qi_Y2W3opjhc7wnLU9U,3215
 tests/test_sequence.py,sha256=Nz2iqp1cJgw6kcQvnwSkfBmhxpOH62PoEu6o_5rO-PY,4929
-pychemstation-0.5.13.dev7.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.5.13.dev7.dist-info/METADATA,sha256=0eZ3MqmbNwph2KwBSQUlRG3SKE9b8-WA7cY0q3JDUZ4,4376
-pychemstation-0.5.13.dev7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pychemstation-0.5.13.dev7.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
-pychemstation-0.5.13.dev7.dist-info/RECORD,,
+pychemstation-0.5.14.dev1.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.5.14.dev1.dist-info/METADATA,sha256=-kS4rtI8LDxt1GKutFyCSSMi2fx65plU2b7EgUb6m1c,4376
+pychemstation-0.5.14.dev1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pychemstation-0.5.14.dev1.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
+pychemstation-0.5.14.dev1.dist-info/RECORD,,

tests/constants.py

@@ -20,7 +20,7 @@ HEIN_LAB_CONSTANTS = [DEFAULT_COMMAND_PATH,
 # these CONSTANTS work in rm 254
 DEFAULT_COMMAND_PATH_254 = "D:\\\git_repositories\\\hplc_comm\\"
 DEFAULT_METHOD_DIR_254 = "D:\\Chemstation\\1\\Methods\\"
-DATA_DIR_254 = "D:\\Chemstation\\1\\Data\\2024-12\\"
+DATA_DIR_254 = "D:\\Chemstation\\1\\Data\\LC BO\\"
 SEQUENCE_DIR_254 = "C:\\1\\Sequence\\"
 
 HEIN_LAB_CONSTANTS_254 = [DEFAULT_COMMAND_PATH_254,

tests/test_method.py

@@ -56,6 +56,26 @@ class TestMethod(unittest.TestCase):
         except Exception as e:
             self.fail(f"Should have not failed: {e}")
 
+    def test_run_10_times(self):
+        self.hplc_controller.method_controller.switch(DEFAULT_METHOD)
+        rand_method = MethodDetails(
+            name=DEFAULT_METHOD,
+            params=HPLCMethodParams(
+                organic_modifier=5,
+                flow=0.65),
+            timetable=[TimeTableEntry(
+                start_time=0.50,
+                organic_modifer=99,
+                flow=0.65)],
+            stop_time=1,
+            post_time=0)
+        self.hplc_controller.edit_method(rand_method, save=True)
+        try:
+            for _ in range(10):
+                self.hplc_controller.run_method(experiment_name="limiting_testing")
+        except Exception as e:
+            self.fail(f"Should have not failed: {e}")
+
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()