pychemstation 0.6.6__py3-none-any.whl → 0.7.0.dev1__py3-none-any.whl

pychemstation/control/controllers/devices/injector.py

@@ -44,9 +44,9 @@ class InjectorController(DeviceController):
             nonlocal columns_added
             if True:
                 if isinstance(val, str):
-                    self.edit_row_text(col_name=col_name, val=val)
+                    self._edit_row_text(col_name=col_name, val=val)
                 else:
-                    self.edit_row_num(col_name=col_name, val=val)
+                    self._edit_row_num(col_name=col_name, val=val)
             else:
                 if isinstance(val, str):
                     self.add_new_col_text(col_name=col_name, val=val)

pychemstation/control/controllers/tables/method.py

@@ -1,5 +1,6 @@
 import os
 import time
+from typing import List
 
 from xsdata.formats.dataclass.parsers import XmlParser
 
@@ -20,12 +21,12 @@ class MethodController(TableController):
 
     def __init__(self, controller: CommunicationController,
                  src: str,
-                 data_dir: str,
+                 data_dirs: List[str],
                  table: Table,
                  offline: bool,
                  injector_controller: InjectorController):
         self.injector_controller = injector_controller
-        super().__init__(controller, src, data_dir, table, offline=offline)
+        super().__init__(controller, src, data_dirs, table, offline=offline)
 
     def check(self) -> str:
         time.sleep(2)
@@ -133,7 +134,7 @@ class MethodController(TableController):
         :raise AssertionError: The desired method is not selected. Try again.
         """
         self.send(Command.SWITCH_METHOD_CMD_SPECIFIC.value.format(method_dir=self.src,
-                                                         method_name=method_name))
+                                                                  method_name=method_name))
 
         time.sleep(2)
         self.send(Command.GET_METHOD_CMD)
@@ -266,24 +267,24 @@ class MethodController(TableController):
             if row.flow:
                 self.add_row()
                 self.get_num_rows()
-                self.edit_row_text(col_name=RegisterFlag.FUNCTION, val=RegisterFlag.FLOW.value)
+                self._edit_row_text(col_name=RegisterFlag.FUNCTION, val=RegisterFlag.FLOW.value)
                 self.add_new_col_num(col_name=RegisterFlag.TIMETABLE_FLOW, val=row.flow)
-                self.edit_row_num(col_name=RegisterFlag.TIMETABLE_FLOW, val=row.flow)
+                self._edit_row_num(col_name=RegisterFlag.TIMETABLE_FLOW, val=row.flow)
             self.download()
         else:
             if row.organic_modifer:
                 self.add_row()
                 self.get_num_rows()
-                self.edit_row_text(col_name=RegisterFlag.FUNCTION, val=RegisterFlag.SOLVENT_COMPOSITION.value)
-                self.edit_row_num(col_name=RegisterFlag.TIME, val=row.start_time)
-                self.edit_row_num(col_name=RegisterFlag.TIMETABLE_SOLVENT_B_COMPOSITION, val=row.organic_modifer)
+                self._edit_row_text(col_name=RegisterFlag.FUNCTION, val=RegisterFlag.SOLVENT_COMPOSITION.value)
+                self._edit_row_num(col_name=RegisterFlag.TIME, val=row.start_time)
+                self._edit_row_num(col_name=RegisterFlag.TIMETABLE_SOLVENT_B_COMPOSITION, val=row.organic_modifer)
                 self.download()
             if row.flow:
                 self.add_row()
                 self.get_num_rows()
-                self.edit_row_text(col_name=RegisterFlag.FUNCTION, val=RegisterFlag.FLOW.value)
-                self.edit_row_num(col_name=RegisterFlag.TIMETABLE_FLOW, val=row.flow)
-                self.edit_row_num(col_name=RegisterFlag.TIME, val=row.start_time)
+                self._edit_row_text(col_name=RegisterFlag.FUNCTION, val=RegisterFlag.FLOW.value)
+                self._edit_row_num(col_name=RegisterFlag.TIMETABLE_FLOW, val=row.flow)
+                self._edit_row_num(col_name=RegisterFlag.TIME, val=row.start_time)
                 self.download()
 
     def _update_method_timetable(self, timetable_rows: list[TimeTableEntry]):
@@ -323,7 +324,7 @@ class MethodController(TableController):
         tries = 0
         while tries < 10 and not hplc_is_running:
             timestamp = time.strftime(TIME_FORMAT)
-            self.send(Command.RUN_METHOD_CMD.value.format(data_dir=self.data_dir,
+            self.send(Command.RUN_METHOD_CMD.value.format(data_dir=self.data_dirs[0],
                                                           experiment_name=experiment_name,
                                                           timestamp=timestamp))
             folder_name = f"{experiment_name}_{timestamp}.D"
@@ -333,7 +334,7 @@ class MethodController(TableController):
         if not hplc_is_running:
             raise RuntimeError("Method failed to start.")
 
-        self.data_files.append(os.path.join(self.data_dir, folder_name))
+        self.data_files.append(os.path.join(self.data_dirs[0], folder_name))
 
         if stall_while_running:
 

pychemstation/control/controllers/tables/sequence.py

@@ -1,6 +1,6 @@
 import os
 import time
-from typing import Optional, Union
+from typing import Optional, Union, List
 
 from .table import TableController, ChromData
 from ....control.controllers.comm import CommunicationController
@@ -16,10 +16,14 @@ class SequenceController(TableController):
     Class containing sequence related logic
     """
 
