pigeon-tem-comms 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

TEM_comms/__init__.py

@@ -4,11 +4,8 @@ from . import scope
 from . import stage
 from . import tile
 from . import ui
+from . import montage
 
-import importlib.metadata
-
-
-__version__ = importlib.metadata.version("pigeon-tem-comms")
 
 topics = {
     "buffer.status": buffer.Status,
@@ -35,7 +32,6 @@ topics = {
     "ui.edit": ui.Edit,
     "ui.run": ui.Run,
     "ui.setup": ui.Setup,
+    "montage.start": montage.Start,
+    "montage.finished": montage.Finished,
 }
-
-
-msgs = (topics, __version__)

TEM_comms/camera.py

@@ -1,23 +1,30 @@
 from pigeon import BaseMessage
+from typing import Optional
+
 
 class Command(BaseMessage):
     tile_id: str
 
+
 class Image(BaseMessage):
     tile_id: str
     path: str
 
+
 class Settings(BaseMessage):
     exposure: float | None = None
+    gain: Optional[float] = None
     width: int | None = None
     height: int | None = None
 
+
 class Status(BaseMessage):
     exposure: float
+    gain: float
     width: int
     height: int
     temp: float
     target_temp: float
     device_name: str
     device_model_id: int
-    device_sn: str
+    device_sn: str

TEM_comms/montage.py

@@ -0,0 +1,15 @@
+from pigeon import BaseMessage
+from typing import Mapping, List, Any
+
+
+class Start(BaseMessage):
+    montage_id: str
+    num_tiles: int
+
+
+class Finished(BaseMessage):
+    montage_id: str
+    num_tiles: int
+    roi: str
+    specimen: str
+    metadata: Mapping[str, Any] | List[Any]

TEM_comms/scope.py

@@ -2,6 +2,7 @@ from pigeon import BaseMessage
 from typing import Literal
 from pydantic import model_validator
 
+
 class Command(BaseMessage):
     focus: int | None = None
     mag_mode: Literal["LM", "MAG1", "MAG2"] | None = None
@@ -18,4 +19,4 @@ class Status(BaseMessage):
     aperture: str | None
     mag_mode: str
     mag: int
-    tank_voltage: int
+    tank_voltage: int

TEM_comms/stage/__init__.py

@@ -1,3 +1,3 @@
 from . import aperture
 from . import motion
-from . import rotation
+from . import rotation

TEM_comms/stage/aperture.py

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

TEM_comms/stage/motion.py

@@ -1,12 +1,14 @@
 from pigeon import BaseMessage
 
+
 class Command(BaseMessage):
     x: int | None = None
     y: int | None = None
     calibrate: bool = False
 
+
 class Status(BaseMessage):
     x: int
     y: int
     in_motion: bool
-    error: str = ""
+    error: str = ""

TEM_comms/stage/rotation.py

@@ -1,12 +1,14 @@
 from pigeon import BaseMessage
 
+
 class Command(BaseMessage):
     angle_x: float | None = None
     angle_y: float | None = None
     calibrate: bool = False
 
+
 class Status(BaseMessage):
     angle_x: float
     angle_y: float
     in_motion: bool
-    error: str = ""
+    error: str = ""

TEM_comms/tile/__init__.py

@@ -12,22 +12,24 @@ class Minimap(BaseMessage):
     path: str
 
 
-class Processed(BaseMessage):
-    tile_id: str
-    path: str
-
-
 class Raw(BaseMessage):
     tile_id: str
     montage_id: str
     path: str
     row: int
     column: int
-    overlap: float
+    overlap: int
 
 
 class Transform(BaseMessage):
+    montage_id: str
     tile_id: str
     rotation: float
     x: float
     y: float
+
+
+class Processed(BaseMessage):
+    montage_id: str
+    tile_id: str
+    path: str

TEM_comms/tile/statistics.py

@@ -1,15 +1,22 @@
 from pigeon import BaseMessage
 
+
 class Focus(BaseMessage):
+    montage_id: str
     tile_id: str
     focus: float
 
+
 class Histogram(BaseMessage):
+    montage_id: str
     tile_id: str
     path: str
 
+
 class MinMaxMean(BaseMessage):
+    montage_id: str
     tile_id: str
     min: int
     max: int
-    mean: int
+    mean: int
+

{pigeon_tem_comms-0.2.0.dist-info → pigeon_tem_comms-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.2.0
+Version: 0.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-0.4.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+TEM_comms/__init__.py,sha256=E4svq0mavg5pgHBkziCNXnEkd6Nmdmm4uLDTwpF57es,1209
+TEM_comms/buffer.py,sha256=Jr6fUIbUPreQSSGKWR7jkA1McyZZv3lVE8uQSER8VL4,123
+TEM_comms/camera.py,sha256=L9ebaZra-M3g571PUzQCAuC92Auw4ox3gRceJ2uKRhs,522
+TEM_comms/montage.py,sha256=PCfve__0M3S2RSmBtrDRlDlmIW_qJffDRE8gnlEHoxY,281
+TEM_comms/scope.py,sha256=CxpmTTBm6YMevPr3LeK9A7e8v5lGU6taG4e647asvak,503
+TEM_comms/ui.py,sha256=8a3GxCjw7E52WcAgDZLlQ7S4L92w5GuhJK2V_tEdSSA,1055
+TEM_comms/stage/__init__.py,sha256=UVtYKzMBI01FUADS24xSItNIjhqdZtlDeJdqsDJNVIc,67
+TEM_comms/stage/aperture.py,sha256=LEIlUUbkUMAI-OYQnO4tqJTblCNPitwjcxSzZLFaliM,220
+TEM_comms/stage/motion.py,sha256=hhTXTX-ED8o76oDtjluGJOzLcWfDmG0LEAt44Pfk4gI,230
+TEM_comms/stage/rotation.py,sha256=J7tAIP2nskjInhZmdIbqwrvxTFXihEynVOAyxbDDfjU,262
+TEM_comms/tile/__init__.py,sha256=_AyiilFCIA7Z6R7K0tgpwordMMGY0Y6kX2R9snATgTE,496
+TEM_comms/tile/statistics.py,sha256=big7ydZe18RaT_B_sh1ust7MiGITOZ1aJdH7mY9T2BY,307
+pigeon_tem_comms-0.4.0.dist-info/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
+pigeon_tem_comms-0.4.0.dist-info/METADATA,sha256=bXJw29r7ajZzpNbLYE8OWiko3EBeVlVg8yQgq77egSM,1553
+pigeon_tem_comms-0.4.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pigeon_tem_comms-0.4.0.dist-info/entry_points.txt,sha256=X2WfBCDgfH9XVVqiI4rLu7BLyMNuLW6WWckqXxfbrgk,38
+pigeon_tem_comms-0.4.0.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
+pigeon_tem_comms-0.4.0.dist-info/RECORD,,

{pigeon_tem_comms-0.2.0.dist-info → pigeon_tem_comms-0.4.0.dist-info}/WHEEL

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

pigeon_tem_comms-0.4.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[pigeon.msgs]
+msgs = TEM_comms:topics

pigeon_tem_comms-0.2.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-TEM_comms/__init__.py,sha256=0FngFKym-Yl33wkqr68k6YglJCbVs1fV63uHFTmzJwk,1229
-TEM_comms/buffer.py,sha256=Jr6fUIbUPreQSSGKWR7jkA1McyZZv3lVE8uQSER8VL4,123
-TEM_comms/camera.py,sha256=uBp9N00k4x_eYC_W8zUrTjFrmCpb6Tu2GQOG0WIGKwc,440
-TEM_comms/scope.py,sha256=cj8S0BqR7RozFNh2TsiT-DnuRKCIdMKol5PdIxG65JU,501
-TEM_comms/ui.py,sha256=8a3GxCjw7E52WcAgDZLlQ7S4L92w5GuhJK2V_tEdSSA,1055
-TEM_comms/stage/__init__.py,sha256=xeB18s-MGkc83BsfWkUc0W3YwxoHVK-QfLAPfRelcFQ,66
-TEM_comms/stage/aperture.py,sha256=hnd9HB6jYywHRQ1fB7suKEUvXZDT2VkE5cFJ3zKctPg,217
-TEM_comms/stage/motion.py,sha256=NQPufhxRKB3ySEyPksDFi6srBlBGKxaqF5k2YAAfa9s,227
-TEM_comms/stage/rotation.py,sha256=3khQqRCBDXNDQ5uArzhQ4kL0JP58wVMEbW3rG8hrZ_s,259
-TEM_comms/tile/__init__.py,sha256=kK9thh69UavYZ3toRzc_BLwjR3_Yif1tTdRAGLncrzY,458
-TEM_comms/tile/statistics.py,sha256=sQHeXtO3UB9k6lKtDEeO3e142aaAKelp-A8A_Bf5XJ8,242
-pigeon_tem_comms-0.2.0.dist-info/LICENSE,sha256=tZfQIUX7uNGacTb751ZWInVenJl6OwYQihcGbYrKSts,1463
-pigeon_tem_comms-0.2.0.dist-info/METADATA,sha256=Xz4Dnz98Mzl0R-r-pjPH81vCIx-QKM0V2SsSgSB_s10,1553
-pigeon_tem_comms-0.2.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-pigeon_tem_comms-0.2.0.dist-info/entry_points.txt,sha256=KFi0hPNwGY3gEmJF_8_smglVpfbU24lcCy0t_TJPgtg,36
-pigeon_tem_comms-0.2.0.dist-info/top_level.txt,sha256=3_1RcQ7xvS2dJEYnPIigo9snoKcSXSNJzPqunY0qydI,10
-pigeon_tem_comms-0.2.0.dist-info/RECORD,,

pigeon_tem_comms-0.2.0.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[pigeon.msgs]
-msgs = TEM_comms:msgs