pychemstation 0.10.12__py3-none-any.whl → 0.10.13__py3-none-any.whl

pychemstation/control/controllers/data_aq/sequence.py

@@ -70,19 +70,22 @@ class SequenceController(RunController):
                 f"couldn't read rows or sequence name: {seq_name.err_value}"
             )
 
-    def try_int(self, val: Any) -> Optional[int]:
+    @staticmethod
+    def try_int(val: Any) -> Optional[int]:
         try:
             return int(val)
         except ValueError:
             return None
 
-    def try_float(self, val: Any) -> Optional[float]:
+    @staticmethod
+    def try_float(val: Any) -> Optional[float]:
         try:
             return float(val)
         except ValueError:
             return None
 
-    def try_vial_location(self, val: Any) -> Tray:
+    @staticmethod
+    def try_vial_location(val: Any) -> Tray:
         try:
             return VialBar(val) if val <= 10 else FiftyFourVialPlate.from_int(num=val)
         except ValueError:
@@ -451,14 +454,19 @@ class SequenceController(RunController):
     def get_data(
         self, custom_path: Optional[str] = None
     ) -> List[AgilentChannelChromatogramData]:
-        seq_file_dir = (
-            SequenceDataFiles(dir=custom_path, sequence_name="")
-            if custom_path
-            else self.data_files[-1]
-        )
-        self.data_files[-1] = self._fuzzy_match_most_recent_folder(
+        print(custom_path)
+        if custom_path:
+            self.data_files.append(
+               SequenceDataFiles(dir=custom_path, sequence_name="") 
+            )
+        seq_file_dir = self.data_files[-1]
+        possible_seq_file_name = self._fuzzy_match_most_recent_folder(
             seq_file_dir
-        ).ok_value
+        )
+        if possible_seq_file_name.is_ok():
+            self.data_files[-1] = possible_seq_file_name.ok_value
+        else:
+            raise UserWarning(f"{possible_seq_file_name.err_value}")
         spectra: List[AgilentChannelChromatogramData] = []
         for row in self.data_files[-1].child_dirs:
             self.get_spectrum_at_channels(row)

pychemstation/control/controllers/devices/__init__.py

@@ -1,3 +1,6 @@
 from .injector import InjectorController
+from .pump import PumpController
+from .column import ColumnController
+from .dad import DADController
 
-__all__ = ["InjectorController"]
+__all__ = ["InjectorController", "PumpController", "ColumnController", "DADController"]

{pychemstation-0.10.12.dist-info → pychemstation-0.10.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pychemstation
-Version: 0.10.12
+Version: 0.10.13
 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

{pychemstation-0.10.12.dist-info → pychemstation-0.10.13.dist-info}/RECORD

@@ -11,8 +11,8 @@ pychemstation/control/controllers/__init__.py,sha256=q2TUEie3J-OLlxcGLkG7vIy8faz
 pychemstation/control/controllers/comm.py,sha256=ldM9mPIiT8txTJL_OzXsEQwQXQL-Q-9CWY4aEFeDUDQ,6651
 pychemstation/control/controllers/data_aq/__init__.py,sha256=w-Zgbit10niOQfz780ZmRHjUFxV1hMkdui7fOMPqeLA,132
 pychemstation/control/controllers/data_aq/method.py,sha256=K9dMJG8DtsaM1q8kmyBLuilKD9RAd5FOBB91QnC3wr0,20709
-pychemstation/control/controllers/data_aq/sequence.py,sha256=Jwt-qrWdsxAbxmDhR11CSlNS95rDfp5eeg_joOr5g2w,19215
-pychemstation/control/controllers/devices/__init__.py,sha256=QpgGnLXyWiB96KIB98wMccEi8oOUUaLxvBCyevJzcOg,75
+pychemstation/control/controllers/data_aq/sequence.py,sha256=HCZgT7d2AUGsSy8w6dlmZZ3z2Xf4Nktrx_OdWXPxiks,19486
+pychemstation/control/controllers/devices/__init__.py,sha256=uQBaaO4jUa16_Qb6SFPbqQHdSH0mvY9KPBQ0O0xD9XY,231
 pychemstation/control/controllers/devices/column.py,sha256=RLGPQm2bzM5TVGDTrXGBiWY_epvy_bprKN2cG_DdrUI,2165
 pychemstation/control/controllers/devices/dad.py,sha256=TEm4C01qdWlulwQ_uu0q7FmfHdJTXfzmvldc9LsKELk,3105
 pychemstation/control/controllers/devices/injector.py,sha256=fRUBdnI6imZKz7VXP6x8nWPmZLQ97Nlk1a7GEfAnpug,4189
@@ -40,7 +40,7 @@ pychemstation/utils/abc_tables/table.py,sha256=lIumyZ2qCaF9j7A2OF-FbQfK0NhpFACP_
 pychemstation/utils/mocking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pychemstation/utils/mocking/mock_comm.py,sha256=vZeYBXaKBZOlJmhn4TSbkov62gqlkfztqf3MSFU9kLE,800
 pychemstation/utils/mocking/mock_hplc.py,sha256=esVIlU4oqEsYLPOQs0AeVnKv9l52xBGT6UY862l9RQE,1163
-pychemstation-0.10.12.dist-info/METADATA,sha256=rmxsCsOBdkgMV6McmhLT1HmepJF_04cD0x47RUcfKds,5904
-pychemstation-0.10.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pychemstation-0.10.12.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.10.12.dist-info/RECORD,,
+pychemstation-0.10.13.dist-info/METADATA,sha256=K2wCBpKhM6zvZU_fvmX6vcRkBQQtE7LDnrqBO-23P8E,5904
+pychemstation-0.10.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pychemstation-0.10.13.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.10.13.dist-info/RECORD,,