-    def __init__(self, controller: CommunicationController, src: str, data_dir: str, table: Table, method_dir: str,
+    def __init__(self, controller: CommunicationController,
+                 src: str,
+                 data_dirs: List[str],
+                 table: Table,
+                 method_dir: str,
                  offline: bool):
         self.method_dir = method_dir
-        super().__init__(controller, src, data_dir, table, offline=offline)
+        super().__init__(controller, src, data_dirs, table, offline=offline)
 
     def load(self) -> SequenceTable:
         rows = self.get_num_rows()
@@ -41,7 +45,8 @@ class SequenceController(TableController):
         inj_vol = int(self.get_text(row, RegisterFlag.INJ_VOL))
         inj_source = InjectionSource(self.get_text(row, RegisterFlag.INJ_SOR))
         sample_type = SampleType(self.get_num(row, RegisterFlag.SAMPLE_TYPE))
-        vial_enum = TenVialColumn(vial_location) if vial_location <= 10 else FiftyFourVialPlate.from_int(num=vial_location)
+        vial_enum = TenVialColumn(vial_location) if vial_location <= 10 else FiftyFourVialPlate.from_int(
+            num=vial_location)
         return SequenceEntry(sample_name=sample_name,
                              vial_location=vial_enum,
                              method=None if len(method) == 0 else method,
@@ -98,12 +103,12 @@ class SequenceController(TableController):
             self.send(Command.SWITCH_SEQUENCE_CMD)
 
             for i, row in enumerate(sequence_table.rows):
-                self.edit_row(row=row, row_num=i + 1)
+                self._edit_row(row=row, row_num=i + 1)
                 self.sleep(1)
             self.send(Command.SAVE_SEQUENCE_CMD)
             self.send(Command.SWITCH_SEQUENCE_CMD)
 
-    def edit_row(self, row: SequenceEntry, row_num: int):
+    def _edit_row(self, row: SequenceEntry, row_num: int):
         """
         Edits a row in the sequence table. If a row does NOT exist, a new one will be created.
 
@@ -123,33 +128,33 @@ class SequenceController(TableController):
                 loc = row.vial_location.value
             elif isinstance(loc, FiftyFourVialPlate):
                 loc = row.vial_location.value()
-            self.edit_row_num(row=row_num, col_name=RegisterFlag.VIAL_LOCATION, val=loc)
+            self._edit_row_num(row=row_num, col_name=RegisterFlag.VIAL_LOCATION, val=loc)
 
         if row.method:
             possible_path = os.path.join(self.method_dir, row.method) + ".M\\"
             method = row.method
             if os.path.exists(possible_path):
                 method = os.path.join(self.method_dir, row.method)
-            self.edit_row_text(row=row_num, col_name=RegisterFlag.METHOD, val=method)
+            self._edit_row_text(row=row_num, col_name=RegisterFlag.METHOD, val=method)
 
         if row.num_inj:
-            self.edit_row_num(row=row_num, col_name=RegisterFlag.NUM_INJ, val=row.num_inj)
+            self._edit_row_num(row=row_num, col_name=RegisterFlag.NUM_INJ, val=row.num_inj)
 
         if row.inj_vol:
-            self.edit_row_text(row=row_num, col_name=RegisterFlag.INJ_VOL, val=row.inj_vol)
+            self._edit_row_text(row=row_num, col_name=RegisterFlag.INJ_VOL, val=row.inj_vol)
 
         if row.inj_source:
-            self.edit_row_text(row=row_num, col_name=RegisterFlag.INJ_SOR, val=row.inj_source.value)
+            self._edit_row_text(row=row_num, col_name=RegisterFlag.INJ_SOR, val=row.inj_source.value)
 
         if row.sample_name:
-            self.edit_row_text(row=row_num, col_name=RegisterFlag.NAME, val=row.sample_name)
+            self._edit_row_text(row=row_num, col_name=RegisterFlag.NAME, val=row.sample_name)
             if row.data_file:
-                self.edit_row_text(row=row_num, col_name=RegisterFlag.DATA_FILE, val=row.data_file)
+                self._edit_row_text(row=row_num, col_name=RegisterFlag.DATA_FILE, val=row.data_file)
             else:
-                self.edit_row_text(row=row_num, col_name=RegisterFlag.DATA_FILE, val=row.sample_name)
+                self._edit_row_text(row=row_num, col_name=RegisterFlag.DATA_FILE, val=row.sample_name)
 
         if row.sample_type:
-            self.edit_row_num(row=row_num, col_name=RegisterFlag.SAMPLE_TYPE, val=row.sample_type.value)
+            self._edit_row_num(row=row_num, col_name=RegisterFlag.SAMPLE_TYPE, val=row.sample_type.value)
 
         self.send(Command.SAVE_SEQUENCE_CMD)
 
@@ -159,6 +164,7 @@ class SequenceController(TableController):
         under the <data_dir>/<sequence table name> folder.
         Device must be ready.
         """
+        self.controller.send(Command.SAVE_METHOD_CMD)
         if not self.table_state:
             self.table_state = self.load()
 
@@ -186,10 +192,17 @@ 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
-        subdirs = [x[0] for x in os.walk(self.data_dir)]
-        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]
+        child_dirs = self.data_files[-1].child_dirs
+        if len(child_dirs) == 0:
+            subdirs = []
+            for d in self.data_dirs:
+                subdirs = [x[0] for x in os.walk(d)]
+                if len(subdirs) > 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]
 
         spectra: list[Union[AgilentChannelChromatogramData, ChromData]] = []
         all_w_spectra: list[Union[AgilentChannelChromatogramData, ChromData]] = []

