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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyobs-core
-Version: 2.0.0.dev92
+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.dev92 → 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.dev92 → pyobs_core-2.0.0.dev94}/pyobs/modules/image/imagewatcher.py

@@ -176,7 +176,7 @@ class ImageWatcher(Module):
                 try:
                     with warnings.catch_warnings():
                         warnings.simplefilter("ignore", fits.verify.VerifyWarning)
-                        fits_file = fits.HDUList.fromstring(data)
+                        fits_file = await asyncio.to_thread(fits.HDUList.fromstring, data)
                 except Exception:
                     fits_file = None
 
@@ -234,6 +234,10 @@ class ImageWatcher(Module):
         """Can be overwritten by derived classes to do extra processing on files.
         All information are stored in self.current_file and can be checked against the given filename.
 
+        Note:
+            This hook runs on the module's event loop and must not block: no CPU-heavy or
+            synchronous I/O here. Offload such work to a thread, e.g. with ``asyncio.to_thread``.
+
         Args:
             filename: Input name of original file.
 
@@ -246,6 +250,10 @@ class ImageWatcher(Module):
         """Can be overwritten by derived classes to do clean up after successful copying.
         All information are stored in self.current_file and can be checked against the given filename.
 
+        Note:
+            This hook runs on the module's event loop and must not block: no CPU-heavy or
+            synchronous I/O here. Offload such work to a thread, e.g. with ``asyncio.to_thread``.
+
         Args:
             filename: Input name of original file.
         """

{pyobs_core-2.0.0.dev92 → 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.dev92 → pyobs_core-2.0.0.dev94}/pyobs/modules/telescope/basetelescope.py

@@ -35,6 +35,27 @@ from pyobs.utils.time import Time
 
 log = logging.getLogger(__name__)
 
+
+def _format_ra(ra_deg: float) -> str:
+    """Format an RA in degrees as sexagesimal HH:MM:SS.sss.
+
+    Deliberately avoids astropy's Angle.to_string(): its vectorized do_format ufunc path emits a
+    RuntimeWarning on numpy 2.x, which application.py promotes to an error -- see pyobs-gui commit
+    04d39d6 for the same issue and fix.
+    """
+    h, rem = divmod(ra_deg / 15.0, 1)
+    m, rem = divmod(rem * 60, 1)
+    return f"{int(h):02d}:{int(m):02d}:{rem * 60:06.3f}"
+
+
+def _format_dec(dec_deg: float) -> str:
+    """Format a Dec in degrees as sexagesimal +DD:MM:SS.sss. See _format_ra for why to_string() is avoided."""
+    sign = "+" if dec_deg >= 0 else "-"
+    d, rem = divmod(abs(dec_deg), 1)
+    m, rem = divmod(rem * 60, 1)
+    return f"{sign}{int(d):02d}:{int(m):02d}:{rem * 60:06.3f}"
+
+
 # Gaussian gravitational constant, rad/day, for AU/day/solar-mass units -- encodes the Sun's
 # GM for heliocentric two-body elements, so no per-body mass lookup is needed.
 _GAUSSIAN_GRAVITATIONAL_CONSTANT = 0.01720209895
@@ -325,6 +346,12 @@ class BaseTelescope(
         if not isinstance(self, IPointingRaDec):
             raise exc.NotSupportedError("This telescope does not support RA/Dec pointing.")
 
+        # reject non-finite coordinates outright -- otherwise NaN/inf silently passes the
+        # altitude check below (NaN comparisons are always False) and only surfaces later as an
+        # opaque RuntimeWarning-turned-error out of the sexagesimal formatting
+        if not (math.isfinite(ra) and math.isfinite(dec)):
+            raise exc.InvalidArgumentError(f"RA/Dec must be finite, got ra={ra}, dec={dec}.")
+
         # do nothing, if initializing, parking or parked
         if self.motion_status() in [MotionStatus.INITIALIZING, MotionStatus.PARKING, MotionStatus.PARKED]:
             return
@@ -354,9 +381,9 @@ class BaseTelescope(
             await self._change_motion_status(MotionStatus.SLEWING)
             log.info(
                 "Moving telescope to RA=%s (%.5f°), Dec=%s (%.5f°)...",
-                ra_dec.ra.to_string(sep=":", unit=u.hour, pad=True),
+                _format_ra(ra),
                 ra,
-                ra_dec.dec.to_string(sep=":", unit=u.deg, pad=True),
+                _format_dec(dec),
                 dec,
             )
             await self.comm.send_event(MoveRaDecEvent(ra=ra, dec=dec))
@@ -418,6 +445,10 @@ class BaseTelescope(
         if not isinstance(self, IPointingAltAz):
             raise exc.NotSupportedError("This telescope does not support Alt/Az pointing.")
 
+        # reject non-finite coordinates outright -- see move_radec for why
+        if not (math.isfinite(alt) and math.isfinite(az)):
+            raise exc.InvalidArgumentError(f"Alt/Az must be finite, got alt={alt}, az={az}.")
+
         # do nothing, if initializing, parking or parked
         if self.motion_status() in [MotionStatus.INITIALIZING, MotionStatus.PARKING, MotionStatus.PARKED]:
             return
@@ -760,14 +791,16 @@ class BaseTelescope(
             )
             hdr["AIRMASS"] = FitsHeaderEntry(float(coords_alt_az.secz.value), "Airmass of observation start")
 
-        # convert to sexagesimal
-        if coords_ra_dec is not None:
-            hdr["RA"] = FitsHeaderEntry(
-                str(coords_ra_dec.ra.to_string(sep=":", unit=u.hour, pad=True)), "Right ascension of object"
-            )
-            hdr["DEC"] = FitsHeaderEntry(
-                str(coords_ra_dec.dec.to_string(sep=":", unit=u.deg, pad=True)), "Declination of object"
-            )
+        # convert to sexagesimal -- _position_radec can be NaN for an uninitialized telescope, and
+        # unlike to_string() the manual formatters below raise on a non-finite value rather than
+        # just warning, so skip them instead of emitting bogus headers
+        if (
+            coords_ra_dec is not None
+            and math.isfinite(coords_ra_dec.ra.degree)
+            and math.isfinite(coords_ra_dec.dec.degree)
+        ):
+            hdr["RA"] = FitsHeaderEntry(_format_ra(float(coords_ra_dec.ra.degree)), "Right ascension of object")
+            hdr["DEC"] = FitsHeaderEntry(_format_dec(float(coords_ra_dec.dec.degree)), "Declination of object")
 
         # site location
         if self._observer is not None:

{pyobs_core-2.0.0.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → 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.dev92 → pyobs_core-2.0.0.dev94}/pyobs/vfs/localfile.py

@@ -7,13 +7,55 @@ from typing import IO, Any
 from .file import VFSFile
 
 
+def _open_sync(full_path: str, mode: str, mkdir: bool) -> IO[Any]:
+    """Open a local file, creating parent directories first if needed.
+
+    Runs on an executor thread off the event loop. Raises ``ValueError`` when ``mkdir`` is
+    disabled and the parent directory does not exist.
+    """
+    path = os.path.dirname(full_path)
+    if not os.path.exists(path):
+        if mkdir:
+            # exist_ok: this runs on an executor thread, so concurrent opens into the same new
+            # sibling directory can race between the exists() check and makedirs() here.
+            os.makedirs(path, exist_ok=True)
+        else:
+            raise ValueError("Cannot write into sub-directory with disabled mkdir option.")
+    return open(full_path, mode)
+
+
+def _find_sync(full_path: str, pattern: str) -> list[str]:
+    """Walk ``full_path`` and return the paths of files matching ``pattern``, relative to it."""
+    files = []
+    for cur, dirnames, filenames in os.walk(full_path):
+        for filename in fnmatch.filter(filenames, pattern):
+            files += [os.path.relpath(os.path.join(cur, filename), full_path)]
+    return files
+
+
+def _remove_sync(full_path: str) -> bool:
+    """Remove the file at ``full_path``; return False if it does not exist or is a directory."""
+    try:
+        os.remove(full_path)
+        return True
+    except (FileNotFoundError, IsADirectoryError):
+        return False
+
+
 class LocalFile(VFSFile):
-    """Wraps a local file with the virtual file system."""
+    """Wraps a local file with the virtual file system.
+
+    All potentially blocking I/O (open/read/write/close/remove/find/exists) runs on the default
+    executor, keeping the event loop responsive even on slow (e.g. network-mounted) paths.
+    """
 
     __module__ = "pyobs.vfs"
 
     def __init__(self, name: str, mode: str = "r", root: str | None = None, mkdir: bool = True, **kwargs: Any):
-        """Open a local file.
+        """Create a new local file.
+
+        Only validates the path here; the file itself is opened in ``__aenter__`` off the event
+        loop, so construction stays cheap and never blocks.
 
         Args:
             name: Name of file.
@@ -32,35 +74,36 @@ class LocalFile(VFSFile):
 
         # build filename
         self.filename = name
-        full_path = os.path.join(root, name)
+        self._full_path = os.path.join(root, name)
+        self._mode = mode
+        self._mkdir = mkdir
+        self.fd: IO[Any] | None = None
 
-        # need to create directory?
-        path = os.path.dirname(full_path)
-        if not os.path.exists(path):
-            if mkdir:
-                os.makedirs(path)
-            else:
-                raise ValueError("Cannot write into sub-directory with disabled mkdir option.")
-
-        # file object
-        self.fd: IO[Any] = open(full_path, mode)
+    async def __aenter__(self) -> "LocalFile":
+        """Open the file on an executor thread, keeping the event loop responsive."""
+        loop = asyncio.get_running_loop()
+        self.fd = await loop.run_in_executor(None, _open_sync, self._full_path, self._mode, self._mkdir)
+        return self
 
     async def close(self) -> None:
         if self.fd:
-            self.fd.close()
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, self.fd.close)
 
     async def read(self, n: int = -1) -> str | bytes:
         if self.fd is None:
-            raise OSError
-        buf = self.fd.read(n)
+            raise OSError("LocalFile is not open; use 'async with' to open it before reading.")
+        loop = asyncio.get_running_loop()
+        buf = await loop.run_in_executor(None, self.fd.read, n)
         if not isinstance(buf, str) and not isinstance(buf, bytes):
             raise OSError
         return buf
 
     async def write(self, s: str | bytes) -> None:
         if self.fd is None:
-            raise OSError
-        self.fd.write(s)
+            raise OSError("LocalFile is not open; use 'async with' to open it before writing.")
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(None, self.fd.write, s)
 
     @staticmethod
     async def local_path(path: str, **kwargs: Any) -> str:
@@ -120,12 +163,9 @@ class LocalFile(VFSFile):
         # build full path
         full_path = os.path.join(root, path)
 
-        # loop directories
-        files = []
-        for cur, dirnames, filenames in os.walk(full_path):
-            for filename in fnmatch.filter(filenames, pattern):
-                files += [os.path.relpath(os.path.join(cur, filename), full_path)]
-        return files
+        # walk directories off the event loop
+        loop = asyncio.get_running_loop()
+        return await loop.run_in_executor(None, _find_sync, full_path, pattern)
 
     @staticmethod
     async def remove(path: str, *args: Any, **kwargs: Any) -> bool:
@@ -141,13 +181,10 @@ class LocalFile(VFSFile):
         # get root from kwargs
         root = kwargs["root"]
 
-        # build full path and remove
+        # build full path and remove off the event loop
         full_path = os.path.join(root, path)
-        try:
-            os.remove(full_path)
-            return True
-        except (FileNotFoundError, IsADirectoryError):
-            return False
+        loop = asyncio.get_running_loop()
+        return await loop.run_in_executor(None, _remove_sync, full_path)
 
     @classmethod
     async def exists(cls, path: str, root: str = "", *args: Any, **kwargs: Any) -> bool:
@@ -164,8 +201,9 @@ class LocalFile(VFSFile):
         # build full path
         full_path = os.path.join(root, path)
 
-        # check
-        return os.path.exists(full_path)
+        # check off the event loop
+        loop = asyncio.get_running_loop()
+        return await loop.run_in_executor(None, os.path.exists, full_path)
 
 
 __all__ = ["LocalFile"]

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

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