pyobs-core 2.0.0.dev93__tar.gz → 2.0.0.dev94__tar.gz

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyobs-core
-Version: 2.0.0.dev93
+Version: 2.0.0.dev94
 Summary: robotic telescope software
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/modules/camera/basevideo.py

@@ -154,6 +154,10 @@ class BaseVideo(Module, ImageFitsHeaderMixin, IVideo, IImageType, metaclass=ABCM
         self._image_requests: list[ImageRequest] = []
         self._next_image: NextImage | None = None
         self._last_image: LastImage | None = None
+        # lazy per-frame cache for raw_handler: the first of N simultaneous raw
+        # consumers to wake for a given frame computes (meta, frame) bytes and the
+        # rest reuse it, instead of each redoing the header build/JSON/copy (#769)
+        self._raw_frame_cache: tuple[int, bytes, bytes] | None = None
         self._last_time = 0.0
         self._flip = flip
         # 60s is a starting point, not measured -- trades off against _activate_camera()/
@@ -500,8 +504,16 @@ class BaseVideo(Module, ImageFitsHeaderMixin, IVideo, IImageType, metaclass=ABCM
             if last is None:
                 continue
 
-            # build frame bytes (JSON meta header + raw little-endian bytes)
-            meta, frame = self._raw_frame(last.data, last.date_obs)
+            # build frame bytes (JSON meta header + raw little-endian bytes), reusing
+            # the cached result if another consumer already built this frame -- safe
+            # without a lock since _raw_frame() is synchronous, so no other task can
+            # interleave between the cache check and the store (#769)
+            cached = self._raw_frame_cache
+            if cached is not None and cached[0] == self._frame_num:
+                _, meta, frame = cached
+            else:
+                meta, frame = self._raw_frame(last.data, last.date_obs)
+                self._raw_frame_cache = (self._frame_num, meta, frame)
 
             # now send it!
             try:

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/modules/robotic/mastermind.py

@@ -253,6 +253,8 @@ class Mastermind(Module, IAutonomous, IFitsHeaderBefore):
             hdr = self._task.get_fits_headers()
             hdr["TASK"] = FitsHeaderEntry(self._task.name, "Name of task")
             hdr["REQNUM"] = FitsHeaderEntry(str(self._task.id), "Unique ID of task")
+            if self._task.project:
+                hdr["PROJECT"] = FitsHeaderEntry(self._task.project, "Project code")
             if self._obsnum is not None:
                 hdr["OBSNUM"] = FitsHeaderEntry(self._obsnum, "Observation number (night-obsnum)")
             return hdr

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/scripts/calibration/darkbias.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 
 from pyobs.interfaces import (
     IBinning,
@@ -23,7 +23,7 @@ log = logging.getLogger(__name__)
 class DarkBiasScript(Script):
     """Script for running darks or biases."""
 
-    camera: str
+    camera: Annotated[str, IData, IBinning, IWindow, IExposureTime, IImageType]
     count: int = 20
     exptime: float = 0
     binning: tuple[int, int] = (1, 1)

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/scripts/calibration/pointing.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 
 from pyobs.interfaces import IPointingAltAz, IReady
 from pyobs.robotic.scripts import Script
@@ -17,7 +17,7 @@ log = logging.getLogger(__name__)
 class PointingScript(Script):
     """Script for pointing the telescope for flats."""
 
-    telescope: str
+    telescope: Annotated[str, IPointingAltAz, IReady]
     pointing: SkyFlatsBasePointing
 
     async def can_run(self, data: TaskData | None) -> bool:

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/scripts/calibration/skyflats.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 
 from pyobs.interfaces import IBinning, IFilters, IFlatField, IReady, IRoof, ITelescope
 from pyobs.robotic.scripts import Script
@@ -21,9 +21,9 @@ FlatFunctions = str | dict[str, str | dict[str, str]]
 class SkyFlatsScript(Script):
     """Script for scheduling and running skyflats using an IFlatField module."""
 
-    roof: str
-    telescope: str
-    flatfield: str
+    roof: Annotated[str, IRoof]
+    telescope: Annotated[str, ITelescope]
+    flatfield: Annotated[str, IBinning, IFilters, IFlatField]
     functions: FlatFunctions = {}
     priorities: SkyflatPriorities
     min_exptime: float = 0.5

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/scripts/control/selector.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 
 from pyobs.interfaces import IMotion
 from pyobs.interfaces.IMode import IMode
@@ -19,7 +19,7 @@ class SelectorScript(Script):
     """Script for running Mode Selection."""
 
     mode: str
-    selector: str
+    selector: Annotated[str, IMode, IMotion]
 
     async def can_run(self, data: TaskData | None) -> bool:
         """Whether this config can currently run.

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/scripts/imaging/autofocus.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 
 from pyobs.interfaces import IAutoFocus, IMotion, IPointingRaDec, IReady, ITelescope
 from pyobs.robotic.scripts import Script
@@ -16,8 +16,8 @@ log = logging.getLogger(__name__)
 class AutoFocusScript(Script):
     """Script for running autofocus series."""
 
-    autofocus: str = "autofocus"
-    telescope: str = "telescope"
+    autofocus: Annotated[str, IAutoFocus] = "autofocus"
+    telescope: Annotated[str, ITelescope, IPointingRaDec] = "telescope"
     count: int = 5
     step: float = 0.1
     exposure_time: float = 2.0

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/scripts/imaging/imaging.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Annotated, Any
 
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr
 
@@ -80,11 +80,11 @@ class ImagingScript(Script):
 
     configuration: Configuration = Field(default_factory=Configuration)
 
-    camera: str
-    telescope: str | None = None
-    filters: str | None = None
-    autoguider: str | None = None
-    acquisition: str | None = None
+    camera: Annotated[str, ICamera, IBinning, IWindow, IExposureTime, IImageType]
+    telescope: Annotated[str | None, ITelescope, IPointingRaDec] = None
+    filters: Annotated[str | None, IFilters] = None
+    autoguider: Annotated[str | None, IAutoGuiding] = None
+    acquisition: Annotated[str | None, IAcquisition] = None
 
     _object_name: str | None = PrivateAttr(default=None)
 

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/archive/archive.py

@@ -25,8 +25,6 @@ class FrameInfo:
 class Archive(PolymorphicBaseModel, metaclass=ABCMeta):
     """Base class for image archives."""
 
-    __module__ = "pyobs.utils.archive"
-
     model_config = {"arbitrary_types_allowed": True}
 
     @abstractmethod

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/archive/local_archive.py

@@ -19,8 +19,6 @@ log = logging.getLogger(__name__)
 class LocalArchive(Archive):
     """Connector class to a local image archive."""
 
-    __module__ = "pyobs.utils.archive"
-
     root: str
 
     _root_path: Path = PrivateAttr()

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/archive/pyobs_archive.py

@@ -41,8 +41,6 @@ class PyobsArchiveFrameInfo(FrameInfo):
 class PyobsArchive(Archive):
     """Connector class to running pyobs-archive instance."""
 
-    __module__ = "pyobs.utils.archive"
-
     url: str
     token: str
     proxies: dict[str, str] | None = None

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/skyflats/pointing/base.py

@@ -7,8 +7,6 @@ from pyobs.utils.serialization import PolymorphicBaseModel
 class SkyFlatsBasePointing(PolymorphicBaseModel, metaclass=ABCMeta):
     """Base class for flat pointings."""
 
-    __module__ = "pyobs.utils.skyflats.pointing"
-
     @abstractmethod
     async def __call__(self, telescope: IPointingAltAz) -> None:
         """Move telescope.

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/skyflats/pointing/static.py

@@ -16,8 +16,6 @@ log = logging.getLogger(__name__)
 class SkyFlatsStaticPointing(SkyFlatsBasePointing):
     """Static flat pointing."""
 
-    __module__ = "pyobs.utils.skyflats.pointing"
-
     _initialized: bool = False
 
     @model_validator(mode="after")

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/skyflats/priorities/archive.py

@@ -11,8 +11,6 @@ from .base import SkyflatPriorities
 class ArchiveSkyflatPriorities(SkyflatPriorities):
     """Calculate flat priorities from an archive."""
 
-    __module__ = "pyobs.utils.skyflats.priorities"
-
     archive: Archive
     site: str
     instrument: str

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/skyflats/priorities/base.py

@@ -6,8 +6,6 @@ from pyobs.utils.serialization import PolymorphicBaseModel
 class SkyflatPriorities(PolymorphicBaseModel, metaclass=ABCMeta):
     """Base class for sky flat priorities."""
 
-    __module__ = "pyobs.utils.skyflats.priorities"
-
     @abstractmethod
     async def __call__(self) -> dict[tuple[str, tuple[int, int]], float]: ...
 

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyobs/robotic/utils/skyflats/priorities/const.py

@@ -4,8 +4,6 @@ from .base import SkyflatPriorities
 class ConstSkyflatPriorities(SkyflatPriorities):
     """Constant flat priorities."""
 
-    __module__ = "pyobs.utils.skyflats.priorities"
-
     priorities: dict[tuple[str, tuple[int, int]], float]
 
     async def __call__(self) -> dict[tuple[str, tuple[int, int]], float]:

{pyobs_core-2.0.0.dev93 → pyobs_core-2.0.0.dev94}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-core"
-version = "2.0.0.dev93"
+version = "2.0.0.dev94"
 description = "robotic telescope software"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11"