pychemstation/control/controllers/tables/table.py

@@ -8,7 +8,7 @@ import abc
 import os
 import warnings
 from dataclasses import dataclass
-from typing import Union, Optional, AnyStr
+from typing import Union, Optional, AnyStr, List
 
 import numpy as np
 import polling
@@ -35,7 +35,7 @@ class TableController(abc.ABC):
 
     def __init__(self, controller: CommunicationController,
                  src: Optional[str],
-                 data_dir: Optional[str],
+                 data_dirs: Optional[List[str]],
                  table: Table,
                  offline: bool = False):
         self.controller = controller
@@ -51,23 +51,12 @@ class TableController(abc.ABC):
             elif isinstance(src, str):
                 raise FileNotFoundError(f"dir: {src} not found.")
 
-            if data_dir and os.path.isdir(data_dir):
-                self.data_dir: str = data_dir
-            elif isinstance(data_dir, str):
-                raise FileNotFoundError(f"dir: {data_dir} not found.")
-
-            if hasattr(self, "data_dir"):
-                self.spectra: dict[str, Optional[AgilentHPLCChromatogram]] = {
-                    "A": AgilentHPLCChromatogram(self.data_dir),
-                    "B": AgilentHPLCChromatogram(self.data_dir),
-                    "C": AgilentHPLCChromatogram(self.data_dir),
-                    "D": AgilentHPLCChromatogram(self.data_dir),
-                    "E": AgilentHPLCChromatogram(self.data_dir),
-                    "F": AgilentHPLCChromatogram(self.data_dir),
-                    "G": AgilentHPLCChromatogram(self.data_dir),
-                    "H": AgilentHPLCChromatogram(self.data_dir),
-                }
-        else:
+            if data_dirs:
+                for d in data_dirs:
+                    if not os.path.isdir(d):
+                        raise FileNotFoundError(f"dir: {d} not found.")
+                self.data_dirs: List[str] = data_dirs
+
             self.spectra: dict[str, Optional[AgilentHPLCChromatogram]] = {
                 "A": AgilentHPLCChromatogram(),
                 "B": AgilentHPLCChromatogram(),
@@ -79,7 +68,6 @@ class TableController(abc.ABC):
                 "H": AgilentHPLCChromatogram(),
             }
         self.data_files: Union[list[SequenceDataFiles], list[str]] = []
