pigeon-tem-comms 0.4.6__tar.gz → 0.4.8__tar.gz

{pigeon_tem_comms-0.4.6 → pigeon_tem_comms-0.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pigeon-tem-comms
-Version: 0.4.6
+Version: 0.4.8
 Summary: Pigeon messages for the next generation TEM imaging system.
 Author-email: Cameron Devine <cameron.devine@alleninstitute.org>
 License: BSD 3 Clause
@@ -19,7 +19,7 @@ License-File: LICENSE
 Requires-Dist: pigeon-client
 Requires-Dist: pydantic
 
-[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/AllenInstitute/TEM_comms/test.yaml)](https://github.com/AllenInstitute/TEM_comms/actions)
+[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/AllenInstitute/TEM_comms/main.yaml)](https://github.com/AllenInstitute/TEM_comms/actions)
 [![PyPI - Version](https://img.shields.io/pypi/v/pigeon-tem-comms)](https://pypi.org/project/pigeon-tem-comms/)
 
 # TEM Comms

{pigeon_tem_comms-0.4.6 → pigeon_tem_comms-0.4.8}/README.md

@@ -1,4 +1,4 @@
-[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/AllenInstitute/TEM_comms/test.yaml)](https://github.com/AllenInstitute/TEM_comms/actions)
+[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/AllenInstitute/TEM_comms/main.yaml)](https://github.com/AllenInstitute/TEM_comms/actions)
 [![PyPI - Version](https://img.shields.io/pypi/v/pigeon-tem-comms)](https://pypi.org/project/pigeon-tem-comms/)
 
 # TEM Comms

{pigeon_tem_comms-0.4.6 → pigeon_tem_comms-0.4.8}/TEM_comms/ui.py

@@ -1,5 +1,5 @@
 from pigeon import BaseMessage
-from typing import Optional
+from typing import Optional, Literal
 from pydantic import model_validator
 
 
@@ -43,4 +43,12 @@ class Setup(BaseMessage):
     center_beam: bool = False
     spread_beam: bool = False
     find_aperture: bool = False
+    calibrate_resolution: bool = False
     grid: Optional[int] = None
+    mag_mode: Optional[Literal["LM", "MAG1", "MAG2"]] = None
+    mag: Optional[int] = None
+
+    @model_validator(mode="after")
+    def check_mag(self):
+        assert (self.mag_mode is None) == (self.mag is None)
+        return self

{pigeon_tem_comms-0.4.6 → pigeon_tem_comms-0.4.8}/pigeon_tem_comms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pigeon-tem-comms
-Version: 0.4.6
+Version: 0.4.8
 Summary: Pigeon messages for the next generation TEM imaging system.
 Author-email: Cameron Devine <cameron.devine@alleninstitute.org>
 License: BSD 3 Clause
@@ -19,7 +19,7 @@ License-File: LICENSE
 Requires-Dist: pigeon-client
 Requires-Dist: pydantic
 
-[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/AllenInstitute/TEM_comms/test.yaml)](https://github.com/AllenInstitute/TEM_comms/actions)
+[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/AllenInstitute/TEM_comms/main.yaml)](https://github.com/AllenInstitute/TEM_comms/actions)
 [![PyPI - Version](https://img.shields.io/pypi/v/pigeon-tem-comms)](https://pypi.org/project/pigeon-tem-comms/)
 
 # TEM Comms

{pigeon_tem_comms-0.4.6 → pigeon_tem_comms-0.4.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pigeon-tem-comms"
-version = "0.4.6"
+version = "0.4.8"
 authors = [
   { name="Cameron Devine", email="cameron.devine@alleninstitute.org" },
 ]

{pigeon_tem_comms-0.4.6 → pigeon_tem_comms-0.4.8}/tests/test_ui.py

@@ -1,4 +1,4 @@
-from TEM_comms.ui import Run
+from TEM_comms.ui import Run, Setup
 from pydantic import ValidationError
 import pytest
 
@@ -16,3 +16,14 @@ def test_run():
     Run(montage=True, session_id="test", grid_first=1, grid_last=2)
     msg = Run()
     assert not msg.montage
+
+
+def test_setup():
+    with pytest.raises(ValidationError):
+        Setup(mag_mode="LM")
+
+    with pytest.raises(ValidationError):
+        Setup(mag=10)
+
+    Setup()
+    Setup(mag_mode="LM", mag=1)