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

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

@@ -1,8 +1,18 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.1.0
+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
+Project-URL: Homepage, https://github.com/AllenInstitute/TEM_comms
+Project-URL: Documentation, https://alleninstitute.github.io/TEM_architecture/topics.html
+Project-URL: Repository, https://github.com/AllenInstitute/TEM_comms
+Project-URL: Issues, https://github.com/AllenInstitute/TEM_comms/issues
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/__init__.py

@@ -3,11 +3,12 @@ from . import camera
 from . import scope
 from . import stage
 from . import tile
+from . import ui
 
 import importlib.metadata
 
 
-__version__ = importlib.metadata.version("TEM_comms")
+__version__ = importlib.metadata.version("pigeon-tem-comms")
 
 topics = {
     "buffer.status": buffer.Status,
@@ -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.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/buffer.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 
 
 class Status(BaseMessage):

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/camera.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 
 class Command(BaseMessage):
     tile_id: str

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/scope.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 from typing import Literal
 from pydantic import model_validator
 

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/stage/aperture.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 
 class Command(BaseMessage):
     aperture_id: int | None = None

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/stage/motion.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 
 class Command(BaseMessage):
     x: int | None = None

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/stage/rotation.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 
 class Command(BaseMessage):
     angle_x: float | None = None

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/tile/__init__.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 from . import statistics
 
 

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/TEM_comms/tile/statistics.py

@@ -1,4 +1,4 @@
-from emarfarap import BaseMessage
+from pigeon import BaseMessage
 
 class Focus(BaseMessage):
     tile_id: str

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.0 → pigeon_tem_comms-0.2.0}/pigeon_tem_comms.egg-info/PKG-INFO

@@ -1,8 +1,18 @@
 Metadata-Version: 2.1
 Name: pigeon-tem-comms
-Version: 0.1.0
+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
+Project-URL: Homepage, https://github.com/AllenInstitute/TEM_comms
+Project-URL: Documentation, https://alleninstitute.github.io/TEM_architecture/topics.html
+Project-URL: Repository, https://github.com/AllenInstitute/TEM_comms
+Project-URL: Issues, https://github.com/AllenInstitute/TEM_comms/issues
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE

{pigeon_tem_comms-0.1.0 → 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.2.0/pyproject.toml

@@ -0,0 +1,30 @@
+[project]
+name = "pigeon-tem-comms"
+version = "0.2.0"
+authors = [
+  { name="Cameron Devine", email="cameron.devine@alleninstitute.org" },
+]
+description = "Pigeon messages for the next generation TEM imaging system."
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+  "pigeon-client",
+  "pydantic",
+]
+license = {text = "BSD 3 Clause"}
+classifiers = [
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: BSD License",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+]
+
+[project.entry-points."pigeon.msgs"]
+msgs = "TEM_comms:msgs"
+
+[project.urls]
+Homepage = "https://github.com/AllenInstitute/TEM_comms"
+Documentation = "https://alleninstitute.github.io/TEM_architecture/topics.html"
+Repository = "https://github.com/AllenInstitute/TEM_comms"
+Issues = "https://github.com/AllenInstitute/TEM_comms/issues"

{pigeon_tem_comms-0.1.0 → pigeon_tem_comms-0.2.0}/tests/test_buffer.py

@@ -1,7 +1,7 @@
 import re
 
 import pytest
-from TEM_comms.msgs.buffer import Status
+from TEM_comms.buffer import Status
 
 from pydantic import ValidationError
 

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

pigeon_tem_comms-0.1.0/pyproject.toml

@@ -1,16 +0,0 @@
-[project]
-name = "pigeon-tem-comms"
-version = "0.1.0"
-authors = [
-  { name="Cameron Devine", email="cameron.devine@alleninstitute.org" },
-]
-description = "Pigeon messages for the next generation TEM imaging system."
-readme = "README.md"
-requires-python = ">=3.10"
-dependencies = [
-  "pigeon-client",
-  "pydantic",
-]
-
-[project.entry-points."pigeon.msgs"]
-msgs = "TEM_comms:msgs"