pychemstation 0.10.8.dev3__tar.gz → 0.10.9__tar.gz

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pychemstation
-Version: 0.10.8.dev3
+Version: 0.10.9
 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
@@ -30,8 +30,7 @@ Description-Content-Type: text/markdown
 [![PyPI Latest Release](https://img.shields.io/pypi/v/pychemstation.svg)](https://pypi.org/project/pychemstation/)
 
 > **_NOTE:_** If you are running Python **3.8**, use versions 0.**8**.x. If you are running Python **3.9** use versions 0.**9**.x.
-> If you are running Python **>=3.10**, use version 0.**10**.x. You are welcome to use newer pychemstation versions with older Python versions, but functionality
-> is not guaranteed!
+> If you are running Python **>=3.10**, use version 0.**10**.x. Older versions of pychemstation are not the most feature-rich and bug-free. Please consider upgrading to using Python 3.10!
 
 Unofficial Python package to control Agilent Chemstation; we are not affiliated with Agilent.
 Check out the [docs](https://pychemstation-e5a086.gitlab.io/pychemstation.html) for usage instructions. This project is under
@@ -73,21 +72,17 @@ HPLCTalk_Run
 ## Example Usage
 
 ```python
+import time
 from pychemstation.control import HPLCController
 from pychemstation.utils.method_types import *
 import pandas as pd
 
-DEFAULT_METHOD_DIR = "C:\\ChemStation\\1\\Methods\\"
-SEQUENCE_DIR = "C:\\USERS\\PUBLIC\\DOCUMENTS\\CHEMSTATION\\3\\Sequence"
 DEFAULT_COMMAND_PATH = "C:\\Users\\User\\Desktop\\Lucy\\"
-DATA_DIR_2 = "C:\\Users\\Public\\Documents\\ChemStation\\2\\Data"
-DATA_DIR_3 = "C:\\Users\\Public\\Documents\\ChemStation\\3\\Data"
+CUSTOM_DATA_DIR = "C:\\Users\\Public\\Documents\\ChemStation\\2\\Data\\MyData"
 
 # Initialize HPLC Controller
-hplc_controller = HPLCController(extra_data_dirs=[DATA_DIR_2, DATA_DIR_3],
-                                 comm_dir=DEFAULT_COMMAND_PATH,
-                                 method_dir=DEFAULT_METHOD_DIR,
-                                 sequence_dir=SEQUENCE_DIR)
+hplc_controller = HPLCController(extra_data_dirs=[CUSTOM_DATA_DIR],
+                                 comm_dir=DEFAULT_COMMAND_PATH)
 
 # Switching a method
 hplc_controller.switch_method("General-Poroshell")
@@ -116,7 +111,17 @@ new_method = MethodDetails(
 hplc_controller.edit_method(new_method)
 
 # Run a method and get a report or data from last run method
-hplc_controller.run_method(experiment_name="test_experiment")
+hplc_controller.run_method(experiment_name="test_experiment", stall_while_running=False)
+time_left, done = hplc_controller.check_method_complete()
+while not done:
+    print(time_left)
+    time.sleep(time_left/2)
+    time_left, done = hplc_controller.check_method_complete()
+    
+# Save the path the HPLC data for later!  
+file_path = hplc_controller.get_last_run_method_file_path()
+
+# Make sure CSV reports are being generated in the post-run MACRO!
 report = hplc_controller.get_last_run_method_report()
 vial_location = report.vial_location
 

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/README.md

@@ -5,8 +5,7 @@
 [![PyPI Latest Release](https://img.shields.io/pypi/v/pychemstation.svg)](https://pypi.org/project/pychemstation/)
 
 > **_NOTE:_** If you are running Python **3.8**, use versions 0.**8**.x. If you are running Python **3.9** use versions 0.**9**.x.
-> If you are running Python **>=3.10**, use version 0.**10**.x. You are welcome to use newer pychemstation versions with older Python versions, but functionality
-> is not guaranteed!
+> If you are running Python **>=3.10**, use version 0.**10**.x. Older versions of pychemstation are not the most feature-rich and bug-free. Please consider upgrading to using Python 3.10!
 
 Unofficial Python package to control Agilent Chemstation; we are not affiliated with Agilent.
 Check out the [docs](https://pychemstation-e5a086.gitlab.io/pychemstation.html) for usage instructions. This project is under
@@ -48,21 +47,17 @@ HPLCTalk_Run
 ## Example Usage
 
 ```python
+import time
 from pychemstation.control import HPLCController
 from pychemstation.utils.method_types import *
 import pandas as pd
 
-DEFAULT_METHOD_DIR = "C:\\ChemStation\\1\\Methods\\"
-SEQUENCE_DIR = "C:\\USERS\\PUBLIC\\DOCUMENTS\\CHEMSTATION\\3\\Sequence"
 DEFAULT_COMMAND_PATH = "C:\\Users\\User\\Desktop\\Lucy\\"
-DATA_DIR_2 = "C:\\Users\\Public\\Documents\\ChemStation\\2\\Data"
-DATA_DIR_3 = "C:\\Users\\Public\\Documents\\ChemStation\\3\\Data"
+CUSTOM_DATA_DIR = "C:\\Users\\Public\\Documents\\ChemStation\\2\\Data\\MyData"
 
 # Initialize HPLC Controller
-hplc_controller = HPLCController(extra_data_dirs=[DATA_DIR_2, DATA_DIR_3],
-                                 comm_dir=DEFAULT_COMMAND_PATH,
-                                 method_dir=DEFAULT_METHOD_DIR,
-                                 sequence_dir=SEQUENCE_DIR)
+hplc_controller = HPLCController(extra_data_dirs=[CUSTOM_DATA_DIR],
+                                 comm_dir=DEFAULT_COMMAND_PATH)
 
 # Switching a method
 hplc_controller.switch_method("General-Poroshell")
@@ -91,7 +86,17 @@ new_method = MethodDetails(
 hplc_controller.edit_method(new_method)
 
 # Run a method and get a report or data from last run method
-hplc_controller.run_method(experiment_name="test_experiment")
+hplc_controller.run_method(experiment_name="test_experiment", stall_while_running=False)
+time_left, done = hplc_controller.check_method_complete()
+while not done:
+    print(time_left)
+    time.sleep(time_left/2)
+    time_left, done = hplc_controller.check_method_complete()
+    
+# Save the path the HPLC data for later!  
+file_path = hplc_controller.get_last_run_method_file_path()
+
+# Make sure CSV reports are being generated in the post-run MACRO!
 report = hplc_controller.get_last_run_method_report()
 vial_location = report.vial_location
 

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pychemstation/analysis/process_report.py

@@ -83,7 +83,9 @@ class CSVProcessor(ReportProcessor):
                 if "00" in name and file_extension.lower() == "csv":
                     prefix, _, _ = name.partition("00")
                     return prefix
-        raise FileNotFoundError("Couldn't find the prefix for CSV")
+        raise FileNotFoundError(
+            "Couldn't find the prefix for CSV, please make sure the post-run settings generate a CSV."
+        )
 
     def report_contains(self, labels: List[str], want: List[str]):
         for label in labels:

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pychemstation/control/controllers/data_aq/method.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 import time
 import warnings
-from typing import Dict, List, Optional, Set, Union, Tuple
+from typing import Dict, List, Optional, Union, Tuple
 
 from result import Err, Ok, Result
 
@@ -51,9 +51,7 @@ class MethodController(RunController):
         )
 
     def get_current_method_name(self) -> str:
-        time.sleep(2)
-        self.send(Command.GET_METHOD_CMD)
-        time.sleep(2)
+        self.sleepy_send(Command.GET_METHOD_CMD)
         res = self.receive()
         if res.is_ok():
             return res.ok_value.string_response
@@ -192,7 +190,6 @@ class MethodController(RunController):
                 method_dir=method_dir, method_name=method_name
             )
         )
-
         time.sleep(2)
         self.send(Command.GET_METHOD_CMD)
         time.sleep(2)
@@ -341,7 +338,7 @@ class MethodController(RunController):
         )
         if isinstance(method_param.chemstation_key, list):
             for register_flag in method_param.chemstation_key:
