pyobs-core 2.0.0.dev65__tar.gz → 2.0.0.dev67__tar.gz

{pyobs_core-2.0.0.dev65 → pyobs_core-2.0.0.dev67}/PKG-INFO

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

{pyobs_core-2.0.0.dev65 → pyobs_core-2.0.0.dev67}/pyobs/modules/robotic/mastermind.py

@@ -17,6 +17,7 @@ from pyobs.robotic import (
     TaskRunner,
 )
 from pyobs.robotic.scheduler.targets import Target
+from pyobs.utils import exceptions as exc
 from pyobs.utils.time import Time
 
 log = logging.getLogger(__name__)
@@ -168,9 +169,15 @@ class Mastermind(Module, IAutonomous, IFitsHeaderBefore):
             log.info("Running task %s...", self._task.name)
             try:
                 await self._task_runner.run_task(self._task, self._task_target)
-            except Exception:
-                # something went wrong
-                log.exception("Task %s failed.", self._task.name)
+            except Exception as e:
+                # a PyobsError is an expected/domain failure (e.g. acquisition out of tolerance) --
+                # quiet INFO line, no traceback. Anything else is unexpected and needs a full
+                # traceback to debug. e.log() also skips re-logging if some deeper layer (e.g. the
+                # module's own execute()) already logged this same exception.
+                if isinstance(e, exc.PyobsError):
+                    e.log(log, "INFO", f"Task {self._task.name} failed: {e}")
+                else:
+                    log.exception("Task %s failed.", self._task.name)
                 observation.end = Time.now()
                 observation.state = ObservationState.FAILED
                 await self._observation_archive.update_observation(observation)

{pyobs_core-2.0.0.dev65 → pyobs_core-2.0.0.dev67}/pyobs/robotic/scheduler/observationarchiveevolution.py

@@ -9,6 +9,8 @@ from astroplan import Observer
 from ...utils.time import Time
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from pyobs.robotic import Observation, Task
     from pyobs.robotic.observation import ObservationList
     from pyobs.robotic.storage.observationarchive import ObservationArchive
@@ -20,6 +22,23 @@ class ObservationArchiveEvolution:
         self._obs_for_task: dict[Any, ObservationList] = {}
         self._obs_for_night: dict[datetime.date, ObservationList] = {}
         self._observer = observer
+        self._current_night: datetime.date | None = None
+        self._frozen = False
+
+    async def prefetch(self, tasks: Iterable[Task], start: Time, night: datetime.date) -> None:
+        """Populates the task cache and the one real night (anchored to `start`) up front. Call
+        once per schedule() run before any evaluation, then freeze(). Runs on the caller's
+        event loop (real I/O)."""
+        self._current_night = night
+        for task in tasks:
+            await self.observations_for_task(task)
+        await self.observations_for_night(night)
+
+    def freeze(self) -> None:
+        """Freezes observation cache. After this: a task-id miss raises RuntimeError; a night
+        miss seeds an empty list (future nights are provably empty of COMPLETED observations,
+        since `start` is pinned at least `_safety_time` ahead of real wall-clock time)."""
+        self._frozen = True
 
     async def evolve(self, scheduled_task: Observation, night: datetime.date) -> None:
         from pyobs.robotic.observation import Observation, ObservationState
@@ -50,6 +69,11 @@ class ObservationArchiveEvolution:
         from pyobs.robotic.observation import ObservationList, ObservationState
 
         if task.id not in self._obs_for_task:
+            if self._frozen:
+                raise RuntimeError(
+                    f"Task {task.id} not in observation cache after freeze(). "
+                    f"This is a bug -- all task IDs must be prefetched before freeze().",
+                )
             if self._obs_archive is not None:
                 self._obs_for_task[task.id] = await self._obs_archive.get_observations(
                     task=task, state=ObservationState.COMPLETED
@@ -70,7 +94,14 @@ class ObservationArchiveEvolution:
         from pyobs.robotic.observation import ObservationList, ObservationState
 
         if date not in self._obs_for_night:
-            if self._obs_archive is not None:
+            if self._frozen:
+                # `start` is pinned at least `_safety_time` ahead of real wall-clock time, so any
+                # night after the prefetched one cannot possibly have COMPLETED observations yet.
+                assert (
+                    self._current_night is not None and date > self._current_night
+                ), f"Night {date} not prefetched and not strictly after current night {self._current_night}."
+                self._obs_for_night[date] = ObservationList()
+            elif self._obs_archive is not None:
                 start = Time(datetime.datetime.combine(date, datetime.time(0, 0, 0)))
                 end = Time(datetime.datetime.combine(date, datetime.time(23, 59, 59)))
                 self._obs_for_night[date] = await self._obs_archive.get_observations(

{pyobs_core-2.0.0.dev65 → pyobs_core-2.0.0.dev67}/pyobs/robotic/scheduler/ondemandscheduler.py

@@ -68,6 +68,12 @@ class OnDemandScheduler(TaskScheduler):
         data = DataProvider(self._observer, archive)
         projects_dict = {project.code: project for project in projects}
 
+        # prefetch historical observations on the main loop (the only place aiohttp session works),
+        # then freeze to prevent any lazy archive fetches from the worker thread
+        night = data.night(start)
+        await data.archive.prefetch(tasks, start, night)
+        data.archive.freeze()
+
         # schedule from start to end
         async for task in self.schedule_in_interval(tasks, projects_dict, start, end, data):
             # evolve archive -- night is keyed by the task's own scheduled time, not "now", since

{pyobs_core-2.0.0.dev65 → pyobs_core-2.0.0.dev67}/pyproject.toml

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