-
         self.uv = None
 
     def receive(self) -> Result[Response, str]:
@@ -137,10 +125,10 @@ class TableController(abc.ABC):
             col_name=col_name,
             val=val))
 
-    def edit_row_num(self,
-                     col_name: RegisterFlag,
-                     val: Union[int, float],
-                     row: Optional[int] = None):
+    def _edit_row_num(self,
+                      col_name: RegisterFlag,
+                      val: Union[int, float],
+                      row: Optional[int] = None):
         self.sleepy_send(TableOperation.EDIT_ROW_VAL.value.format(
             register=self.table.register,
             table_name=self.table.name,
@@ -148,10 +136,10 @@ class TableController(abc.ABC):
             col_name=col_name,
             val=val))
 
-    def edit_row_text(self,
-                      col_name: RegisterFlag,
-                      val: str,
-                      row: Optional[int] = None):
+    def _edit_row_text(self,
+                       col_name: RegisterFlag,
+                       val: str,
+                       row: Optional[int] = None):
         self.sleepy_send(TableOperation.EDIT_ROW_TEXT.value.format(
             register=self.table.register,
             table_name=self.table.name,
@@ -270,7 +258,12 @@ class TableController(abc.ABC):
         if os.path.exists(most_recent_folder):
             return Ok(most_recent_folder)
 
-        subdirs = [x[0] for x in os.walk(self.data_dir)]
+        subdirs = []
+        for d in self.data_dirs:
+            subdirs = [x[0] for x in os.walk(d)]
+            if len(subdirs) > 0:
+                break
+        assert len(subdirs) > 0
         potential_folders = sorted(list(filter(lambda d: most_recent_folder in d, subdirs)))
         parent_dirs = []
         for folder in potential_folders:
@@ -305,5 +298,5 @@ class TableController(abc.ABC):
             try:
                 spec.load_spectrum(data_path=data_path, channel=channel)
             except FileNotFoundError:
-                self.spectra[channel] = AgilentHPLCChromatogram(self.data_dir)
+                self.spectra[channel] = AgilentHPLCChromatogram()
                 print(f"No data at channel: {channel}")

pychemstation/control/hplc.py

@@ -4,7 +4,7 @@ Module to provide API for higher-level HPLC actions.
 Authors: Lucy Hao
 """
 
-from typing import Union, Optional
+from typing import Union, Optional, List
 
 from .controllers.devices.injector import InjectorController
 from ..control.controllers import MethodController, SequenceController, CommunicationController
@@ -40,25 +40,24 @@ class HPLCController:
 
     def __init__(self,
                  comm_dir: str,
-                 data_dir: str,
                  method_dir: str,
                  sequence_dir: str,
-                 sequence_data_dir: Optional[str] = None,
+                 data_dirs: List[str],
                  offline: bool = False):
         """Initialize HPLC controller. The `hplc_talk.mac` macro file must be loaded in the Chemstation software.
         `comm_dir` must match the file path in the macro file.
 
         :param comm_dir: Name of directory for communication, where ChemStation will read and write from. Can be any existing directory.
-        :param data_dir: Name of directory for storing data after method or sequence runs.
+        :param data_dirs: Name of directories for storing data after method or sequence runs. Method data dir is default
+        the first one in the list. In other words, the first dir in the list is highest prio.
         :param method_dir: Name of directory where method files are stored.
         :param sequence_dir: Name of directory where sequence files are stored.
-        :param sequence_data_dir: Name of directory for storing sequence data, if different from method
         :raises FileNotFoundError: If either `data_dir`, `method_dir`, `sequence_dir`, `sequence_data_dir`or `comm_dir` is not a valid directory.
         """
         self.comm = CommunicationController(comm_dir=comm_dir) if not offline else None
         self.method_controller = MethodController(controller=self.comm,
                                                   src=method_dir,
-                                                  data_dir=data_dir,
+                                                  data_dirs=data_dirs,
                                                   table=self.METHOD_TIMETABLE,
                                                   offline=offline,
                                                   injector_controller=InjectorController(controller=self.comm,
@@ -66,7 +65,7 @@ class HPLCController:
                                                                                          offline=offline))
         self.sequence_controller = SequenceController(controller=self.comm,
                                                       src=sequence_dir,
-                                                      data_dir=data_dir if not sequence_data_dir else sequence_data_dir,
+                                                      data_dirs=data_dirs,
                                                       table=self.SEQUENCE_TABLE,
                                                       method_dir=method_dir,
                                                       offline=offline)
@@ -157,7 +156,7 @@ class HPLCController:
         :param row: sequence row entry with updated information
         :param num: the row to edit, based on 1-based indexing
         """
-        self.sequence_controller.edit_row(row, num)
+        self.sequence_controller._edit_row(row, num)
 
     def get_last_run_method_data(self, read_uv: bool = False,
                                  data: Optional[str] = None) -> AgilentChannelChromatogramData:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.6.6
+Version: 0.7.0.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
@@ -15,6 +15,7 @@ Requires-Dist: seabreeze
 Requires-Dist: xsdata
 Requires-Dist: result
 Requires-Dist: rainbow-api
+Requires-Dist: aghplctools==4.8.6
 
 # Agilent HPLC Macro Control
 

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

@@ -6,7 +6,7 @@ pychemstation/analysis/spec_utils.py,sha256=UOo9hJR3evJfmaohEEsyb7aq6X996ofuUfu-
 pychemstation/analysis/utils.py,sha256=ISupAOb_yqA4_DZRK9v18UL-XjUQccAicIJKb1VMnGg,2055
 pychemstation/control/__init__.py,sha256=4xTy8X-mkn_PPZKr7w9rnj1wZhtmTesbQptPhpYmKXs,64
 pychemstation/control/comm.py,sha256=u44g1hTluQ0yUG93Un-QAshScoDpgYRrZfFTgweP5tY,7386
-pychemstation/control/hplc.py,sha256=ZtwayFZ0CnvbdVGVIZ3aEe5SuJslwYxW0BlwHyJ7NSo,10324
+pychemstation/control/hplc.py,sha256=XhZgJEU-dHHYu2GUFGlxystlLpZ6rxRzpmBVhJ3hixc,10256
 pychemstation/control/controllers/__init__.py,sha256=EM6LBNSTJqYVatmnvPq0P-S3q0POA88c-y64zL79I_I,252
 pychemstation/control/controllers/comm.py,sha256=IU4I_Q42VNCNUlVi93MxCmw2EBY9hiBDkU9FxubKg3c,7441
 pychemstation/control/controllers/method.py,sha256=XUclB7lQ_SIkquR58MBmmi9drHIPEq9AR8VprTLenvI,15503
@@ -16,13 +16,13 @@ pychemstation/control/controllers/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 pychemstation/control/controllers/devices/column.py,sha256=SCpCnVFZFUM9LM51MbWkVcBRayN3WFxy7lz9gs2PYeY,348
 pychemstation/control/controllers/devices/dad.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pychemstation/control/controllers/devices/device.py,sha256=QUFpUwmGxMzmG1CiRhNauV5cVZEJyRXyQDNQuW8Qfxk,762
-pychemstation/control/controllers/devices/injector.py,sha256=Kxf4NjxPUt2xjOmJ9Pea1b9YzWyGcpW8VdOlx9Jo-Nw,5540
+pychemstation/control/controllers/devices/injector.py,sha256=ynPQtvMFt1iK0LQBf4ZEYdxJCyavmashXwyCQbmRjuw,5542
 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=Bzo0BHatMOFf_TmMBVuQbtLvZRTARaW5q1e2-WKJVHY,16435
+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=RvJEtOskHDAkQOmfZBxvCg2cPoy83zN4LudYmRfp5wg,8935
-pychemstation/control/controllers/tables/table.py,sha256=EqlCrx0wN48_JyzlW7YekgaBePoaD9liC0vomaJsswI,12685
+pychemstation/control/controllers/tables/sequence.py,sha256=zKv0KPSRzCL0UKAUWL3g5T35XUe30aUwHfidf3dzRDs,9349
+pychemstation/control/controllers/tables/table.py,sha256=CchpkYabgzVgX6m-vQQIOikJX2Z_Zbaw9K62zED2lgQ,12171
 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
@@ -41,18 +41,18 @@ pychemstation/utils/sequence_types.py,sha256=x2EClcq6ROdzeLZg63XcXXTknwl2aZ48Vuy
 pychemstation/utils/table_types.py,sha256=0kg7gZXFk7O5l0K1BEBaF4OFFdja3-hFUG9UbN5PBcs,3173
 pychemstation/utils/tray_types.py,sha256=3W0IE20SEqnRRa6pZ4Jv94Cn4-3-LGoP-hxUz5LCztc,4403
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/constants.py,sha256=7CpYly3S549ALNNezO_KVqEPzl6fIdmTuTfJVFwzZq8,3278
+tests/constants.py,sha256=3E0GUPV-ozPVZ6Qrfq3aTDqCgVWt1fUk8_u4cfyuUvg,3560
 tests/test_comb.py,sha256=TS-CbtiPbntL4u6E1gSZ6xquNp6cQxIFdJqUr2ak7PA,5515
 tests/test_comm.py,sha256=iwl-Ey-xoytXmlNrjG84pDm82Ry_QUX6wY4gmVh4NDc,2516
 tests/test_inj.py,sha256=UakPA1Sd1GAbFvFepEredWcWPoW7PMLKotfqVZ1i4hE,1434
 tests/test_method.py,sha256=KB7yAtVb4gZftnYzh-VfPb9LGVZOHUIW6OljEYRtbhA,4570
 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=-u9lFUwn26ZsNJtV3yMR8irjdrVezMCjWwImbq6m0H0,3487
+tests/test_runs_stable.py,sha256=sT9gNt7Rscz73BybpRGYj8RSGPBR58wrzvIAFFK-_pM,5530
 tests/test_sequence.py,sha256=vs5-dqkItRds_tPM2-N6MNJ37FB0nLRFaDzBV8d42i8,4880
-tests/test_stable.py,sha256=9JNSW5bl13KEJKTNRWR9nCwrGSCYbVClx1yKXAL50xA,11565
-pychemstation-0.6.6.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.6.6.dist-info/METADATA,sha256=qourniSkdu8Q6IUlkeilY6ffoPEeFQxLZslk8ryzI94,4370
-pychemstation-0.6.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pychemstation-0.6.6.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
-pychemstation-0.6.6.dist-info/RECORD,,
+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/constants.py

@@ -10,26 +10,30 @@ DEFAULT_METHOD = "GENERAL-POROSHELL-OPT"
 DEFAULT_SEQUENCE = "hplc_testing"
 
 # CONSTANTS: paths only work in Hein group HPLC machine in room 242
-DEFAULT_COMMAND_PATH = "C:\\Users\\User\\Desktop\\Lucy\\"
+DEFAULT_COMMAND_PATH = "C:\\Users\\User\\Desktop\\Lucy\\hplc-method-optimization\\tests\\"
 DEFAULT_METHOD_DIR = "C:\\ChemStation\\1\\Methods\\"
-DATA_DIR = "C:\\Users\\Public\\Documents\\ChemStation\\3\\Data"
+DATA_DIR = "C:\\Users\\Public\\Documents\\ChemStation\\2\\Data\\LC-BO\\"
 SEQUENCE_DIR = "C:\\USERS\\PUBLIC\\DOCUMENTS\\CHEMSTATION\\3\\Sequence"
+SEQUENCE_DATA_DIR = "C:\\Users\\Public\\Documents\\ChemStation\\3\\Data\\"
 
 HEIN_LAB_CONSTANTS = [DEFAULT_COMMAND_PATH,
                       DEFAULT_METHOD_DIR,
                       DATA_DIR,
-                      SEQUENCE_DIR]
+                      SEQUENCE_DIR,
+                      SEQUENCE_DATA_DIR]
 
 # 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\\LC BO\\"
 SEQUENCE_DIR_254 = "C:\\1\\Sequence\\"
+SEQUENCE_DATA_DIR_254 = "D:\\Chemstation\\1\\Data\\"
 
 HEIN_LAB_CONSTANTS_254 = [DEFAULT_COMMAND_PATH_254,
                           DEFAULT_METHOD_DIR_254,
                           DATA_DIR_254,
-                          SEQUENCE_DIR_254]
+                          SEQUENCE_DIR_254,
+                          SEQUENCE_DATA_DIR_254]
 
 
 def room(num: int):
