pychemstation 0.5.10__py3-none-any.whl → 0.5.12__py3-none-any.whl

pychemstation/control/controllers/sequence.py

@@ -1,15 +1,14 @@
-from typing import Optional
-
 import os
 import time
+from typing import Optional
 
-from ...control.controllers.table_controller import TableController
 from ...control.controllers.comm import CommunicationController
+from ...control.controllers.table_controller import TableController
 from ...utils.chromatogram import SEQUENCE_TIME_FORMAT, AgilentChannelChromatogramData
 from ...utils.macro import Command
 from ...utils.sequence_types import SequenceTable, SequenceEntry, SequenceDataFiles, InjectionSource, SampleType
-from ...utils.table_types import TableOperation, RegisterFlag, Table
-from ...utils.tray_types import TenColumn
+from ...utils.table_types import RegisterFlag, Table
+from ...utils.tray_types import TenVialColumn
 
 
 class SequenceController(TableController):
@@ -118,7 +117,7 @@ class SequenceController(TableController):
 
         if row.vial_location:
             loc = row.vial_location
-            if isinstance(row.vial_location, TenColumn):
+            if isinstance(row.vial_location, TenVialColumn):
                 loc = row.vial_location.value
             self.edit_row_num(row=row_num, col_name=RegisterFlag.VIAL_LOCATION, val=loc)
 

pychemstation/control/controllers/table_controller.py

