pychemstation 0.5.6.dev1__tar.gz → 0.5.7.dev1__tar.gz

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.6.dev1
+Version: 0.5.7.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.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/control/controllers/comm.py

@@ -9,7 +9,7 @@ been processed.
 
 Authors: Alexander Hammer, Hessam Mehr, Lucy Hao
 """
-
+import logging
 import os
 import time
 
@@ -97,6 +97,7 @@ class CommunicationController:
         time.sleep(30)
         self.set_status()
         hplc_actually_avail = isinstance(self._most_recent_hplc_status, HPLCAvailStatus)
+        logging.info("Still running")
         return hplc_avail and hplc_actually_avail
 
     def _send(self, cmd: str, cmd_no: int, num_attempts=5) -> None:
@@ -183,7 +184,7 @@ class CommunicationController:
         num_response_prefix = "Numerical Responses:"
         str_response_prefix = "String Responses:"
         possible_response = self._receive(self.cmd_no)
-        if Ok(possible_response):
+        if possible_response.is_ok():
             lines = possible_response.value.splitlines()
             for line in lines:
                 if str_response_prefix in line and num_response_prefix in line:

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/control/controllers/method.py

@@ -21,6 +21,14 @@ class MethodController(TableController):
     def __init__(self, controller: CommunicationController, src: str, data_dir: str, table: Table):
         super().__init__(controller, src, data_dir, table)
 
+    def check_loaded_method(self):
+        time.sleep(2)
+        self.send(Command.GET_METHOD_CMD)
+        time.sleep(2)
+        res = self.receive()
+        if res.is_ok():
+            return res.ok_value.string_response
+
     def get_method_params(self) -> HPLCMethodParams:
         return HPLCMethodParams(organic_modifier=self.controller.get_num_val(
             cmd=TableOperation.GET_OBJ_HDR_VAL.value.format(
@@ -50,8 +58,12 @@ class MethodController(TableController):
     def load(self) -> MethodTimetable:
         rows = self.get_num_rows()
         if rows.is_ok():
+            self.send(Command.GET_METHOD_CMD)
+            res = self.receive()
+            method_name = res.ok_value.string_response
             timetable_rows = [self.get_row(r + 1) for r in range(int(rows.ok_value.num_response))]
             self.table_state = MethodTimetable(
+                name=method_name,
                 first_row=self.get_method_params(),
                 subsequent_rows=timetable_rows)
             return self.table_state
@@ -124,8 +136,7 @@ class MethodController(TableController):
                 first_row=HPLCMethodParams(
                     organic_modifier=organic_modifier.percentage,
                     flow=method.flow,
-                    maximum_run_time=method.stop_time,
-                    temperature=-1),
+                    maximum_run_time=method.stop_time),
                 subsequent_rows=[
                     TimeTableEntry(
                         start_time=tte.time,
@@ -146,6 +157,7 @@ class MethodController(TableController):
 
         :param updated_method: the method with updated values, to be sent to Chemstation to modify the currently loaded method.
         """
+        self.table_state = updated_method
         initial_organic_modifier: Param = Param(val=updated_method.first_row.organic_modifier,
                                                 chemstation_key=RegisterFlag.SOLVENT_B_COMPOSITION,
                                                 ptype=PType.NUM)
@@ -255,6 +267,9 @@ class MethodController(TableController):
 
         :param experiment_name: Name of the experiment
         """
+        if not self.table_state:
+            self.table_state = self.load()
+
         timestamp = time.strftime(TIME_FORMAT)
         self.send(Command.RUN_METHOD_CMD.value.format(data_dir=self.data_dir,
                                                       experiment_name=experiment_name,

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/control/controllers/sequence.py

@@ -73,7 +73,7 @@ class SequenceController(TableController):
 
         :param sequence_table:
         """
-
+        self.table_state = sequence_table
         rows = self.get_num_rows()
         if rows.is_ok():
             existing_row_num = rows.value.num_response
