pychemstation 0.10.3__py3-none-any.whl → 0.10.5__py3-none-any.whl

pychemstation/utils/tray_types.py

@@ -19,16 +19,16 @@ class Num(Enum):
     @classmethod
     def from_num(cls, num: int):
         num_mapping = {
-        1: Num.ONE,
-        2: Num.TWO,
-        3: Num.THREE,
-        4: Num.FOUR,
-        5: Num.FIVE,
-        6: Num.SIX,
-        7: Num.SEVEN,
-        8: Num.EIGHT,
-        9: Num.NINE
-    }
+            1: Num.ONE,
+            2: Num.TWO,
+            3: Num.THREE,
+            4: Num.FOUR,
+            5: Num.FIVE,
+            6: Num.SIX,
+            7: Num.SEVEN,
+            8: Num.EIGHT,
+            9: Num.NINE,
+        }
 
         if num in num_mapping:
             return num_mapping[num]
@@ -58,13 +58,13 @@ class Letter(Enum):
     @classmethod
     def from_str(cls, let: str) -> Letter:
         letter_mapping = {
-        "A": Letter.A,
-        "B": Letter.B,
-        "C": Letter.C,
-        "D": Letter.D,
-        "E": Letter.E,
-        "F": Letter.F
-    }
+            "A": Letter.A,
+            "B": Letter.B,
+            "C": Letter.C,
+            "D": Letter.D,
+            "E": Letter.E,
+            "F": Letter.F,
+        }
 
         if let in letter_mapping:
             return letter_mapping[let]
@@ -83,6 +83,7 @@ class FiftyFourVialPlate:
     valid vial locations: P1-A2, P2-F9
     invalid vial locations: P3-A1, P1-Z3, P2-B10
     """
+
     plate: Plate
     letter: Letter
     num: Num
@@ -100,16 +101,22 @@ class FiftyFourVialPlate:
         :raises: ValueError if string is invalid tray location
         """
         if len(loc) != 5:
-            raise ValueError("Plate locations must be PX-LY, where X is either 1 or 2 and Y is 1 to 9")
+            raise ValueError(
+                "Plate locations must be PX-LY, where X is either 1 or 2 and Y is 1 to 9"
+            )
         try:
             plate = int(loc[1])
             letter = loc[3]
             num = int(loc[4])
-            return FiftyFourVialPlate(plate=Plate.from_num(plate),
-                                      letter=Letter.from_str(letter),
-                                      num=Num.from_num(num))
-        except Exception as e:
-            raise ValueError("Plate locations must be PX-LY, where X is either 1 or 2 and Y is 1 to 9")
+            return FiftyFourVialPlate(
+                plate=Plate.from_num(plate),
+                letter=Letter.from_str(letter),
+                num=Num.from_num(num),
+            )
+        except Exception:
+            raise ValueError(
+                "Plate locations must be PX-LY, where X is either 1 or 2 and Y is 1 to 9"
+            )
 
     @classmethod
     def from_int(cls, num: int) -> Tray:
@@ -125,19 +132,19 @@ class FiftyFourVialPlate:
 
         row_starts = [
             # plate 1
-            FiftyFourVialPlate.from_str('P1-F1'),
-            FiftyFourVialPlate.from_str('P1-E1'),
-            FiftyFourVialPlate.from_str('P1-D1'),
-            FiftyFourVialPlate.from_str('P1-C1'),
-            FiftyFourVialPlate.from_str('P1-B1'),
-            FiftyFourVialPlate.from_str('P1-A1'),
+            FiftyFourVialPlate.from_str("P1-F1"),
+            FiftyFourVialPlate.from_str("P1-E1"),
+            FiftyFourVialPlate.from_str("P1-D1"),
+            FiftyFourVialPlate.from_str("P1-C1"),
+            FiftyFourVialPlate.from_str("P1-B1"),
+            FiftyFourVialPlate.from_str("P1-A1"),
             # plate 2
-            FiftyFourVialPlate.from_str('P2-F1'),
-            FiftyFourVialPlate.from_str('P2-E1'),
-            FiftyFourVialPlate.from_str('P2-D1'),
-            FiftyFourVialPlate.from_str('P2-C1'),
-            FiftyFourVialPlate.from_str('P2-B1'),
-            FiftyFourVialPlate.from_str('P2-A1'),
+            FiftyFourVialPlate.from_str("P2-F1"),
+            FiftyFourVialPlate.from_str("P2-E1"),
+            FiftyFourVialPlate.from_str("P2-D1"),
+            FiftyFourVialPlate.from_str("P2-C1"),
+            FiftyFourVialPlate.from_str("P2-B1"),
+            FiftyFourVialPlate.from_str("P2-A1"),
         ]
 
         # find which row