@@ -207,7 +207,7 @@ class TableController(abc.ABC):
         """
         timeout = 10 * 60
         if method:
-            timeout = ((method.first_row.maximum_run_time + 5) * 60)
+            timeout = ((method.stop_time + method.post_time + 3) * 60)
         if sequence:
             timeout *= len(sequence.rows)
 

pychemstation/utils/macro.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Union
 from dataclasses import dataclass
@@ -32,7 +34,6 @@ class Command(Enum):
     INSTRUMENT_OFF = 'macro "SHUTDOWN.MAC" ,go'
     INSTRUMENT_ON = 'LIDoOperation "TURN_ON"'
 
-
     GET_METHOD_CMD = "response$ = _MethFile$"
     GET_ROWS_CMD = 'response_num = TabHdrVal({register}, "{table_name}", "{col_name}")'
     SWITCH_METHOD_CMD = 'LoadMethod "{method_dir}", "{method_name}.M"'

pychemstation/utils/method_types.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
 from typing import Union, Any, Optional
@@ -22,7 +24,7 @@ class Param:
 class HPLCMethodParams:
     organic_modifier: int
     flow: float
-    pressure: Optional[float] = None #TODO: find this
+    pressure: Optional[float] = None  # TODO: find this
 
 
 @dataclass

pychemstation/utils/table_types.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
 

pychemstation/utils/tray_types.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
 

{pychemstation-0.5.10.dist-info → pychemstation-0.5.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.10
+Version: 0.5.12
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao
@@ -13,6 +13,7 @@ License-File: LICENSE
 Requires-Dist: polling
 Requires-Dist: seabreeze
 Requires-Dist: xsdata
+Requires-Dist: result
 
 # Agilent HPLC Macro Control
 

{pychemstation-0.5.10.dist-info → pychemstation-0.5.12.dist-info}/RECORD

@@ -9,8 +9,8 @@ pychemstation/control/hplc.py,sha256=5xC5q-hrAn5hKdz-ZwT_Dlas9LWLV27jZvhCKj7Lzg4
 pychemstation/control/controllers/__init__.py,sha256=di3ytLIK-35XC_THw4IjNaOtCUTe7GuEOFb-obmREw4,166
 pychemstation/control/controllers/comm.py,sha256=IU4I_Q42VNCNUlVi93MxCmw2EBY9hiBDkU9FxubKg3c,7441
 pychemstation/control/controllers/method.py,sha256=XUclB7lQ_SIkquR58MBmmi9drHIPEq9AR8VprTLenvI,15503
-pychemstation/control/controllers/sequence.py,sha256=XMaYvbMRBdaZPdEEL12oAl5uUIDi-_fbPJUU-Uxtk8I,8297
-pychemstation/control/controllers/table_controller.py,sha256=ItuNJ3aQqx73rviGVXs7vYaZKA9icPFreOUuUZupqB4,11029
+pychemstation/control/controllers/sequence.py,sha256=kYNxxck2I-q9mZDEZwG8bJ_99FfLmunS13EAHOS65wU,8288
+pychemstation/control/controllers/table_controller.py,sha256=70ovnIjLKkJborS1ztk445Mv42TtUM9jUniaQmZuyWQ,11031
 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
@@ -20,20 +20,20 @@ pychemstation/generated/dad_method.py,sha256=0W8Z5WDtF5jpIcudMqb7XrkTnR2EGg_QOCs
 pychemstation/generated/pump_method.py,sha256=sUhE2Oo00nzVcoONtq3EMWsN4wLSryXbG8f3EeViWKg,12174
 pychemstation/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pychemstation/utils/chromatogram.py,sha256=-q3_hL9GTyi4C95os7IwAiOrkTM4EXIiigm-nW9pFmM,3221
-pychemstation/utils/macro.py,sha256=a6M6iK6c56Z75Opr2a-gsLKvMMpShu05DwcBYn5aTUs,2778
-pychemstation/utils/method_types.py,sha256=SRpr61Ca57NzfYoDiaooeI5tw1ESgVj_2-MctGyuN60,1478
+pychemstation/utils/macro.py,sha256=3KOuhFfs95JGdrIXGlYtlmMEQvWtjhN0eRSio4kjslM,2813
+pychemstation/utils/method_types.py,sha256=e7c2nWub6pT_S8ZF6sd7uXYm9ZBno0mARnzc1hnSHPY,1516
 pychemstation/utils/parsing.py,sha256=bnFIsZZwFy9NKzVUf517yN-ogzQbm0hp_aho3KUD6Is,9317
 pychemstation/utils/sequence_types.py,sha256=OhbmBUS7XQOKHC8YLjgbEVdpjriEc1bORkwB5ZV43oA,1063
-pychemstation/utils/table_types.py,sha256=HVE_tuM2TUED843iXvZqtONt8Eeolm6B5eciq60ZjR8,2521
-pychemstation/utils/tray_types.py,sha256=NzeH1IYI-k6u-2QrZshhx-lNlvOmGoOElbZ0fspT-38,654
+pychemstation/utils/table_types.py,sha256=mlbxPAiPvO_EBba5OSzuJcpCL0srrC7uUfm_lKsOsmA,2557
+pychemstation/utils/tray_types.py,sha256=Xe5UvDqGo_FL4roWGlrqoqH4_Kj1Hi60B9UaiNvBRAw,690
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/constants.py,sha256=iU6knsNpQGnBfGcC8VAj5SrCDcHD3jBZLhQdF6UUwY4,2452
 tests/test_comb.py,sha256=EDE1Ve0A_EK4qro9imZsrD0xXrQN8hAowiOWPFtw3dM,5515
 tests/test_comm.py,sha256=EYOpVXzEMQLGhhKYDPO-KaLcJdPSMPTD9Y4jSI0yVQY,2516
 tests/test_method.py,sha256=r1Q1irqiVzs31QuTYLX3u_A0FpX8rIAQ1L4WOk9tLbk,2473
 tests/test_sequence.py,sha256=Nz2iqp1cJgw6kcQvnwSkfBmhxpOH62PoEu6o_5rO-PY,4929
-pychemstation-0.5.10.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.5.10.dist-info/METADATA,sha256=tcPTswg-NhMQlf7iDC1iYmUlKCta5QSSVFxoUVP8Wgc,4308
-pychemstation-0.5.10.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pychemstation-0.5.10.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
-pychemstation-0.5.10.dist-info/RECORD,,
+pychemstation-0.5.12.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.5.12.dist-info/METADATA,sha256=ewxWIstBLkHdJaC4sF2JwejgLAZRrQq_xzuXGwj-1ks,4330
+pychemstation-0.5.12.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pychemstation-0.5.12.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
+pychemstation-0.5.12.dist-info/RECORD,,