@@ -77,7 +81,7 @@ def set_up_utils(num: int) -> HPLCController:
 
     controller = HPLCController(comm_dir=path_constants[0],
                                 method_dir=path_constants[1],
-                                data_dir=path_constants[2],
+                                data_dirs=[path_constants[2], path_constants[4]],
                                 sequence_dir=path_constants[3])
     controller.send(Command.SAVE_METHOD_CMD.value.format(commit_msg="method saved by pychemstation"))
     controller.send(Command.SAVE_SEQUENCE_CMD)

tests/test_runs_stable.py

@@ -1,4 +1,3 @@
-
 import unittest
 
 from pychemstation.utils.tray_types import FiftyFourVialPlate, Plate, Letter, Num
@@ -9,7 +8,7 @@ run_too = True
 
 class TestRunsStable(unittest.TestCase):
     def setUp(self):
-        self.hplc_controller = set_up_utils(254)
+        self.hplc_controller = set_up_utils(242)
 
     def test_run_method(self):
         try:
@@ -53,7 +52,7 @@ class TestRunsStable(unittest.TestCase):
                     num_inj=1,
                     sample_type=SampleType.SAMPLE
                 )])
-            self.hplc_controller.edit_sequence(seq_table) # bug didnt delete all the rows, left an extra
+            self.hplc_controller.edit_sequence(seq_table)  # nvm no bug??
 
             self.hplc_controller.method_controller.switch(DEFAULT_METHOD)
             rand_method = MethodDetails(
@@ -80,9 +79,47 @@ class TestRunsStable(unittest.TestCase):
     def test_run_sequence(self):
         try:
             self.hplc_controller.switch_sequence(sequence_name=DEFAULT_SEQUENCE)
+            seq_table = SequenceTable(
+                name=DEFAULT_SEQUENCE,
+                rows=[SequenceEntry(vial_location=FiftyFourVialPlate(plate=Plate.ONE, letter=Letter.A, num=Num.ONE),
+                                    sample_name="P1-A1",
+                                    method=DEFAULT_METHOD,
+                                    inj_source=InjectionSource.HIP_ALS,
+                                    inj_vol=0.5,
+                                    num_inj=1,
+                                    sample_type=SampleType.SAMPLE),
+                      SequenceEntry(vial_location=FiftyFourVialPlate(plate=Plate.ONE, letter=Letter.A, num=Num.TWO),
+                                    sample_name="P1-A2",
+                                    method=DEFAULT_METHOD,
+                                    inj_source=InjectionSource.HIP_ALS,
+                                    inj_vol=0.5,
+                                    num_inj=1,
+                                    sample_type=SampleType.SAMPLE),
+                      SequenceEntry(vial_location=FiftyFourVialPlate(plate=Plate.ONE, letter=Letter.A, num=Num.THREE),
+                                    sample_name="P1-A3",
+                                    method=DEFAULT_METHOD,
+                                    inj_source=InjectionSource.HIP_ALS,
+                                    inj_vol=0.5,
+                                    num_inj=1,
+                                    sample_type=SampleType.SAMPLE)])
+            self.hplc_controller.edit_sequence(seq_table)
+            self.hplc_controller.switch_method(method_name=DEFAULT_METHOD)
+            method = MethodDetails(
+                name=DEFAULT_METHOD,
+                params=HPLCMethodParams(
+                    organic_modifier=5,
+                    flow=0.65),
+                timetable=[TimeTableEntry(
+                    start_time=3.50,
+                    organic_modifer=100,
+                    flow=0.65)],
+                stop_time=5,
+                post_time=1)
+            self.hplc_controller.edit_method(method)
             self.hplc_controller.preprun()
             self.hplc_controller.run_sequence()
-            chrom = self.hplc_controller.get_last_run_sequence_data()
-            self.assertTrue(len(chrom) == 1)
+            chroms = self.hplc_controller.get_last_run_sequence_data()
+            self.assertTrue(len(chroms) == 3)
         except Exception:
             self.fail("Failed")
+

tests/test_stable.py

@@ -8,7 +8,7 @@ from tests.constants import *
 class TestStable(unittest.TestCase):
 
     def setUp(self):
-        self.hplc_controller = set_up_utils(254)
+        self.hplc_controller = set_up_utils(242)
 
     def test_status_check_standby(self):
         self.hplc_controller.standby()
@@ -263,6 +263,21 @@ class TestStable(unittest.TestCase):
         for i in range(len(vial_locations)):
             self.assertEqual(vial_locations[i], FiftyFourVialPlate.from_int(vial_locations[i].value()))
 
+    def test_get_last_run_sequence(self):
+        path = "C:\\Users\\Public\\Documents\\ChemStation\\3\\Data\\hplc_testing 2025-03-24 16-28-16"
+        folder_name = "hplc_testing 2025-03-24 16-28"
+        self.hplc_controller.sequence_controller.data_files.append(SequenceDataFiles(dir=folder_name,
+                                                                                     sequence_name=DEFAULT_SEQUENCE))
+        try:
+            most_recent_folder = self.hplc_controller.sequence_controller.retrieve_recent_data_files()
+            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)
+            chrom = self.hplc_controller.get_last_run_sequence_data()
+            self.assertTrue(chrom)
+        except Exception:
+            self.fail()
+
 
 if __name__ == '__main__':
     unittest.main()