pigeon-tem-comms 1.3.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

TEM_comms/__init__.py

@@ -27,7 +27,7 @@ topics = {
     "tile.statistics.focus": tile.statistics.Focus,
     "tile.statistics.histogram": tile.statistics.Histogram,
     "tile.statistics.min_max_mean": tile.statistics.MinMaxMean,
-    "tile.transform": tile.Transform,
+    "tile.matches": tile.Matches,
     "ui.edit": ui.Edit,
     "ui.run": ui.Run,
     "ui.setup": ui.Setup,
@@ -36,6 +36,7 @@ topics = {
     "roi.load": roi.LoadROI,
     "roi.create": roi.CreateROI,
     "roi.current": roi.ROI,
+    "roi.status": roi.ROIStatus,
     "montage.minimaps": montage.Minimaps,
     "calibration.resolution": calibration.Resolution,
     "calibration.centroid": calibration.Centroid,

TEM_comms/roi.py

@@ -31,15 +31,34 @@ class LoadROI(BaseMessage):
     )
 
 
-class CreateROI(BaseMessage):
-    center: Vertex
-    width: float
-    height: float
-    rotation_angle: float = 0.0
-    montage_id: str
-    specimen_id: Optional[str] = None
-    grid_id: Optional[str] = None
-    section_id: Optional[str] = None
-    queue_position: Optional[int] = Field(
-        None, description="Position in queue, None means set as current"
+class CreateROI(ROI):
+    center: Optional[Vertex] = None
+    tilt_angles: Optional[List[float]] = Field(
+        default=[0.0],
+        description="List of tilt angles in degrees for tomography series",
+    )
+    aperture_centroid_pixel: Optional[Vertex] = Field(
+        None, description="Aperture centroid in pixel coordinates"
+    )
+    aperture_centroid_physical: Optional[Vertex] = Field(
+        None, description="Aperture centroid in physical coordinates (nm)"
+    )
+    overview_nm_per_pixel: Optional[float] = Field(
+        None, description="Overview image scale in nm per pixel"
+    )
+
+
+class ROIStatus(BaseMessage):
+    type: str = Field(
+        description="Event type: roi_added, roi_advanced, queue_cleared, queue_empty"
+    )
+    timestamp: int = Field(description="Timestamp")
+    roi_count: int = Field(description="Total number of active ROIs (queue + current)")
+    has_active_rois: bool = Field(description="Whether there are any ROIs available")
+    source: Optional[str] = Field(
+        None, description="Source of last ROI submission: UI or external"
+    )
+    montage_id: Optional[str] = Field(None, description="Current montage ID")
+    queue_info: Optional[dict] = Field(
+        None, description="Queue statistics: total, completed, remaining"
     )

TEM_comms/tile/__init__.py

@@ -1,5 +1,7 @@
 from .metadata import TileMetadata
 from . import statistics
+from pydantic import BaseModel
+from typing import Literal, List
 
 
 class Preview(TileMetadata):
@@ -14,10 +16,26 @@ class Raw(TileMetadata):
     path: str
 
 
-class Transform(TileMetadata):
+class Match(BaseModel):
+    model_config = {"extra": "forbid"}
+    row: int
+    column: int
+    dX: float
+    dY: float
+    dXsd: float
+    dYsd: float
+    distance: float
     rotation: float
-    x: float
-    y: float
+    match_quality: float
+    position: Literal["top", "bottom", "left", "right"]
+    pX: List[int]
+    pY: List[int]
+    qX: List[int]
+    qY: List[int]
+
+
+class Matches(TileMetadata):
+    matches: List[Match]
 
 
 class Processed(TileMetadata):

{pigeon_tem_comms-1.3.1.dist-info → pigeon_tem_comms-1.4.0.dist-info}/METADATA

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

@@ -1,22 +1,22 @@
-TEM_comms/__init__.py,sha256=ptgtd0FnSXyDZz26kX-4ivwOPQ8hXePNtepilqQl7B0,1475
+TEM_comms/__init__.py,sha256=sXY1A8yg0ihaT0Y7kSUXiNp35ibQxVJ4EjIgNoCQKOc,1504
 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=QQ5IJcIfPb4y5QdZ-lXYNV0WLTcZUrLmOwuS0t84_2M,666
 TEM_comms/qc.py,sha256=sujy2i0wimMvrHDPEXKdaiO7xxvRcHiy83mVpATLyqA,141
-TEM_comms/roi.py,sha256=37fKMT-KNJfWOwWvFAPTFHuBzkV1h6RS42kQsU00teQ,1145
+TEM_comms/roi.py,sha256=bKPBDNi1i1jxROtiw5bGh4Zn3-E0-LW_DWazYdg4PLs,2065
 TEM_comms/scope.py,sha256=7fTqhgfaNCGYsd66vCx_zTb5dW442s8cWi3RXmLNyG8,837
 TEM_comms/ui.py,sha256=pyjF9vex2qVzmKCoHdVTtDMEKRDOuhO-dWTBa2qb47Y,1484
 TEM_comms/stage/__init__.py,sha256=UVtYKzMBI01FUADS24xSItNIjhqdZtlDeJdqsDJNVIc,67
 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/__init__.py,sha256=nLWbdyLdI1qkIYmnVDKt4PAu29e2VQuXqcWwWXczdgE,704
 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.3.1.dist-info/licenses/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
-pigeon_tem_comms-1.3.1.dist-info/METADATA,sha256=wcyVTqR7XLZV4GFelE26zHKH17ShbHOnX1p5L23pJBg,1575
-pigeon_tem_comms-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pigeon_tem_comms-1.3.1.dist-info/entry_points.txt,sha256=X2WfBCDgfH9XVVqiI4rLu7BLyMNuLW6WWckqXxfbrgk,38
-pigeon_tem_comms-1.3.1.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
-pigeon_tem_comms-1.3.1.dist-info/RECORD,,
+pigeon_tem_comms-1.4.0.dist-info/licenses/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
+pigeon_tem_comms-1.4.0.dist-info/METADATA,sha256=DUNzN0l80uhFA_eNsc3YU85an1-A4wceqvbgXAepJ24,1575
+pigeon_tem_comms-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pigeon_tem_comms-1.4.0.dist-info/entry_points.txt,sha256=X2WfBCDgfH9XVVqiI4rLu7BLyMNuLW6WWckqXxfbrgk,38
+pigeon_tem_comms-1.4.0.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
+pigeon_tem_comms-1.4.0.dist-info/RECORD,,