pigeon-tem-comms 1.1.3__py3-none-any.whl → 1.3.0__py3-none-any.whl

TEM_comms/__init__.py

@@ -1,4 +1,9 @@
-from . import buffer, camera, montage, qc, roi, scope, stage, tile, ui
+from pigeon import BaseMessage
+from . import buffer, camera, montage, qc, roi, scope, stage, tile, ui, calibration
+
+
+class State(BaseMessage):
+    state: str
 
 
 topics = {
@@ -32,4 +37,7 @@ topics = {
     "roi.create": roi.CreateROI,
     "roi.current": roi.ROI,
     "montage.minimaps": montage.Minimaps,
+    "calibration.resolution": calibration.Resolution,
+    "calibration.centroid": calibration.Centroid,
+    "state": State,
 }

TEM_comms/calibration.py

@@ -0,0 +1,18 @@
+from pigeon import BaseMessage
+from typing import Mapping
+
+
+class _Resolution(BaseMessage):
+    nm_per_px: tuple[float, float]
+    rotation: float
+
+
+class Resolution(BaseMessage):
+    lowmag: Mapping[int, _Resolution]
+    mag: Mapping[int, _Resolution]
+
+
+class Centroid(BaseMessage):
+    aperture_id: int
+    x: int
+    y: int

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

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 = ""

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

TEM_comms/ui.py

@@ -20,6 +20,7 @@ class Run(BaseMessage):
     abort_now: bool = False
     abort_at_end: bool = False
     resume: bool = False
+    cancel: bool = False
 
     @model_validator(mode="after")
     def check_grid(self):

{pigeon_tem_comms-1.1.3.dist-info → pigeon_tem_comms-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pigeon-tem-comms
-Version: 1.1.3
+Version: 1.3.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.dist-info → pigeon_tem_comms-1.3.0.dist-info}/RECORD

@@ -1,21 +1,22 @@
-TEM_comms/__init__.py,sha256=lP9VixOSpFW0h0kPq-z-pUOpD53RBat6_G3ZrFyUuqI,1264
+TEM_comms/__init__.py,sha256=ptgtd0FnSXyDZz26kX-4ivwOPQ8hXePNtepilqQl7B0,1475
 TEM_comms/buffer.py,sha256=Jr6fUIbUPreQSSGKWR7jkA1McyZZv3lVE8uQSER8VL4,123
+TEM_comms/calibration.py,sha256=aDxJ0VepU9A6dZR-SK1yEoTFLwzF6bz5eingSMJLcvw,327
 TEM_comms/camera.py,sha256=5tOFqm7zOPVoX6ZFr5KIMxb0jAjWpE8yo8bctvOpbcU,698
-TEM_comms/montage.py,sha256=NmY8RGvArMwK-Qgmrc_IPzgOc3_m51YuNIUzntd62vc,541
+TEM_comms/montage.py,sha256=QQ5IJcIfPb4y5QdZ-lXYNV0WLTcZUrLmOwuS0t84_2M,666
 TEM_comms/qc.py,sha256=sujy2i0wimMvrHDPEXKdaiO7xxvRcHiy83mVpATLyqA,141
 TEM_comms/roi.py,sha256=37fKMT-KNJfWOwWvFAPTFHuBzkV1h6RS42kQsU00teQ,1145
 TEM_comms/scope.py,sha256=EfsOaEWfzT_UhYLRAYE733RoRyQQmNQc1Kz90gYLiqs,816
-TEM_comms/ui.py,sha256=Yxd0i4wjmddDl9sVzcFHHu5b6n0ICzaO0b_8SmAysxg,1459
+TEM_comms/ui.py,sha256=pyjF9vex2qVzmKCoHdVTtDMEKRDOuhO-dWTBa2qb47Y,1484
 TEM_comms/stage/__init__.py,sha256=UVtYKzMBI01FUADS24xSItNIjhqdZtlDeJdqsDJNVIc,67
-TEM_comms/stage/aperture.py,sha256=lyJO34_K76MKrZ-o2izd5V7eEN55d3lGu__RvZq-NlA,227
-TEM_comms/stage/motion.py,sha256=0QnMOgVB8THQEims4Nc5ZxonqIH-XRjrw9F7p30Ex9k,328
+TEM_comms/stage/aperture.py,sha256=QBO9MiVgzWJM_oAdy-9-z2qtX-pUqLyYSuMXkIDwMX4,351
+TEM_comms/stage/motion.py,sha256=EiMDAviHZo8DYjzeFcYFkbHFs90kLDsZKbrcla0y7eU,452
 TEM_comms/stage/rotation.py,sha256=tUcf6IpQ2ooRDYb51Zb4pi7pQUrBuLPiLKSg8Ebb2DY,332
 TEM_comms/tile/__init__.py,sha256=ID3b4VAHqVXAkxTYOZ7H2oTSrnVdUYt4Xb6gpQ0I3qo,316
 TEM_comms/tile/metadata.py,sha256=pUxmi_C02e5nwTm51rIULkKaRz6ij5mlXylzAcDU-9c,149
 TEM_comms/tile/statistics.py,sha256=C1pMEOjwVrhjGR6R7efKJE-pR_tw9ZAGrprLIHcXc_A,245
-pigeon_tem_comms-1.1.3.dist-info/licenses/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
-pigeon_tem_comms-1.1.3.dist-info/METADATA,sha256=bh508V_fGUxGh8pJqhGiy7t9UnhEApzZJGSZgOCpWfk,1575
-pigeon_tem_comms-1.1.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pigeon_tem_comms-1.1.3.dist-info/entry_points.txt,sha256=X2WfBCDgfH9XVVqiI4rLu7BLyMNuLW6WWckqXxfbrgk,38
-pigeon_tem_comms-1.1.3.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
-pigeon_tem_comms-1.1.3.dist-info/RECORD,,
+pigeon_tem_comms-1.3.0.dist-info/licenses/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
+pigeon_tem_comms-1.3.0.dist-info/METADATA,sha256=FEvO4zWuex8k0WVMNxDTGJ05QhXMQ0EBUadkNxWVpRw,1575
+pigeon_tem_comms-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pigeon_tem_comms-1.3.0.dist-info/entry_points.txt,sha256=X2WfBCDgfH9XVVqiI4rLu7BLyMNuLW6WWckqXxfbrgk,38
+pigeon_tem_comms-1.3.0.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
+pigeon_tem_comms-1.3.0.dist-info/RECORD,,

{pigeon_tem_comms-1.1.3.dist-info → pigeon_tem_comms-1.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any