pigeon-tem-comms 0.1.1__tar.gz → 0.2.0__tar.gz

{pigeon_tem_comms-0.1.1 → pigeon_tem_comms-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.1.1
+Version: 0.2.0
 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.1.1 → pigeon_tem_comms-0.2.0}/TEM_comms/__init__.py

@@ -3,6 +3,7 @@ from . import camera
 from . import scope
 from . import stage
 from . import tile
+from . import ui
 
 import importlib.metadata
 
@@ -31,7 +32,10 @@ topics = {
     "tile.statistics.histogram": tile.statistics.Histogram,
     "tile.statistics.min_max_mean": tile.statistics.MinMaxMean,
     "tile.transform": tile.Transform,
+    "ui.edit": ui.Edit,
+    "ui.run": ui.Run,
+    "ui.setup": ui.Setup,
 }
 
 
-msgs = (topics, __version__)
+msgs = (topics, __version__)

pigeon_tem_comms-0.2.0/TEM_comms/ui.py

@@ -0,0 +1,42 @@
+from pigeon import BaseMessage
+from typing import Optional
+from pydantic import model_validator
+
+
+class Edit(BaseMessage):
+    roi_id: str
+    roi_pos_x: int
+    roi_pox_y: int
+    roi_width: int
+    roi_height: int
+    roi_angle: float
+
+
+class Run(BaseMessage):
+    session_id: Optional[str] = None
+    grid_first: Optional[int] = None
+    grid_last: Optional[int] = None
+    montage: bool = False
+    abort_now: bool = False
+    abort_at_end: bool = False
+    resume: bool = False
+
+    @model_validator(mode="after")
+    def check_grid(self):
+        assert self.montage != (self.grid_first is None)
+        assert self.montage != (self.grid_last is None)
+        return self
+
+    @model_validator(mode="after")
+    def check_session(self):
+        assert self.montage != (self.session_id is None)
+        return self
+
+
+class Setup(BaseMessage):
+    conch_owner: Optional[str] = None
+    auto_focus: bool = False
+    auto_exposure: bool = False
+    lens_correction: bool = False
+    acquire_brightfield: bool = False
+    acquire_darkfield: bool = False

{pigeon_tem_comms-0.1.1 → pigeon_tem_comms-0.2.0}/pigeon_tem_comms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.1.1
+Version: 0.2.0
 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.1.1 → pigeon_tem_comms-0.2.0}/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/scope.py
+TEM_comms/ui.py
 TEM_comms/stage/__init__.py
 TEM_comms/stage/aperture.py
 TEM_comms/stage/motion.py
@@ -18,4 +19,5 @@ 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_scope_command.py
+tests/test_scope_command.py
+tests/test_ui.py

{pigeon_tem_comms-0.1.1 → pigeon_tem_comms-0.2.0}/pyproject.toml

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

pigeon_tem_comms-0.2.0/tests/test_ui.py

@@ -0,0 +1,18 @@
+from TEM_comms.ui import Run
+from pydantic import ValidationError
+import pytest
+
+
+def test_run():
+    with pytest.raises(ValidationError):
+        Run(montage=True, session_id="test", grid_first=1)
+
+    with pytest.raises(ValidationError):
+        Run(montage=True, session_id="test", grid_last=2)
+
+    with pytest.raises(ValidationError):
+        Run(montage=True, grid_first=1, grid_last=2)
+
+    Run(montage=True, session_id="test", grid_first=1, grid_last=2)
+    msg = Run()
+    assert not msg.montage