-                self.send(
+                self.sleepy_send(
                     setting_command.value.format(
                         register=register,
                         register_flag=register_flag,
@@ -349,20 +346,17 @@ class MethodController(RunController):
                     )
                 )
         else:
-            self.send(
+            self.sleepy_send(
                 setting_command.value.format(
                     register=register,
                     register_flag=method_param.chemstation_key,
                     val=method_param.val,
                 )
             )
-        time.sleep(2)
         self.download()
 
     def download(self):
-        self.send("Sleep 1")
         self.sleepy_send("DownloadRCMethod PMP1")
-        self.send("Sleep 1")
 
     def _edit_row(
         self,
@@ -579,10 +573,10 @@ class MethodController(RunController):
             else:
                 warnings.warn(run_completed.err_value)
         else:
-            folder = self._fuzzy_match_most_recent_folder(self.data_files[-1], None)
+            folder = self._fuzzy_match_most_recent_folder(self.data_files[-1])
             i = 0
             while folder.is_err() and i < 10:
-                folder = self._fuzzy_match_most_recent_folder(self.data_files[-1], None)
+                folder = self._fuzzy_match_most_recent_folder(self.data_files[-1])
                 i += 1
             if folder.is_ok():
                 self.data_files[-1] = folder.ok_value
@@ -591,11 +585,11 @@ class MethodController(RunController):
                 warnings.warn(warning)
 
     def _fuzzy_match_most_recent_folder(
-        self, most_recent_folder: T, child_dirs: Optional[Set[str]]
+        self, most_recent_folder: T
     ) -> Result[str, str]:
         if isinstance(most_recent_folder, str) or isinstance(most_recent_folder, bytes):
             if os.path.exists(most_recent_folder):
-                return Ok(most_recent_folder)
+                return Ok(str(most_recent_folder))
             return Err("Folder not found!")
         raise ValueError("Folder is not a str or byte type.")
 

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pychemstation/control/controllers/data_aq/sequence.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 import time
 import warnings
-from typing import Any, Dict, List, Optional, Union, Set, Tuple
+from typing import Any, Dict, List, Optional, Union, Tuple
 
 from result import Err, Ok, Result
 from typing_extensions import override
@@ -301,11 +301,6 @@ class SequenceController(RunController):
         under the <data_dir>/<sequence table name> folder.
         Device must be ready.
         """
-        if self.controller:
-            self.controller.send(Command.SAVE_METHOD_CMD)
-            self.controller.send(Command.SAVE_SEQUENCE_CMD)
-        else:
-            raise ValueError("Controller is offline!")
 
         current_sequence_name = self.get_current_sequence_name()
         if not self.table_state or self.table_state.name not in current_sequence_name:
@@ -333,6 +328,8 @@ class SequenceController(RunController):
         timestamp = time.strftime(SEQUENCE_TIME_FORMAT)
         folder_name = f"{self.table_state.name} {timestamp}"
 
+        self.send(Command.SAVE_METHOD_CMD)
+        self.send(Command.SAVE_SEQUENCE_CMD)
         self.send(Command.RUN_SEQUENCE_CMD.value)
         self.timeout = total_runtime * 60
 
@@ -344,12 +341,11 @@ class SequenceController(RunController):
                 break
 
         if hplc_running:
-            current_sample_file, full_path_name = self.try_getting_run_info(folder_name)
+            full_path_name, current_sample_file = self.try_getting_run_info(folder_name)
             if full_path_name and current_sample_file:
                 data_file = SequenceDataFiles(
                     sequence_name=self.table_state.name,
                     dir=full_path_name,
-                    _data_files=[r.data_file for r in self.table_state.rows],
                     child_dirs=[os.path.join(full_path_name, current_sample_file)],
                 )
                 self.data_files.append(data_file)
@@ -374,64 +370,25 @@ class SequenceController(RunController):
                 )
             except ValueError:
                 pass
-        if full_path_name and folder_name in full_path_name:
-            pass
-        else:
-            if self.controller:
-                self.controller.send(Command.GET_RUNNING_SEQUENCE_DIR)
-                res = self.controller.receive()
-                if res.is_ok():
-                    if os.path.isdir(res.ok_value.string_response):
-                        if folder_name in res.ok_value.string_response:
-                            full_path_name = res.ok_value.string_response
-                else:
-                    raise ValueError("Could not get sequence data folder.")
-            else:
-                raise ValueError("Controller is offline.")
-        if current_sample_file and full_path_name:
-            return full_path_name, current_sample_file
-        elif full_path_name:
-            return full_path_name, None
-        else:
-            raise ValueError("Could not get sequence data folder")
+            if current_sample_file and full_path_name:
+                return full_path_name, current_sample_file
+            elif full_path_name:
+                return full_path_name, None
+        raise ValueError("Could not get sequence data folder")
 
     @override
     def _fuzzy_match_most_recent_folder(
-        self, most_recent_folder: T, child_dirs: Optional[Set[str]]
+        self, most_recent_folder: T
     ) -> Result[SequenceDataFiles, str]:
         if isinstance(most_recent_folder, SequenceDataFiles):
             try:
                 if most_recent_folder.dir and os.path.isdir(most_recent_folder.dir):
                     subdirs = [x[0] for x in os.walk(most_recent_folder.dir)]
-                    if (
-                        child_dirs
-                        and len(child_dirs) > 0
-                        and set(most_recent_folder._data_files) == child_dirs
-                    ):
-                        most_recent_folder.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(
-                                filter(
-                                    lambda d: most_recent_folder.dir in d,
-                                    subdirs,
-                                )
-                            )
-                        )
-                        most_recent_folder.child_dirs = [
-                            f
-                            for f in potential_folders
-                            if most_recent_folder.dir in f
-                            and ".M" not in f
-                            and ".D" in f
-                        ]
+                    most_recent_folder.child_dirs = [
+                        f
+                        for f in subdirs
+                        if most_recent_folder.dir in f and ".D" in f and f[-1] == "D"
+                    ]
                     return Ok(most_recent_folder)
                 else:
                     return Err("No sequence folder found, please give the full path.")
@@ -446,14 +403,11 @@ class SequenceController(RunController):
             if custom_path
             else self.data_files[-1]
         )
-        if len(seq_data_dir.child_dirs) == 0:
-            search_folder = self._fuzzy_match_most_recent_folder(
-                seq_data_dir, set(seq_data_dir.child_dirs)
-            )
-            if search_folder.is_ok():
-                seq_data_dir = search_folder.ok_value
-            else:
-                raise FileNotFoundError(search_folder.err_value)
+        search_folder = self._fuzzy_match_most_recent_folder(seq_data_dir)
+        if search_folder.is_ok():
+            seq_data_dir = search_folder.ok_value
+        else:
+            raise FileNotFoundError(search_folder.err_value)
         all_w_spectra: List[Dict[int, AgilentHPLCChromatogram]] = []
         for row in seq_data_dir.child_dirs:
             all_w_spectra.append(self.get_data_uv(custom_path=row))
@@ -477,10 +431,9 @@ class SequenceController(RunController):
             if custom_path
             else self.data_files[-1]
         )
-        if len(seq_file_dir.child_dirs) == 0:
-            self.data_files[-1] = self._fuzzy_match_most_recent_folder(
-                seq_file_dir, set(seq_file_dir.child_dirs)
-            ).ok_value
+        self.data_files[-1] = self._fuzzy_match_most_recent_folder(
+            seq_file_dir
+        ).ok_value
         spectra: List[AgilentChannelChromatogramData] = []
         for row in self.data_files[-1].child_dirs:
             self.get_spectrum_at_channels(row)
@@ -499,17 +452,13 @@ class SequenceController(RunController):
                         dir=custom_path,
                         sequence_name="NA",
                     ),
-                    child_dirs=None,
                 ).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
-            )
+        parent_dir = self._fuzzy_match_most_recent_folder(
+            most_recent_folder=parent_dir,
+        ).ok_value
+        assert len(parent_dir.child_dirs) != 0
         spectra = self.get_data()
         reports = []
         for i, child_dir in enumerate(parent_dir.child_dirs):

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pychemstation/control/hplc.py

@@ -252,7 +252,6 @@ class HPLCController:
         if len(self.sequence_controller.data_files):
             self.sequence_controller._fuzzy_match_most_recent_folder(
                 most_recent_folder=self.sequence_controller.data_files[-1],
-                child_dirs=set(),
             )
             return self.sequence_controller.data_files[-1]
         else:

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pychemstation/utils/abc_tables/abc_comm.py

@@ -88,10 +88,15 @@ class ABCCommunicationController(abc.ABC):
         :return: whether the HPLC machine is in a safe state to retrieve data back."""
         self.set_status()
         hplc_avail = isinstance(self._most_recent_hplc_status, HPLCAvailStatus)
-        time.sleep(5)
+        time.sleep(10)
         self.set_status()
         hplc_actually_avail = isinstance(self._most_recent_hplc_status, HPLCAvailStatus)
-        return hplc_avail and hplc_actually_avail
+        time.sleep(10)
+        self.set_status()
+        hplc_final_check_avail = isinstance(
+            self._most_recent_hplc_status, HPLCAvailStatus
+        )
+        return hplc_avail and hplc_actually_avail and hplc_final_check_avail
 
     def sleepy_send(self, cmd: Union[Command, str]):
         self.send("Sleep 0.1")

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pychemstation/utils/abc_tables/run.py

@@ -94,9 +94,7 @@ class RunController(ABCTableController, abc.ABC):
         return object.__new__(cls)
 
     @abc.abstractmethod
-    def _fuzzy_match_most_recent_folder(
-        self, most_recent_folder: T, child_dirs: Set[str]
-    ) -> Result[T, str]:
+    def _fuzzy_match_most_recent_folder(self, most_recent_folder: T) -> Result[T, str]:
         pass
 
     @abc.abstractmethod
@@ -192,9 +190,7 @@ class RunController(ABCTableController, abc.ABC):
         else:
             raise ValueError("Timeout value is None, no comparison can be made.")
 
-        check_folder = self._fuzzy_match_most_recent_folder(
-            self.data_files[-1], self.current_run_child_files
-        )
+        check_folder = self._fuzzy_match_most_recent_folder(self.data_files[-1])
         if check_folder.is_ok() and finished_run:
             return check_folder
         elif check_folder.is_ok():

pychemstation-0.10.9/pychemstation/utils/device_types.py

@@ -0,0 +1,7 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class SignalRead:
+    on: bool
+    wavelength: int

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pychemstation/utils/sequence_types.py

@@ -13,13 +13,11 @@ class SequenceDataFiles:
 
     :param sequence_name: the name of the sequence that is running
     :param dir: the complete path of the directory generated for the sequence
-    :param _data_files: the names of the files of the sequence runs, ends with ".D"
     :param child_dirs: the complete path of the files for sequence runs, contains the Chemstation data, `dir` and the sample run file.
     """
 
     sequence_name: str
     dir: str
-    _data_files: List[str] = field(default_factory=list)
     child_dirs: List[str] = field(default_factory=list)
 
 

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pychemstation"
-version = "0.10.8.dev3"
+version = "0.10.9"
 description = "Library to interact with Chemstation software, primarily used in Hein lab"
 authors = [{ name = "lucyhao", email = "hao.lucyy@gmail.com" }]
 requires-python = ">=3.10"

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/tests/comm/out.txt

@@ -196,3 +196,114 @@ SaveSequence _SeqPath$, _SeqFile$
 macro "SHUTDOWN.MAC" ,go
 Standby
 response$ = AcqStatus$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+response_num = 10
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+LoadMethod "C:\ChemStation\1\Methods\", "GENERAL-POROSHELL-OPT.M"
+response$ = _MethFile$
+response$ = _MethFile$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+response$ = _MethFile$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+Local TestNum
+TestNum = 0
+Print TestNum
+response_num = TestNum
+Print response_num
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+PrepRun
+response$ = AcqStatus$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+Standby
+response$ = AcqStatus$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+response_num = 10
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+LoadMethod "C:\ChemStation\1\Methods\", "GENERAL-POROSHELL-OPT.M"
+response$ = _MethFile$
+response$ = _MethFile$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+response$ = _MethFile$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+Local TestNum
+TestNum = 0
+Print TestNum
+response_num = TestNum
+Print response_num
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+PrepRun
+response$ = AcqStatus$
+response$ = AcqStatus$
+response$ = _METHPATH$
+response$ = _SEQUENCEPATHS$
+response$ = _DATAPATHS$
+SaveMethod _MethPath$, _MethFile$, "method saved by pychemstation"
+SaveSequence _SeqPath$, _SeqFile$
+macro "SHUTDOWN.MAC" ,go
+Standby
+response$ = AcqStatus$

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/tests/constants.py

@@ -117,11 +117,11 @@ def set_up_utils(
             )
         )
         controller.send(Command.SAVE_SEQUENCE_CMD)
-    if runs:
-        controller.instrument_on()
-        controller.preprun()
-    else:
-        controller.instrument_off()
+        if runs:
+            controller.instrument_on()
+            controller.preprun()
+        else:
+            controller.instrument_off()
     return controller
 
 

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/tests/edit/test_edit_sequence.py

@@ -31,7 +31,13 @@ class TestSequence(unittest.TestCase):
     def setUp(self):
         num = 242
         self.hplc_controller = set_up_utils(num, offline=False, runs=False)
-        self.other_default = DEFAULT_METHOD_242 if num == 242 else DEFAULT_METHOD_254
+        self.other_default = (
+            os.path.join(self.hplc_controller.method_controller.src, DEFAULT_METHOD_242)
+            if num == 242
+            else os.path.join(
+                self.hplc_controller.method_controller.src, DEFAULT_METHOD_254
+            )
+        )
         self.hplc_controller.switch_sequence(DEFAULT_SEQUENCE)
         self.meth_path = os.path.join(
             self.hplc_controller.method_controller.src, DEFAULT_METHOD
@@ -284,7 +290,7 @@ class TestSequence(unittest.TestCase):
             )
             seq_table.rows[1].method = self.other_default
             self.hplc_controller.sequence_controller.edit_method_name(
-                seq_table.rows[1].method, 1
+                seq_table.rows[1].method, 2
             )
             loaded_seq = self.hplc_controller.load_sequence()
             self.assertEqual(seq_table, loaded_seq)

{pychemstation-0.10.8.dev3 → pychemstation-0.10.9}/tests/files/test_offline.py

@@ -39,15 +39,15 @@ class TestOffline(unittest.TestCase):
         )
         try:
             most_recent_folder = self.hplc_controller.sequence_controller.data_files[-1]
+            chrom = self.hplc_controller.get_last_run_sequence_data()
+            report = self.hplc_controller.get_last_run_sequence_reports()
             check_folder = self.hplc_controller.sequence_controller._fuzzy_match_most_recent_folder(
-                most_recent_folder=most_recent_folder, child_dirs=None
+                most_recent_folder=most_recent_folder,
             )
             self.assertEqual(check_folder.ok_value.dir, os.path.join(self.cwd, path))
             self.hplc_controller.sequence_controller.data_files[
                 -1
             ].dir = check_folder.ok_value
-            chrom = self.hplc_controller.get_last_run_sequence_data()
-            report = self.hplc_controller.get_last_run_sequence_reports()
             self.assertEqual(len(report), len(chrom))
             self.assertEqual(report[0].vial_location, FiftyFourVialPlate.from_int(4097))
             self.assertEqual(len(report[0].signals), 5)
@@ -115,7 +115,6 @@ class TestOffline(unittest.TestCase):
             SequenceDataFiles(
                 dir=os.path.join(os.getcwd(), "hplc_testing 2025-03-27 17-13-47"),
                 child_dirs=[],
-                _data_files=[],
                 sequence_name=DEFAULT_SEQUENCE,
             )
         )