@@ -177,17 +177,19 @@ class SequenceController(TableController):
         under the <data_dir>/<sequence table name> folder.
         Device must be ready.
         """
+        if not self.table_state:
+            self.table_state = self.load()
+
         timestamp = time.strftime(SEQUENCE_TIME_FORMAT)
-        seq_table = self.load()
         self.send(Command.RUN_SEQUENCE_CMD.value)
 
         if self.check_hplc_is_running():
-            folder_name = f"{seq_table.name} {timestamp}"
+            folder_name = f"{self.table_state.name} {timestamp}"
             self.data_files.append(SequenceDataFiles(dir=folder_name,
-                                                     sequence_name=seq_table.name))
+                                                     sequence_name=self.table_state.name))
 
             if stall_while_running:
-                run_completed = self.check_hplc_done_running(sequence=seq_table)
+                run_completed = self.check_hplc_done_running(sequence=self.table_state)
                 if run_completed.is_ok():
                     self.data_files[-1].dir = run_completed.value
                 else:

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/control/controllers/table_controller.py

@@ -41,6 +41,10 @@ class TableController(abc.ABC):
             "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),
         }
 
         self.data_files: Union[list[SequenceDataFiles], list[str]] = []

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/control/hplc.py

@@ -138,6 +138,9 @@ class HPLCController:
         """
         return self.sequence_controller.get_data()
 
+    def check_loaded_method(self) -> str:
+        return self.method_controller.check_loaded_method()
+
     def load_method(self) -> MethodTimetable:
         """
         Returns the currently loaded method, including its timetable.

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/utils/chromatogram.py

@@ -109,3 +109,7 @@ class AgilentChannelChromatogramData:
     B: AgilentHPLCChromatogram
     C: AgilentHPLCChromatogram
     D: AgilentHPLCChromatogram
+    E: AgilentHPLCChromatogram
+    F: AgilentHPLCChromatogram
+    G: AgilentHPLCChromatogram
+    H: AgilentHPLCChromatogram

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/utils/method_types.py

@@ -6,6 +6,7 @@ from .table_types import RegisterFlag
 from ..generated import Signal, SolventElement
 
 
+
 class PType(Enum):
     STR = "str"
     NUM = "num"
@@ -34,6 +35,7 @@ class TimeTableEntry:
 
 @dataclass
 class MethodTimetable:
+    name: str
     first_row: HPLCMethodParams
     subsequent_rows: list[TimeTableEntry]
     dad_wavelengthes: Optional[list[Signal]] = None

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation/utils/table_types.py

@@ -46,6 +46,9 @@ class RegisterFlag(Enum):
 
     # for Method Timetable
     SOLVENT_COMPOSITION = "SolventComposition"
+    PRESSURE = "Pressure"
+    EXTERNAL_CONTACT = "ExternalContact"
+
 
     # for Sequence
     VIAL_LOCATION = "Vial"

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/pychemstation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.6.dev1
+Version: 0.5.7.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.6.dev1 → pychemstation-0.5.7.dev1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="pychemstation",
-    version="0.5.6.dev1",
+    version="0.5.7.dev1",
     author="Lucy Hao",
     author_email="lhao03@student.ubc.ca",
     description="Library to interact with Chemstation software, primarily used in Hein lab",

{pychemstation-0.5.6.dev1 → pychemstation-0.5.7.dev1}/tests/test_comb.py

@@ -41,6 +41,8 @@ class TestCombinations(unittest.TestCase):
             self.hplc_controller.edit_method(rand_method, save=True)
             if run_too:
                 self.hplc_controller.run_method(experiment_name="changed_method")
+                chrom = self.hplc_controller.get_last_run_method_data()
+                self.assertEqual(len(chrom.__dict__), 8)
         except Exception as e:
             self.fail(f"Should have not failed: {e}")
 
@@ -138,6 +140,6 @@ class TestCombinations(unittest.TestCase):
             self.hplc_controller.preprun()
             self.hplc_controller.run_sequence()
             chrom = self.hplc_controller.get_last_run_sequence_data()
-            self.assertTrue(len(chrom) == 2)
+            self.assertTrue(len(chrom) == 1)
         except Exception:
             self.fail("Failed")