pigeon-tem-comms 1.1.3__tar.gz → 1.2.0__tar.gz

{pigeon_tem_comms-1.1.3/pigeon_tem_comms.egg-info → pigeon_tem_comms-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pigeon-tem-comms
-Version: 1.1.3
+Version: 1.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-1.1.3 → pigeon_tem_comms-1.2.0}/TEM_comms/montage.py

@@ -1,11 +1,17 @@
 from pigeon import BaseMessage
-from typing import Mapping, List, Any, Optional, Tuple
+from typing import Mapping, Dict, Any, Optional, Tuple
 from datetime import datetime
 
 
+class Tile(BaseMessage):
+    raster_index: int
+    stage_position: Tuple[int, int]
+    raster_position: Tuple[int, int]
+
+
 class Complete(BaseMessage):
     montage_id: str
-    tile_ids: List[str]
+    tiles: Dict[str, Tile]
     acquisition_id: str
     start_time: datetime
     pixel_size: float

{pigeon_tem_comms-1.1.3 → pigeon_tem_comms-1.2.0}/TEM_comms/stage/aperture.py

@@ -1,12 +1,17 @@
 from pigeon import BaseMessage
+from pydantic import ConfigDict
 
 
 class Command(BaseMessage):
+    model_config = ConfigDict(extra="allow")
+
     aperture_id: int | None = None
     calibrate: bool = False
 
 
 class Status(BaseMessage):
+    model_config = ConfigDict(extra="allow")
+
     current_aperture: int | None
     calibrated: bool
     error: str = ""

{pigeon_tem_comms-1.1.3 → pigeon_tem_comms-1.2.0}/TEM_comms/stage/motion.py

@@ -1,8 +1,11 @@
 from typing import Optional
 from pigeon import BaseMessage
+from pydantic import ConfigDict
 
 
 class Command(BaseMessage):
+    model_config = ConfigDict(extra="allow")
+
     x: int | None = None
     y: int | None = None
     z: Optional[int] = None
@@ -10,6 +13,8 @@ class Command(BaseMessage):
 
 
 class Status(BaseMessage):
+    model_config = ConfigDict(extra="allow")
+
     x: int | None
     y: int | None
     z: Optional[int] = None

{pigeon_tem_comms-1.1.3 → pigeon_tem_comms-1.2.0/pigeon_tem_comms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pigeon-tem-comms
-Version: 1.1.3
+Version: 1.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-1.1.3 → pigeon_tem_comms-1.2.0}/pigeon_tem_comms.egg-info/SOURCES.txt

@@ -26,4 +26,5 @@ tests/test_buffer.py
 tests/test_camera.py
 tests/test_qc.py
 tests/test_scope_command.py
+tests/test_stage.py
 tests/test_ui.py

{pigeon_tem_comms-1.1.3 → pigeon_tem_comms-1.2.0}/pyproject.toml

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

pigeon_tem_comms-1.2.0/tests/test_stage.py

@@ -0,0 +1,43 @@
+from TEM_comms.stage.motion import Command as MotionCommand, Status as MotionStatus
+from TEM_comms.stage.aperture import (
+    Command as ApertureCommand,
+    Status as ApertureStatus,
+)
+
+
+def test_motion_command_with_extra_fields():
+    command = MotionCommand(x=10, y=20, z=30, calibrate=True, wait_for_settle=True)
+    assert command.x == 10
+    assert command.y == 20
+    assert command.z == 30
+    assert command.calibrate is True
+    assert command.wait_for_settle is True
+
+
+def test_motion_status_with_extra_fields():
+    status = MotionStatus(
+        x=10, y=20, z=30, in_motion=True, error="", extra_field="extra_value"
+    )
+    assert status.x == 10
+    assert status.y == 20
+    assert status.z == 30
+    assert status.in_motion is True
+    assert status.error == ""
+    assert status.extra_field == "extra_value"
+
+
+def test_aperture_command_with_extra_fields():
+    command = ApertureCommand(aperture_id=1, calibrate=True, extra_field="extra_value")
+    assert command.aperture_id == 1
+    assert command.calibrate is True
+    assert command.extra_field == "extra_value"
+
+
+def test_aperture_status_with_extra_fields():
+    status = ApertureStatus(
+        current_aperture=1, calibrated=True, error="", extra_field="extra_value"
+    )
+    assert status.current_aperture == 1
+    assert status.calibrated is True
+    assert status.error == ""
+    assert status.extra_field == "extra_value"