pigeon-tem-comms 0.4.0__tar.gz → 0.4.2__tar.gz

{pigeon_tem_comms-0.4.0 → pigeon_tem_comms-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.4.0
+Version: 0.4.2
 Summary: Pigeon messages for the next generation TEM imaging system.
 Author-email: Cameron Devine <cameron.devine@alleninstitute.org>
 License: BSD 3 Clause

{pigeon_tem_comms-0.4.0 → pigeon_tem_comms-0.4.2}/TEM_comms/__init__.py

@@ -5,6 +5,7 @@ from . import stage
 from . import tile
 from . import ui
 from . import montage
+from . import qc
 
 
 topics = {
@@ -34,4 +35,5 @@ topics = {
     "ui.setup": ui.Setup,
     "montage.start": montage.Start,
     "montage.finished": montage.Finished,
+    "qc.status": qc.Status,
 }

pigeon_tem_comms-0.4.2/TEM_comms/qc.py

@@ -0,0 +1,6 @@
+from pigeon import BaseMessage
+from typing import Literal
+
+
+class Status(BaseMessage):
+    state: Literal["GOOD", "STOP_AT_END", "STOP_NOW"]

{pigeon_tem_comms-0.4.0 → pigeon_tem_comms-0.4.2}/TEM_comms/scope.py

@@ -1,12 +1,15 @@
 from pigeon import BaseMessage
-from typing import Literal
+from typing import Literal, Optional, Tuple
 from pydantic import model_validator
 
 
 class Command(BaseMessage):
-    focus: int | None = None
-    mag_mode: Literal["LM", "MAG1", "MAG2"] | None = None
-    mag: int | None = None
+    focus: Optional[int] = None
+    mag_mode: Optional[Literal["LM", "MAG1", "MAG2"]] = None
+    mag: Optional[int] = None
+    brightness: Optional[int] = None
+    beam_offset: Optional[Tuple[int, int]] = None
+    screen: Optional[Literal["up", "down"]] = None
 
     @model_validator(mode="after")
     def check_mag(self):
@@ -20,3 +23,5 @@ class Status(BaseMessage):
     mag_mode: str
     mag: int
     tank_voltage: int
+    brightness: int
+    beam_offset: Tuple[int, int]

{pigeon_tem_comms-0.4.0 → pigeon_tem_comms-0.4.2}/pigeon_tem_comms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.4.0
+Version: 0.4.2
 Summary: Pigeon messages for the next generation TEM imaging system.
 Author-email: Cameron Devine <cameron.devine@alleninstitute.org>
 License: BSD 3 Clause

{pigeon_tem_comms-0.4.0 → pigeon_tem_comms-0.4.2}/pigeon_tem_comms.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ TEM_comms/__init__.py
 TEM_comms/buffer.py
 TEM_comms/camera.py
 TEM_comms/montage.py
+TEM_comms/qc.py
 TEM_comms/scope.py
 TEM_comms/ui.py
 TEM_comms/stage/__init__.py
@@ -20,5 +21,6 @@ pigeon_tem_comms.egg-info/entry_points.txt
 pigeon_tem_comms.egg-info/requires.txt
 pigeon_tem_comms.egg-info/top_level.txt
 tests/test_buffer.py
+tests/test_qc.py
 tests/test_scope_command.py
 tests/test_ui.py

{pigeon_tem_comms-0.4.0 → pigeon_tem_comms-0.4.2}/pyproject.toml

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

pigeon_tem_comms-0.4.2/tests/test_qc.py

@@ -0,0 +1,8 @@
+from TEM_comms.qc import Status
+from pydantic import ValidationError
+import pytest
+
+
+def test_bad_status():
+    with pytest.raises(ValidationError):
+        Status(state="BAD")