pyobs-core 2.0.0.dev94__py3-none-any.whl → 2.0.0.dev97__py3-none-any.whl

pyobs/modules/robotic/scheduler.py

@@ -102,7 +102,7 @@ class Scheduler(Module, IStartStop, IRunnable):
 
         # get scheduler
         self._task_archive = self.add_child_object(tasks, TaskArchive, on_tasks_changed=self._update_schedule)
-        # BackendObservationArchive declares auto_update and gates its own polling loop on it --
+        # PortalObservationArchive declares auto_update and gates its own polling loop on it --
         # since we already drive updates via on_tasks_changed above, that poller must stay off.
         # Other ObservationArchive implementations (e.g. LcoObservationArchive) don't declare it at
         # all, so it must not be injected unconditionally.

pyobs/robotic/scripts/calibration/darkbias.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Annotated
 
+from pydantic import Field
+
 from pyobs.interfaces import (
     IBinning,
     IData,
@@ -23,10 +25,12 @@ log = logging.getLogger(__name__)
 class DarkBiasScript(Script):
     """Script for running darks or biases."""
 
-    camera: Annotated[str, IData, IBinning, IWindow, IExposureTime, IImageType]
-    count: int = 20
-    exptime: float = 0
-    binning: tuple[int, int] = (1, 1)
+    camera: Annotated[str, IData, IBinning, IWindow, IExposureTime, IImageType] = Field(
+        description="Name of the camera module to expose with."
+    )
+    count: int = Field(default=20, description="Number of exposures to take.")
+    exptime: float = Field(default=0, description="Exposure time in seconds. 0 takes a bias, anything else a dark.")
+    binning: tuple[int, int] = Field(default=(1, 1), description="Detector binning as (x, y).")
 
     async def can_run(self, data: TaskData | None) -> bool:
         """Whether this config can currently run.

pyobs/robotic/scripts/calibration/pointing.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Annotated
 
+from pydantic import Field
+
 from pyobs.interfaces import IPointingAltAz, IReady
 from pyobs.robotic.scripts import Script
 from pyobs.robotic.utils.skyflats.pointing import SkyFlatsBasePointing
@@ -17,8 +19,8 @@ log = logging.getLogger(__name__)
 class PointingScript(Script):
     """Script for pointing the telescope for flats."""
 
-    telescope: Annotated[str, IPointingAltAz, IReady]
-    pointing: SkyFlatsBasePointing
+    telescope: Annotated[str, IPointingAltAz, IReady] = Field(description="Name of the telescope module to point.")
+    pointing: SkyFlatsBasePointing = Field(description="Strategy used to compute the flat-field pointing.")
 
     async def can_run(self, data: TaskData | None) -> bool:
         """Whether this config can currently run.

pyobs/robotic/scripts/calibration/skyflats.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Annotated
 
+from pydantic import Field
+
 from pyobs.interfaces import IBinning, IFilters, IFlatField, IReady, IRoof, ITelescope
 from pyobs.robotic.scripts import Script
 from pyobs.robotic.utils.skyflats.priorities.base import SkyflatPriorities
@@ -21,17 +23,31 @@ FlatFunctions = str | dict[str, str | dict[str, str]]
 class SkyFlatsScript(Script):
     """Script for scheduling and running skyflats using an IFlatField module."""
 
-    roof: Annotated[str, IRoof]
-    telescope: Annotated[str, ITelescope]
-    flatfield: Annotated[str, IBinning, IFilters, IFlatField]
-    functions: FlatFunctions = {}
-    priorities: SkyflatPriorities
-    min_exptime: float = 0.5
-    max_exptime: float = 5
-    timespan: float = 7200
-    filter_change: float = 30
-    count: int = 20
-    readout: dict[str, float] | None = None
+    roof: Annotated[str, IRoof] = Field(description="Name of the roof module, checked to be open before starting.")
+    telescope: Annotated[str, ITelescope] = Field(
+        description="Name of the telescope module, checked to be ready before starting."
+    )
+    flatfield: Annotated[str, IBinning, IFilters, IFlatField] = Field(
+        description="Name of the module that takes the flat-field exposures."
+    )
+    functions: FlatFunctions = Field(
+        default={},
+        description=(
+            "Exposure-time function(s) of solar altitude `h` in degrees, e.g. 'exp(-0.9*(h+3.9))'. "
+            "Either a single expression for all filters/binnings, a dict keyed by binning ('1x1') or "
+            "filter, or a nested dict of binning -> filter -> expression."
+        ),
+    )
+    priorities: SkyflatPriorities = Field(description="Strategy for prioritizing filter/binning combinations.")
+    min_exptime: float = Field(default=0.5, description="Minimum acceptable exposure time in seconds.")
+    max_exptime: float = Field(default=5, description="Maximum acceptable exposure time in seconds.")
+    timespan: float = Field(default=7200, description="Time span in seconds to schedule flats over.")
+    filter_change: float = Field(default=30, description="Estimated time in seconds to change a filter.")
+    count: int = Field(default=20, description="Number of exposures to take per filter/binning combination.")
+    readout: dict[str, float] | None = Field(
+        default=None,
+        description='Readout time in seconds per binning, keyed as "BxB" (e.g. "2x2"). Assumes 0s if unset.',
+    )
 
     async def can_run(self, data: TaskData | None) -> bool:
         """Whether this config can currently run.

pyobs/robotic/scripts/control/cases.py

@@ -4,6 +4,8 @@ import logging
 from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
+from pydantic import Field
+
 if TYPE_CHECKING:
     from pyobs.robotic.task import TaskData
     from pyobs.utils.time import Time
@@ -16,8 +18,10 @@ log = logging.getLogger(__name__)
 class CasesRunner(Script):
     """Script for distinguishing cases."""
 
-    expression: str
-    cases: dict[str | int | float, Script]
+    expression: str = Field(description="Python expression to evaluate; its value selects which script to run.")
+    cases: dict[str | int | float, Script] = Field(
+        description='Scripts to run, keyed by the value of `expression`. Use key "else" for a fallback.'
+    )
 
     def __get_script(self) -> Script:
         # evaluate condition

pyobs/robotic/scripts/control/conditional.py

@@ -4,6 +4,8 @@ import logging
 from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
+from pydantic import Field
+
 if TYPE_CHECKING:
     from pyobs.robotic.task import TaskData
     from pyobs.utils.time import Time
@@ -16,9 +18,11 @@ log = logging.getLogger(__name__)
 class ConditionalRunner(Script):
     """Script for running an if condition."""
 
-    condition: str
-    true: Script
-    false: Script | None = None
+    condition: str = Field(description="Python expression to evaluate; run `true` if truthy, `false` otherwise.")
+    true: Script = Field(description="Script to run if `condition` is truthy.")
+    false: Script | None = Field(
+        default=None, description="Script to run if `condition` is falsy. Does nothing if unset."
+    )
 
     def __get_script(self) -> Script | None:
         # evaluate condition

pyobs/robotic/scripts/control/parallel.py

@@ -4,6 +4,8 @@ import asyncio
 import logging
 from typing import TYPE_CHECKING
 
+from pydantic import Field
+
 if TYPE_CHECKING:
     from pyobs.robotic.task import TaskData
     from pyobs.utils.time import Time
@@ -22,8 +24,11 @@ async def _run_script(script: Script, data: TaskData | None) -> None:
 class ParallelRunner(Script):
     """Script for running other scripts in parallel."""
 
-    scripts: list[Script]
-    check_all_can_run: bool = True
+    scripts: list[Script] = Field(description="Scripts to run concurrently.")
+    check_all_can_run: bool = Field(
+        default=True,
+        description="If set, all scripts must be able to run for this script to run; otherwise, any one suffices.",
+    )
 
     async def can_run(self, data: TaskData | None) -> bool:
         results = [await s.can_run(data) for s in self.scripts]

pyobs/robotic/scripts/control/selector.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Annotated
 
+from pydantic import Field
+
 from pyobs.interfaces import IMotion
 from pyobs.interfaces.IMode import IMode
 from pyobs.robotic.scripts import Script
@@ -18,8 +20,8 @@ log = logging.getLogger(__name__)
 class SelectorScript(Script):
     """Script for running Mode Selection."""
 
-    mode: str
-    selector: Annotated[str, IMode, IMotion]
+    mode: str = Field(description="Name of the mode to select.")
+    selector: Annotated[str, IMode, IMotion] = Field(description="Name of the mode-selection module.")
 
     async def can_run(self, data: TaskData | None) -> bool:
         """Whether this config can currently run.

pyobs/robotic/scripts/control/sequential.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 import astropy.units as u
 from astropy.time import TimeDelta
+from pydantic import Field
 
 if TYPE_CHECKING:
     from pyobs.robotic.task import TaskData
@@ -17,8 +18,11 @@ log = logging.getLogger(__name__)
 class SequentialRunner(Script):
     """Script for running a sequence of other scripts."""
 
-    scripts: list[Script]
-    check_all_can_run: bool = True
+    scripts: list[Script] = Field(description="Scripts to run in sequence, each only if it can run.")
+    check_all_can_run: bool = Field(
+        default=True,
+        description="If set, all scripts must be able to run for this script to run; otherwise, only the first must.",
+    )
 
     async def can_run(self, data: TaskData | None) -> bool:
         if self.check_all_can_run:

pyobs/robotic/scripts/imaging/autofocus.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Annotated
 
+from pydantic import Field
+
 from pyobs.interfaces import IAutoFocus, IMotion, IPointingRaDec, IReady, ITelescope
 from pyobs.robotic.scripts import Script
 from pyobs.utils.time import Time
@@ -16,11 +18,15 @@ log = logging.getLogger(__name__)
 class AutoFocusScript(Script):
     """Script for running autofocus series."""
 
-    autofocus: Annotated[str, IAutoFocus] = "autofocus"
-    telescope: Annotated[str, ITelescope, IPointingRaDec] = "telescope"
-    count: int = 5
-    step: float = 0.1
-    exposure_time: float = 2.0
+    autofocus: Annotated[str, IAutoFocus] = Field(
+        default="autofocus", description="Name of the auto-focus module to run the series with."
+    )
+    telescope: Annotated[str, ITelescope, IPointingRaDec] = Field(
+        default="telescope", description="Name of the telescope module, moved to the target and stopped afterwards."
+    )
+    count: int = Field(default=5, description="Number of focus steps to take in the series.")
+    step: float = Field(default=0.1, description="Focus step size.")
+    exposure_time: float = Field(default=2.0, description="Exposure time in seconds for each focus step.")
 
     async def can_run(self, data: TaskData | None) -> bool:
         """Whether this config can currently run.

pyobs/robotic/scripts/imaging/imaging.py

@@ -38,26 +38,42 @@ log = logging.getLogger(__name__)
 class AcquisitionConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    enabled: bool = True
-    optional: bool = False
+    enabled: bool = Field(
+        default=True, description="Whether to perform acquisition before starting this configuration."
+    )
+    optional: bool = Field(
+        default=False, description="If acquisition fails, continue without it instead of aborting the script."
+    )
 
 
 class GuidingConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    enabled: bool = True
-    optional: bool = False
+    enabled: bool = Field(default=True, description="Whether to start auto-guiding before starting this configuration.")
+    optional: bool = Field(
+        default=False, description="If starting auto-guiding fails, continue without it instead of aborting the script."
+    )
 
 
 class InstrumentConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    exposure_time: float | ExposureTimeProvider = 0.0
-    count: int = 1
-    image_type: ImageType = ImageType.OBJECT
-    binning: tuple[int, int] = (1, 1)
-    window: tuple[int, int, int, int] | None = None
-    optical_filter: str | None = None
+    exposure_time: float | ExposureTimeProvider = Field(
+        default=0.0, description="Exposure time in seconds, or a provider that computes it dynamically."
+    )
+    count: int = Field(default=1, description="Number of exposures to take with this configuration.")
+    image_type: ImageType = Field(
+        default=ImageType.OBJECT,
+        description="Type of image to take: OBJECT (science), BIAS, DARK, SKYFLAT, FOCUS, ACQUISITION, or GUIDING.",
+    )
+    binning: tuple[int, int] = Field(default=(1, 1), description="Detector binning as (x, y).")
+    window: tuple[int, int, int, int] | None = Field(
+        default=None,
+        description="Detector sub-window as (left, top, width, height). Uses the full frame if unset.",
+    )
+    optical_filter: str | None = Field(
+        default=None, description="Name of the filter to use. Uses the camera's current filter if unset."
+    )
 
     async def get_exposure_time(self) -> float:
         """Return the exposure time, computing it dynamically if needed."""
@@ -69,22 +85,41 @@ class InstrumentConfig(BaseModel):
 class Configuration(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    acquisition_config: AcquisitionConfig = Field(default_factory=AcquisitionConfig)
-    guiding_config: GuidingConfig = Field(default_factory=GuidingConfig)
-    instrument_configs: list[InstrumentConfig] = Field(default_factory=lambda: [InstrumentConfig()])
-    repeats: int = 1
+    acquisition_config: AcquisitionConfig = Field(
+        default_factory=AcquisitionConfig, description="Settings for acquiring the target before exposing."
+    )
+    guiding_config: GuidingConfig = Field(
+        default_factory=GuidingConfig, description="Settings for auto-guiding while exposing."
+    )
+    instrument_configs: list[InstrumentConfig] = Field(
+        default_factory=lambda: [InstrumentConfig()],
+        description="Sequence of instrument configurations to run, in order, once per repeat.",
+    )
+    repeats: int = Field(
+        default=1, description="Number of times to repeat the full sequence of instrument configurations."
+    )
 
 
 class ImagingScript(Script):
     """Default script for imaging configs."""
 
-    configuration: Configuration = Field(default_factory=Configuration)
-
-    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
+    configuration: Configuration = Field(default_factory=Configuration, description="What to expose and how.")
+
+    camera: Annotated[str, ICamera, IBinning, IWindow, IExposureTime, IImageType] = Field(
+        description="Name of the camera module to expose with."
+    )
+    telescope: Annotated[str | None, ITelescope, IPointingRaDec] = Field(
+        default=None, description="Name of the telescope module to point at the target. Required for OBJECT exposures."
+    )
+    filters: Annotated[str | None, IFilters] = Field(
+        default=None, description="Name of the filter wheel module. Required if any instrument config sets a filter."
+    )
+    autoguider: Annotated[str | None, IAutoGuiding] = Field(
+        default=None, description="Name of the auto-guiding module. Required if guiding is enabled."
+    )
+    acquisition: Annotated[str | None, IAcquisition] = Field(
+        default=None, description="Name of the acquisition module. Required if acquisition is enabled."
+    )
 
     _object_name: str | None = PrivateAttr(default=None)
 

pyobs/robotic/scripts/script.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
+from pydantic import Field
+
 from pyobs.interfaces import FitsHeaderEntry
 from pyobs.utils.serialization import PolymorphicBaseModel
 from pyobs.utils.time import Time
@@ -14,7 +16,7 @@ log = logging.getLogger(__name__)
 
 
 class Script(PolymorphicBaseModel):
-    exptime_done: float = 0.0
+    exptime_done: float = Field(default=0.0, description="Exposure time accumulated so far while running this script.")
 
     _cant_run_reason: str | None = None
 

pyobs/robotic/scripts/utils/callmodule.py

@@ -41,10 +41,12 @@ def _build_params_model(method, provided_keys):
 class CallModuleScript(Script):
     """Script for calling a method on a module."""
 
-    module: str
-    interface: str
-    method: str
-    params: dict[str, str | int | float] = Field(default_factory=dict)
+    module: str = Field(description="Name of the module to call the method on.")
+    interface: str = Field(description="Full class path of the interface that declares `method`.")
+    method: str = Field(description="Name of the method to call.")
+    params: dict[str, str | int | float] = Field(
+        default_factory=dict, description="Keyword arguments to pass to the method, validated against its signature."
+    )
 
     @model_validator(mode="after")
     def _validate_params(self) -> CallModuleScript:

pyobs/robotic/scripts/utils/debugtrigger.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
+from pydantic import Field
+
 if TYPE_CHECKING:
     from pyobs.robotic.task import TaskData
 from pyobs.robotic.scripts import Script
@@ -13,7 +15,7 @@ log = logging.getLogger(__name__)
 class DebugTriggerScript(Script):
     """Script for a debug trigger."""
 
-    triggered: bool = False
+    triggered: bool = Field(default=False, description="Set to True once this script has run.")
 
     async def can_run(self, data: TaskData | None) -> bool:
         return True

pyobs/robotic/scripts/utils/log.py

@@ -4,6 +4,8 @@ import logging
 from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
+from pydantic import Field
+
 if TYPE_CHECKING:
     from pyobs.robotic.task import TaskData
 from pyobs.robotic.scripts import Script
@@ -14,7 +16,7 @@ log = logging.getLogger(__name__)
 class LogScript(Script):
     """Script for logging something."""
 
-    expression: str
+    expression: str = Field(description="Python expression to evaluate and log the value of.")
 
     async def can_run(self, data: TaskData | None) -> bool:
         return True

pyobs/robotic/storage/portal/__init__.py

@@ -0,0 +1,4 @@
+from .observationarchive import PortalObservationArchive
+from .taskarchive import PortalTaskArchive
+
+__all__ = ["PortalObservationArchive", "PortalTaskArchive"]

pyobs/robotic/storage/{backend → portal}/observationarchive.py

@@ -15,8 +15,8 @@ from pyobs.utils.time import Time
 log = logging.getLogger(__name__)
 
 
-class BackendObservationArchive(ObservationArchive):
-    """Observation archive based on pyobs-robotic-backend."""
+class PortalObservationArchive(ObservationArchive):
+    """Observation archive based on pyobs-portal."""
 
     def __init__(
         self,
@@ -39,12 +39,12 @@ class BackendObservationArchive(ObservationArchive):
             self.add_background_task(self._check_for_changes)
 
     async def open(self) -> None:
-        """Opens the backend observation archive."""
+        """Opens the portal observation archive."""
         self._aiohttp_session = aiohttp.ClientSession(headers={"Authorization": f"Token {self._token}"})
         await ObservationArchive.open(self)
 
     async def close(self) -> None:
-        """Closes the backend observation archive."""
+        """Closes the portal observation archive."""
         await ObservationArchive.close(self)
         if self._aiohttp_session is not None:
             await self._aiohttp_session.close()
@@ -57,20 +57,20 @@ class BackendObservationArchive(ObservationArchive):
         return self._aiohttp_session
 
     async def _check_for_changes(self) -> None:
-        """Update schedule in background, gated on the backend's update marker."""
+        """Update schedule in background, gated on the portal's update marker."""
 
         while True:
             try:
                 await self._poll()
             except Exception as e:
-                log.error("Failed to update observations from backend: %s", e)
+                log.error("Failed to update observations from portal: %s", e)
             await asyncio.sleep(5)
 
     async def _poll(self) -> None:
-        """Re-download the schedule when the backend's ``last_observation_update`` marker moved.
+        """Re-download the schedule when the portal's ``last_observation_update`` marker moved.
 
-        The marker is a DB-derived ``Max(updated_at)`` (pyobs-robotic-backend#84), truthful across
-        gunicorn workers, so it is a safe refresh gate; see ``BackendTaskArchive._poll``. The
+        The marker is a DB-derived ``Max(updated_at)`` (pyobs-portal#84), truthful across
+        gunicorn workers, so it is a safe refresh gate; see ``PortalTaskArchive._poll``. The
         content comparison in :meth:`_update` still decides whether to fire ``on_tasks_changed``.
         """
         last_update = await self.last_update_time()
@@ -79,12 +79,12 @@ class BackendObservationArchive(ObservationArchive):
             self._last_marker = last_update
 
     async def _update(self) -> None:
-        """Fetch the schedule from the backend and apply it if anything changed.
+        """Fetch the schedule from the portal and apply it if anything changed.
 
-        Called by :meth:`_poll` after the backend marker moved (or on the first poll). Changes are
+        Called by :meth:`_poll` after the portal marker moved (or on the first poll). Changes are
         detected by comparing full observation contents via ``model_dump(use_task_id=True)``,
         keyed by observation ID so a stable reordering of the same items is not mistaken for a
-        change: the backend serializes ``task`` as a plain FK ID, while cached copies get their
+        change: the portal serializes ``task`` as a plain FK ID, while cached copies get their
         ``task`` replaced by a full ``Task`` when the mastermind calls ``fetch_task()``, so the ID
         normalization keeps both sides comparable. The comparison includes ``state``
         (``Observation.__eq__`` ignores it), which matters for in-set transitions such as
@@ -265,4 +265,4 @@ class BackendObservationArchive(ObservationArchive):
         return ObservationList([self.pyobs_model_validate(Observation, obs) for obs in observations])
 
 
-__all__ = ["BackendObservationArchive"]
+__all__ = ["PortalObservationArchive"]

pyobs/robotic/storage/{backend → portal}/taskarchive.py

@@ -13,14 +13,14 @@ from pyobs.utils.time import Time
 log = logging.getLogger(__name__)
 
 
-class BackendTaskArchive(TaskArchive):
-    """Task archive based on pyobs-robotic-backend."""
+class PortalTaskArchive(TaskArchive):
+    """Task archive based on pyobs-portal."""
 
     def __init__(self, url: str, token: str, auto_update: bool = True, **kwargs: Any):
         """Creates a new task archive.
 
         Args:
-            url: URL of pyobs-robotic-backend.
+            url: URL of pyobs-portal.
             token: Auth token.
         """
         TaskArchive.__init__(self, **kwargs)
@@ -36,12 +36,12 @@ class BackendTaskArchive(TaskArchive):
             self.add_background_task(self._check_for_changes)
 
     async def open(self) -> None:
-        """Opens the backend task archive."""
+        """Opens the portal task archive."""
         self._aiohttp_session = aiohttp.ClientSession(headers={"Authorization": f"Token {self._token}"})
         await TaskArchive.open(self)
 
     async def close(self) -> None:
-        """Closes the backend observation archive."""
+        """Closes the portal task archive."""
         await TaskArchive.close(self)
         if self._aiohttp_session is not None:
             await self._aiohttp_session.close()
@@ -54,18 +54,18 @@ class BackendTaskArchive(TaskArchive):
         return self._aiohttp_session
 
     async def _check_for_changes(self) -> None:
-        """Update tasks in background, gated on the backend's update marker."""
+        """Update tasks in background, gated on the portal's update marker."""
         while True:
             try:
                 await self._poll()
             except Exception as e:
-                log.error("Failed to update tasks from backend: %s", e)
+                log.error("Failed to update tasks from portal: %s", e)
             await asyncio.sleep(5)
 
     async def _poll(self) -> None:
-        """Re-download tasks/projects when the backend's ``last_task_update`` marker moved.
+        """Re-download tasks/projects when the portal's ``last_task_update`` marker moved.
 
-        The marker is a DB-derived ``Max(updated_at)`` (pyobs-robotic-backend#84), truthful across
+        The marker is a DB-derived ``Max(updated_at)`` (pyobs-portal#84), truthful across
         gunicorn workers, so it is a safe refresh gate. Without it the archive re-downloaded (and
         re-compared) on every poll, and the content comparison misfired whenever runtime code
         mutated a serialized task field (e.g. ``DynamicTarget.resolve()`` overwriting ``name``),
@@ -78,14 +78,14 @@ class BackendTaskArchive(TaskArchive):
             self._last_marker = last_update
 
     async def _update(self) -> None:
-        """Fetch tasks/projects from the backend and apply them if anything changed.
+        """Fetch tasks/projects from the portal and apply them if anything changed.
 
-        Called by :meth:`_poll` after the backend marker moved (or on the first poll); applies the
+        Called by :meth:`_poll` after the portal marker moved (or on the first poll); applies the
         download only when the content actually differs from the cached copy. The comparison uses
         ``model_dump()`` rather than pydantic ``==``, which also compares runtime attributes (e.g.
         ``Task._cant_run_reason`` set by ``can_run()``) and would flag unchanged tasks as changed
         on every poll; it is keyed by ID so that a stable reordering of the same items (e.g. an
-        unordered backend queryset) is not mistaken for a change.
+        unordered portal queryset) is not mistaken for a change.
         """
         projects = await self._get_projects()
         tasks = await self._get_tasks()
@@ -105,12 +105,12 @@ class BackendTaskArchive(TaskArchive):
         return Time(res["last_task_update"])
 
     async def _get_projects(self) -> list[Project]:
-        """Fetch projects from backend."""
+        """Fetch projects from portal."""
         projects = await http_request_paginated(self._session, urljoin(self._url, "/api/projects/"), strict=True)
         return [self.pyobs_model_validate(Project, project) for project in projects]
 
     async def _get_tasks(self) -> list[Task]:
-        """Fetch tasks from backend."""
+        """Fetch tasks from portal."""
         tasks = await http_request_paginated(self._session, urljoin(self._url, "/api/tasks/"), strict=True)
         return [self.pyobs_model_validate(Task, task) for task in tasks]
 
@@ -118,7 +118,7 @@ class BackendTaskArchive(TaskArchive):
         """Returns time when last time any tasks changed (as observed by this archive).
 
         This is the local time at which the last content change was detected by the polling loop,
-        not the backend's marker timestamp -- the marker is per-process and unreliable.
+        not the portal's marker timestamp -- the marker is per-process and unreliable.
         """
         return self._last_update
 
@@ -151,4 +151,4 @@ class BackendTaskArchive(TaskArchive):
             return None
 
 
-__all__ = ["BackendTaskArchive"]
+__all__ = ["PortalTaskArchive"]

pyobs/robotic/task.py

@@ -46,9 +46,9 @@ class Task(PolymorphicBaseModel):
     script: dict[str, Any] = Field(default_factory=dict)
     active: bool = True
     updated_at: str | None = None
-    """Last-modification timestamp as emitted by pyobs-robotic-backend (DB-derived ``updated_at``,
-    added in pyobs-robotic-backend#84). Carried for round-trip fidelity so the strict ``Task``
-    model (``extra="forbid"``) accepts the field the backend now sends; not used by pyobs itself."""
+    """Last-modification timestamp as emitted by pyobs-portal (DB-derived ``updated_at``,
+    added in pyobs-portal#84). Carried for round-trip fidelity so the strict ``Task``
+    model (``extra="forbid"``) accepts the field the portal now sends; not used by pyobs itself."""
 
     _resolved_target: Target | None = PrivateAttr(default=None)
     _cant_run_reason: str | None = None

pyobs/robotic/utils/skyflats/priorities/archive.py

@@ -1,5 +1,6 @@
 import astropy.units as u
 from astropy.time import TimeDelta
+from pydantic import Field
 
 from pyobs.robotic.utils.archive import Archive
 from pyobs.utils.enums import ImageType
@@ -11,11 +12,11 @@ from .base import SkyflatPriorities
 class ArchiveSkyflatPriorities(SkyflatPriorities):
     """Calculate flat priorities from an archive."""
 
-    archive: Archive
-    site: str
-    instrument: str
-    filter_names: list[str]
-    binnings: list[int]
+    archive: Archive = Field(description="Archive to query for the timestamp of the last flat per filter/binning.")
+    site: str = Field(description="Site code to filter archive frames by.")
+    instrument: str = Field(description="Instrument code to filter archive frames by.")
+    filter_names: list[str] = Field(description="Filters to compute priorities for.")
+    binnings: list[int] = Field(description="Binnings (as N for NxN) to compute priorities for.")
 
     model_config = {"arbitrary_types_allowed": True}
 

pyobs/robotic/utils/skyflats/priorities/const.py

@@ -1,10 +1,14 @@
+from pydantic import Field
+
 from .base import SkyflatPriorities
 
 
 class ConstSkyflatPriorities(SkyflatPriorities):
     """Constant flat priorities."""
 
-    priorities: dict[tuple[str, tuple[int, int]], float]
+    priorities: dict[tuple[str, tuple[int, int]], float] = Field(
+        description="Fixed priority per (filter, binning) combination."
+    )
 
     async def __call__(self) -> dict[tuple[str, tuple[int, int]], float]:
         return self.priorities

{pyobs_core-2.0.0.dev94.dist-info → pyobs_core-2.0.0.dev97.dist-info}/METADATA

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

{pyobs_core-2.0.0.dev94.dist-info → pyobs_core-2.0.0.dev97.dist-info}/RECORD

@@ -238,7 +238,7 @@ pyobs/modules/pointing/guidingstatistics/uptime.py,sha256=1X2DFASvcSFsAqSmDofI-o
 pyobs/modules/robotic/__init__.py,sha256=awLUDoOQpmANpI_0Gnvgb-2w3L2yLIMSpCnUXkPvza0,296
 pyobs/modules/robotic/mastermind.py,sha256=4meuktgbaR7aGFHKwVdlp2AJjZ_d2SNfULpZJu2zr4c,10172
 pyobs/modules/robotic/pointing.py,sha256=ncIJsA4IGhmtBhrCH5bUjGJKmFAlb6iB5F8G7b15GWs,4239
-pyobs/modules/robotic/scheduler.py,sha256=KCouCOOjhUhqEnQ9zCC9VxrA-k6iYLPS8lzPlhz0Js8,16076
+pyobs/modules/robotic/scheduler.py,sha256=K8-fOeP1fco4kdSWIpV8CvE3M0qiyyAHhEf813qsSJ4,16075
 pyobs/modules/robotic/scriptrunner.py,sha256=u0oGRPp5KpcyWqG83wMSJwqcEr-ENp4HNFCr_cGSkAw,1888
 pyobs/modules/roof/__init__.py,sha256=lARN3N3iqY_nb41Jaq6lE3UKhXuUvAnFeUqSq5HMQX4,209
 pyobs/modules/roof/basedome.py,sha256=HMAI7Sve90uRSRfP3yVKNhPVNRUC-bDOtuYQ1p3cQLI,1374
@@ -268,7 +268,7 @@ pyobs/modules/weather/weather_api.py,sha256=OfvboDXajCMydTLFz3_s4Sl7CNBWe3IluebW
 pyobs/modules/weather/weather_state.py,sha256=XzZiN-aM4yg-HEVeM3XmQXUshlG97Wr0Ka1vmL31vPw,736
 pyobs/robotic/__init__.py,sha256=A0jlO6KelDFObBo74_qM9lXX952kYeoj-Z47D0XiIOQ,441
 pyobs/robotic/observation.py,sha256=EvMDCz0QZmRAW4lwOFrxhwDTyO7NkNowaRwtLJfGBYU,4702
-pyobs/robotic/task.py,sha256=11mio1FoIvbDzktrq_swIVj4ggmShJ73kSh2itOt2ro,5892
+pyobs/robotic/task.py,sha256=PNikHtoA7ppe_vbDdP4ZHtWsEpGPXzlQn_49lUhoMgw,5873
 pyobs/robotic/taskrunner.py,sha256=enT2GPbvL7jhWa1PHtFper2qCjDZ5wTDGIk27CmbPZw,1961
 pyobs/robotic/scheduler/__init__.py,sha256=1doPZQUxGd-E9y8Wwo3YSw3LqjrBYzd5W29UAw7cYDY,268
 pyobs/robotic/scheduler/_executor.py,sha256=M-0Km9vy_Hnr37e7JSFISapQnsXH7r2ZKO08QU0iM28,1164
@@ -306,31 +306,28 @@ pyobs/robotic/scheduler/targets/picker/csvpicker.py,sha256=RaiN_MSshnBtKGn3pS1md
 pyobs/robotic/scheduler/targets/picker/picker.py,sha256=RMt41DbvGPMqm4XGULWNH3YuDEuFMLewxUQWsQ-9xGk,599
 pyobs/robotic/scripts/__init__.py,sha256=gTHfsrK18YxadGpESalfnWOVFSq9nAdMrPag2TnXPXs,100
 pyobs/robotic/scripts/exceptions.py,sha256=_i1X_rZEgEiy1YbIO3iH-cymKiyTk4KfdnZfdfppiDQ,393
-pyobs/robotic/scripts/script.py,sha256=EVpWLOGYTLkK0pHMyOW00T8YWEsoDwKfhJoTcFQwuqQ,1547
+pyobs/robotic/scripts/script.py,sha256=Brnze9JxC-zk-A5s7mNLrNxriICNHf0oQAwGscvOPKw,1665
 pyobs/robotic/scripts/calibration/__init__.py,sha256=JvcFQ3UbSSAiPszLAtBo8541cqY9dKYKAIcRdcg5cpI,177
-pyobs/robotic/scripts/calibration/darkbias.py,sha256=QUptI3hAU9GZoTsovhgMaHAzX_MlMxVXxZ237uU0Yws,2980
-pyobs/robotic/scripts/calibration/pointing.py,sha256=nAvyjHvui23ihib2dqjyHhf0F-qpeeU7j357YvcQvBA,1850
-pyobs/robotic/scripts/calibration/skyflats.py,sha256=ho9BA_xeY-6KAVpXsDHLkX2kDu5uzqpcFH_wcjVunfc,4530
+pyobs/robotic/scripts/calibration/darkbias.py,sha256=ReWF30oRp_OIZ2C-BuoNM4yl4UzLk2ktun-S8KON0Qc,3298
+pyobs/robotic/scripts/calibration/pointing.py,sha256=IbTjqYd7xdQLpYYYg9c-DoSqHsg8fQUzNlT-B0NqRXU,2013
+pyobs/robotic/scripts/calibration/skyflats.py,sha256=b25hoMKMyOrEu0woNDCiyxyWI94Af_PVvqGXM7bLDTM,5790
 pyobs/robotic/scripts/control/__init__.py,sha256=wji-Aa2m-na63QULzckJEoeoajr-pnz0bojBTO-B7qw,293
-pyobs/robotic/scripts/control/cases.py,sha256=8cnoZGie2IQtMAAKDBCgAMkVzdDc6kSlT_P6EeLl0Lk,1908
-pyobs/robotic/scripts/control/conditional.py,sha256=Mssgs7imMaV92UIC4rY7ajCTTomaTn751ONxvANf9Jg,2051
-pyobs/robotic/scripts/control/parallel.py,sha256=YAEDUCchIOzph0AlsCO4MfTGxnVRE1fmp_tQICmAgKs,1609
-pyobs/robotic/scripts/control/selector.py,sha256=-ZIBcdTHji0PyTALMeMHA3sVooWSNyIN3hh3eBrRD2U,1956
-pyobs/robotic/scripts/control/sequential.py,sha256=Zg9e_l3brVhvWwRkGgUqLc4VP70bhUnhL3jTz7fb7As,1776
+pyobs/robotic/scripts/control/cases.py,sha256=GHm8NV8Pv-viLCzx2fWJb0nr3FsLDVSKD_e5XbAUDKA,2149
+pyobs/robotic/scripts/control/conditional.py,sha256=82d5mMhwAPV6_-CNDGU3C3xwkbOeiWI13cdFESMvmS4,2343
+pyobs/robotic/scripts/control/parallel.py,sha256=hK7KGyOoDOKP6LFrnTNlmnz76weoartXMmVGXcmFeU4,1835
+pyobs/robotic/scripts/control/selector.py,sha256=Dk6R3rAFFYX-5NckVtHDRt0bntvowU1iy2DDNK59YQo,2093
+pyobs/robotic/scripts/control/sequential.py,sha256=U7rvadQ5etO0AIlnlFL5r0HgmiOVViPOIvdM-JWblcg,2028
 pyobs/robotic/scripts/imaging/__init__.py,sha256=v92rykVP9bn0sgMf6Wt_GX17iGM4PmRDbNUEYjUbpSE,195
-pyobs/robotic/scripts/imaging/autofocus.py,sha256=tWrwSJo7AXGthUgPx0tiZi2JPFgZyHEC8s7G00LV8Cs,3139
-pyobs/robotic/scripts/imaging/imaging.py,sha256=laUWq60YHBpVSZmax0wCowLE8SrUDiAlmiRAmZXqZWo,12768
+pyobs/robotic/scripts/imaging/autofocus.py,sha256=u9jmuoMvamYjAD5dnoGVMLOxbN8Y7BNhtWPBKaGNy9E,3581
+pyobs/robotic/scripts/imaging/imaging.py,sha256=e_99sokFb9rIj2zhrcdPGkxxyD6D2aXBPR-aFcd--B8,14844
 pyobs/robotic/scripts/imaging/transitimaging.py,sha256=GXW-xq_e3BkJ74n6YvCUsWJN3mIFj0x94rR8giAQ4yw,4485
 pyobs/robotic/scripts/utils/__init__.py,sha256=XLda2nbNDv0lTkd6R64yPRxTpjkVb3Ytuk1c8oPcpOM,180
-pyobs/robotic/scripts/utils/callmodule.py,sha256=XbbFmrWxENf9z-4zg3FqriotQHKwgOiCkrEib5Us-IU,2673
-pyobs/robotic/scripts/utils/debugtrigger.py,sha256=_JmZsDfw83zoB4ncomUcjCtpuXrTXG8mDGCOiqXMOQI,529
-pyobs/robotic/scripts/utils/log.py,sha256=ffPm7zbgRRPrcR3CHVhSbd44fbMT2PgZHFsF0IW8YxY,647
+pyobs/robotic/scripts/utils/callmodule.py,sha256=a0948Nm4zEUpH9mhbke_9cSSDTAx4TxVO0G1QY289Gw,2972
+pyobs/robotic/scripts/utils/debugtrigger.py,sha256=9SW7JfON0eRxsDRdNOVYq7ocRoARzydIVOEkdMr9Nu4,625
+pyobs/robotic/scripts/utils/log.py,sha256=jtElmP1tlOH-AST_9J9WwsN10M-OC1YdzbluF2sOa3Y,750
 pyobs/robotic/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyobs/robotic/storage/observationarchive.py,sha256=GlCp1GuFZo9_1HyRDg12ubhJP-cyKVnTpdykhabzFV4,3388
 pyobs/robotic/storage/taskarchive.py,sha256=qdbd5b7D3i3tTs8R2lhrf7yiiqYDF6IB0UxusI_uA1I,1225
-pyobs/robotic/storage/backend/__init__.py,sha256=sW20klOE0SH4RbVKOcHsmV1H3Wu0kaSPD0RFKPd2aIU,165
-pyobs/robotic/storage/backend/observationarchive.py,sha256=iYpKfr4NyW-yJkpY-4_Jr4sYvMydcW7Ikafzw_eOCrg,10494
-pyobs/robotic/storage/backend/taskarchive.py,sha256=wouaSF7MbElUyMhA4g-cymF6JePq7uOxjzaM9HwYkgE,6155
 pyobs/robotic/storage/filesystem/__init__.py,sha256=OKG6UdaQUlErxeVcXbD71VKUhBOCDcfAbIDW-JN3QTc,153
 pyobs/robotic/storage/filesystem/observationarchive.py,sha256=woy6n9ih4gI9Aw2zEx7F2yUga3WFcVnuhNpuoxnI1l8,9102
 pyobs/robotic/storage/filesystem/taskarchive.py,sha256=vxhUJcbxKyaIj7G3XNCYwuTcrNJj0va8x0y7_WsyHIY,2214
@@ -351,6 +348,9 @@ pyobs/robotic/storage/lco/scripts/script.py,sha256=HOBL0J2W1Q5_4zfqwBnHEIRTTXoZW
 pyobs/robotic/storage/memory/__init__.py,sha256=SurkIJRT-Zik5brmrTr0Pp0jwiexIs7ckj1ZtKednOU,161
 pyobs/robotic/storage/memory/observationarchive.py,sha256=FzfwQe4vDQN-2n69eAMqY3TldQPZuJcC8wjpgyC14sw,4657
 pyobs/robotic/storage/memory/taskarchive.py,sha256=xP-5YgbQo9_1aHbrUos5cClzCgUmpuTsMlxsKGCqMeE,1807
+pyobs/robotic/storage/portal/__init__.py,sha256=vMDjcTtBGfQs0Kb6kzt-8TKkRvg73A1fvtiiupL4h8I,161
+pyobs/robotic/storage/portal/observationarchive.py,sha256=dD39meFk5b2XCPnRO6zEaII3X_DbsIgWiOiCnL4xhSU,10465
+pyobs/robotic/storage/portal/taskarchive.py,sha256=LbFQSRiE6um_uNBo4iLmLnZSnyo56LfgTbZqOhIei9U,6108
 pyobs/robotic/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyobs/robotic/utils/archive/__init__.py,sha256=cLeBhOAd1oHiq9i1uNDyYiwUIuF4C2yMr7S3rnvczig,243
 pyobs/robotic/utils/archive/archive.py,sha256=Zzbfy5yH2iCms7uylRxWnROszioHxFgVedHTlDhghNU,1985
@@ -367,9 +367,9 @@ pyobs/robotic/utils/skyflats/pointing/__init__.py,sha256=v7BVB-B_bTSSaKsgJJoZ4d1
 pyobs/robotic/utils/skyflats/pointing/base.py,sha256=qfDEmXfTZ4ekaABElhpE71zsQoZxoBpZK8AGMaxzgbc,565
 pyobs/robotic/utils/skyflats/pointing/static.py,sha256=GJjZqMW6Vmh2s56ScqdTjIKrWROFexg2xq1RSV_xd3o,1751
 pyobs/robotic/utils/skyflats/priorities/__init__.py,sha256=Tcc9G20VvPd-S_DWnhcZTSlsVPMqbjtV2YUFt8fAhsw,272
-pyobs/robotic/utils/skyflats/priorities/archive.py,sha256=6EBziHem5vq7w8grWmARdqLeUdRZDZVFKLW-kgBlpVk,1457
+pyobs/robotic/utils/skyflats/priorities/archive.py,sha256=nBk4S7i3HCYEQp8F3_I1VgORKniAglpqk5TYfYnVPxU,1841
 pyobs/robotic/utils/skyflats/priorities/base.py,sha256=4zjY713YB6I5SfBnxx4OZ72wseA76Pgtdc_RQWb243Y,347
-pyobs/robotic/utils/skyflats/priorities/const.py,sha256=zgtHHyYjkbvZS1kqswqpO8PdYGffpez_qMRNEJpYjKc,326
+pyobs/robotic/utils/skyflats/priorities/const.py,sha256=8bBuEqL1v9_wykUN0ol_3JJ0EZbQ27Zz1XgtiaHYHTk,441
 pyobs/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyobs/utils/average.py,sha256=bQMgKm2pAUd282fcnVMlpClIVSYq5AvfjtL78AdiiSU,1336
 pyobs/utils/cache.py,sha256=C-_hKIV8GEoIy6orci1nqqjwbOupzG9QGWFr0UY40M4,2866
@@ -443,8 +443,8 @@ pyobs/vfs/vfs.py,sha256=3cXpRGbWh6m_lm0R7uZUNJcjppBaXSpQVMTRgHnv6Tk,11025
 pyobs/vfs/filelists/__init__.py,sha256=NaTGFjLGh043j_F7kWEx_cXaII7t3CbYguRk2g5hEqw,111
 pyobs/vfs/filelists/filelist.py,sha256=kCco_5G2gLH-nxWik-wcs6lGuc_-3LeeyR9L4_srf30,201
 pyobs/vfs/filelists/testing.py,sha256=M8f2BULdjRCc7JFOKhAH7Kwre_uVQC0xLcv9xGTfNFw,425
-pyobs_core-2.0.0.dev94.dist-info/METADATA,sha256=xGwxZTDWSVAAX0kLEhxnaONWqKiqDpv7GKy50sYOkbU,1990
-pyobs_core-2.0.0.dev94.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-pyobs_core-2.0.0.dev94.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
-pyobs_core-2.0.0.dev94.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
-pyobs_core-2.0.0.dev94.dist-info/RECORD,,
+pyobs_core-2.0.0.dev97.dist-info/METADATA,sha256=29V_lbN_fwktG29IgE4XOYMo97gnk8hUzJp3Vc1z63s,1990
+pyobs_core-2.0.0.dev97.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+pyobs_core-2.0.0.dev97.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
+pyobs_core-2.0.0.dev97.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
+pyobs_core-2.0.0.dev97.dist-info/RECORD,,

pyobs/robotic/storage/backend/__init__.py

@@ -1,4 +0,0 @@
-from .observationarchive import BackendObservationArchive
-from .taskarchive import BackendTaskArchive
-
-__all__ = ["BackendObservationArchive", "BackendTaskArchive"]