@@ -161,7 +168,8 @@ class FiftyFourVialPlate:
                     return FiftyFourVialPlate(
                         plate=starting_loc.plate,
                         letter=starting_loc.letter,
-                        num=Num.from_num(i))
+                        num=Num.from_num(i),
+                    )
         raise ValueError("Number didn't match any location. " + str(num))
 
 
@@ -169,6 +177,7 @@ class TenVialColumn(Enum):
     """
     Class to represent the 10 vial locations.
     """
+
     ONE = 1
     TWO = 2
     THREE = 3

{pychemstation-0.10.3.dist-info → pychemstation-0.10.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pychemstation
-Version: 0.10.3
+Version: 0.10.5
 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
@@ -12,12 +12,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
-Requires-Dist: aghplctools>=4.8.8
+Requires-Dist: aghplctools==4.8.6
 Requires-Dist: coverage>=7.6.1
 Requires-Dist: matplotlib>=3.7.5
 Requires-Dist: pandas>=2.0.3
 Requires-Dist: pdoc>=14.7.0
 Requires-Dist: polling>=0.3.2
+Requires-Dist: pre-commit>=4.2.0
 Requires-Dist: pytest>=7.3.5
 Requires-Dist: rainbow-api>=1.0.10
 Requires-Dist: result>=0.17.0
@@ -34,8 +35,8 @@ 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.10**, use
-> version 0.**10**.x. You are welcome to use newer pychemstation versions with older Python versions, but functionality
+> **_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!
 
 Unofficial Python package to control Agilent Chemstation; we are not affiliated with Agilent.

pychemstation-0.10.5.dist-info/RECORD

@@ -0,0 +1,36 @@
+pychemstation/__init__.py,sha256=Sc4z8LRVFMwJUoc_DPVUriSXTZ6PO9MaJ80PhRbKyB8,34
+pychemstation/analysis/__init__.py,sha256=dcX7OeHoKdyrECHRCSXgKZN81nOXSAmZRxXzRT0jpDc,126
+pychemstation/analysis/base_spectrum.py,sha256=t_VoxAtBph1V7S4fOsziERHiOBkYP0_nH7LTwbTEvcE,16529
+pychemstation/analysis/chromatogram.py,sha256=cHxPd5-miA6L3FjwN5cSFyq4xEeZoHWFFk8gU6tCgg4,3946
+pychemstation/analysis/process_report.py,sha256=xckcpqnYfzFTIo1nhgwP5A4GPJsW3PQ_qzuy5Z1KOuI,14714
+pychemstation/control/README.md,sha256=_7ITj4hD17YIwci6UY6xBebC9gPCBpzBFTB_Gx0eJBc,3124
+pychemstation/control/__init__.py,sha256=7lSkY7Qa7Ikdz82-2FESc_oqktv7JndsjltCkiMqnMI,147
+pychemstation/control/hplc.py,sha256=H6ilH0e3vhk0B6ZFi8ecomKSi144Qw-TLRwyL7XFB-o,12356
+pychemstation/control/controllers/README.md,sha256=S5cd4NJmPjs6TUH98BtPJJhiS1Lu-mxLCNS786ogOrQ,32
+pychemstation/control/controllers/__init__.py,sha256=GFVjjLxPL-FoRHxijdIkHggYvBqIQrnXaoGZgjuArdo,144
+pychemstation/control/controllers/comm.py,sha256=XgEECwlrUMHaZoHSqbYqaA5Kkoy5RRRnyoI6Mv64DWM,8571
+pychemstation/control/controllers/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pychemstation/control/controllers/devices/device.py,sha256=ObcPeHFu4siRtt-XHllDgLruR1o8zWv1Gy0ar5bYgO4,2375
+pychemstation/control/controllers/devices/injector.py,sha256=97xzayu0doxwtdfCgq-VI9rIHkZuGw65X1-JjIGQeFg,2798
+pychemstation/control/controllers/tables/__init__.py,sha256=w-Zgbit10niOQfz780ZmRHjUFxV1hMkdui7fOMPqeLA,132
+pychemstation/control/controllers/tables/method.py,sha256=8fwGcm8QRpayLnQ5q3Iyg2aaWWBY4SFT7_ZfJIxigZs,18208
+pychemstation/control/controllers/tables/sequence.py,sha256=_u3YY2OrYub7jGvqRds5dmjqCB9pnWqTOI71MuGSMB0,15759
+pychemstation/control/controllers/tables/table.py,sha256=qWjkh1S42FdUoN4PKgYg0yvar86QPDze9QRX_iHE6rk,13853
+pychemstation/generated/__init__.py,sha256=xnEs0QTjeuGYO3tVUIy8GDo95GqTV1peEjosGckpOu0,977
+pychemstation/generated/dad_method.py,sha256=xTUiSCvkXcxBUhjVm1YZKu-tHs16k23pF-0xYrQSwWA,8408
+pychemstation/generated/pump_method.py,sha256=s3MckKDw2-nZUC5lHrJVvXYdneWP8-9UvblNuGryPHY,12092
+pychemstation/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pychemstation/utils/injector_types.py,sha256=lGgBZhWdh93hwYT4N9LLQuZXu4Xcuc3j0RDBzOWg8P8,836
+pychemstation/utils/macro.py,sha256=Y_0CwTHcDQKoxYrNHqdF14-ciwtx56Y65SzNtOFPhNk,2848
+pychemstation/utils/method_types.py,sha256=_2djFz_uWFc9aoZcyPMIjC5KYBs003WPoQGx7ZhMiOg,1649
+pychemstation/utils/num_utils.py,sha256=dDs8sLZ_SdtvDKhyhF3IkljiVf16IYqpMTO5tEk9vMk,2079
+pychemstation/utils/parsing.py,sha256=mzdpxrH5ux4-_i4CwZvnIYnIwAnRnOptKb3fZyYJcx0,9307
+pychemstation/utils/pump_types.py,sha256=HWQHxscGn19NTrfYBwQRCO2VcYfwyko7YfBO5uDhEm4,93
+pychemstation/utils/sequence_types.py,sha256=T0IP2iMqorUrdzH4at9Vsmmb3SCAEmN4z1cUlFaeTXw,1089
+pychemstation/utils/spec_utils.py,sha256=lS27Xi4mFNDWBfmBqOoxTcVchPAkLK2mSdoaWDOfaPI,10211
+pychemstation/utils/table_types.py,sha256=inOVpwSsic31VdVdJkfuq35QfKd7PoNoXY1QnOxZ6Sw,3235
+pychemstation/utils/tray_types.py,sha256=9yLRIBn3IPVMbhrFqJQJ5gCQJI7H9DD2cdIFQDp2-8k,5184
+pychemstation-0.10.5.dist-info/METADATA,sha256=RfxUkxoudjZSf-bxO4eSHpsqTxML-JQJYnAmBTr0wFQ,5933
+pychemstation-0.10.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pychemstation-0.10.5.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.10.5.dist-info/RECORD,,

pychemstation/control/controllers/tables/ms.py

@@ -1,21 +0,0 @@
-from typing import Union
-
-from ....control.controllers import CommunicationController
-from ....control.controllers.tables.table import TableController
-from ....utils.chromatogram import AgilentChannelChromatogramData
-from ....utils.table_types import Table
-
-
-class MassSpecController(TableController):
-
-    def __init__(self, controller: CommunicationController, src: str, data_dir: str, table: Table):
-        super().__init__(controller, src, data_dir, table)
-
-    def get_row(self, row: int):
-        pass
-
-    def retrieve_recent_data_files(self):
-        pass
-
-    def get_data(self) -> Union[list[AgilentChannelChromatogramData], AgilentChannelChromatogramData]:
-        pass

pychemstation-0.10.3.dist-info/RECORD

@@ -1,37 +0,0 @@
-pychemstation/__init__.py,sha256=SpTl-Tg1B1HTyjNOE-8ue-N2wGnXN_2zl7RFUSxlkiM,33
-pychemstation/analysis/__init__.py,sha256=HS-3WaGu2JQ3qiojXkCvAP14W0wZG97MbSskl86Amn4,204
-pychemstation/analysis/base_spectrum.py,sha256=9WkOLk2qTAYTF1ALNUenVPoosOtBiLRvy2ni8zlGU5w,16540
-pychemstation/analysis/process_report.py,sha256=2y37Wb086v5RpR3frSQaBrvehwpUDSNZXxF8etkiaBA,11880
-pychemstation/control/README.md,sha256=_7ITj4hD17YIwci6UY6xBebC9gPCBpzBFTB_Gx0eJBc,3124
-pychemstation/control/__init__.py,sha256=Js79QczKZxDNZrzG1-4yl_whCoP2aw-yDAQJungiiic,100
-pychemstation/control/hplc.py,sha256=DC2LBN6DV1tJq6yJh2NNbmb8CyIlfwjjTERH0GHx8Gs,12952
-pychemstation/control/controllers/README.md,sha256=S5cd4NJmPjs6TUH98BtPJJhiS1Lu-mxLCNS786ogOrQ,32
-pychemstation/control/controllers/__init__.py,sha256=r7UU0u5zuJHO_KTqt-4Gy65BMlyXtxrdskiOhtO9Yw4,260
-pychemstation/control/controllers/comm.py,sha256=AN3A3ThvIsOKWY7Kmb_tnE5pRUqI7O2ID8M54z_w-uE,7831
-pychemstation/control/controllers/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pychemstation/control/controllers/devices/device.py,sha256=JNBKVRka1I3LA1lElIeUO0j93BTK5IJufTPNq95OhNE,1473
-pychemstation/control/controllers/devices/injector.py,sha256=eQpGFYZkyWlWtgGOSuWQcOWfWME75K0DgDquVSinBYs,1907
-pychemstation/control/controllers/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pychemstation/control/controllers/tables/method.py,sha256=LHoNRSTsSrrktghqNnU5KTRXDczcuGgqdqKEs_3sUXI,18609
-pychemstation/control/controllers/tables/ms.py,sha256=JFD-tOhu8uRyKdl-E3-neRssii8MNqVRIlsrnFhNY_M,682
-pychemstation/control/controllers/tables/sequence.py,sha256=SFC_N2avlXoWW2-BeYXG060Hvy_LX56U9t52hHeYgjM,13400
-pychemstation/control/controllers/tables/table.py,sha256=FccAwGPVS2UOa609YmtrbidwhYVyFduggi84i9qGbNw,12750
-pychemstation/generated/__init__.py,sha256=GAoZFAYbPVEJDkcOw3e1rgOqd7TCW0HyKNPM8OMehMg,1005
-pychemstation/generated/dad_method.py,sha256=xTUiSCvkXcxBUhjVm1YZKu-tHs16k23pF-0xYrQSwWA,8408
-pychemstation/generated/pump_method.py,sha256=797RsSDI2-QPf_BX8isZQx0O3aRx84EGIXJXhXw3IS0,12180
-pychemstation/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pychemstation/utils/chromatogram.py,sha256=2Los_ix_wAi4yxG_9neGRnNYPre9_uC1mrne3Ygit5c,3242
-pychemstation/utils/injector_types.py,sha256=PXwJK1uXs8hlQ6dWIEbAGfk2BpQJQmN3SlUbL4ntZz0,822
-pychemstation/utils/macro.py,sha256=Lh8aGcwo9sC2Sfc19Wgms5d3VgBLV3VXdvspqNHYE18,2931
-pychemstation/utils/method_types.py,sha256=ZOFMJ7wpqWBRJNIvOux-7Ou4nJVSuyWRHrd37wMnPa0,1638
-pychemstation/utils/num_utils.py,sha256=dDs8sLZ_SdtvDKhyhF3IkljiVf16IYqpMTO5tEk9vMk,2079
-pychemstation/utils/parsing.py,sha256=iFdnie-v0u5JI4cctJye_yhWQxHgy72_PWZ7w57Ltvg,9318
-pychemstation/utils/pump_types.py,sha256=HWQHxscGn19NTrfYBwQRCO2VcYfwyko7YfBO5uDhEm4,93
-pychemstation/utils/sequence_types.py,sha256=WyJWL18Q86TgoUpYH2_CevoTZuhcui0EnyHYdrp3Nmo,1070
-pychemstation/utils/spec_utils.py,sha256=MQZPDwCYZRfkEhNJQUt74huPexXBlJ3W4o7_230JWcE,10210
-pychemstation/utils/table_types.py,sha256=7txqW_oNpkh4venSkGEtreVe6UV9dzNB1DTrIeTkQHA,3217
-pychemstation/utils/tray_types.py,sha256=SMPm6TiN_D_qmVlUJktDNB1PD1Q1n31ReqF8Bo1p-8k,5048
-pychemstation-0.10.3.dist-info/METADATA,sha256=hlXVxPPFXbfxyQmK5kjvHQdK_xsIDSxbuxFgLitiJ5Y,5842
-pychemstation-0.10.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pychemstation-0.10.3.dist-info/licenses/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.10.3.dist-info/RECORD,,