pyobs-core 2.0.0.dev61__tar.gz → 2.0.0.dev63__tar.gz

{pyobs_core-2.0.0.dev61 → pyobs_core-2.0.0.dev63}/PKG-INFO

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

{pyobs_core-2.0.0.dev61 → pyobs_core-2.0.0.dev63}/pyobs/mixins/fitsheader.py

@@ -277,6 +277,11 @@ class ImageFitsHeaderMixin(FitsHeaderMixin):
         self._fitsheadermixin_centre = centre
         self._fitsheadermixin_rotation = rotation
 
+        # only warn once per missing-header case, since these repeat on every single frame
+        self._fitsheadermixin_warned_cdelt = False
+        self._fitsheadermixin_warned_crpix = False
+        self._fitsheadermixin_warned_cd_matrix = False
+
     @property
     def rotation(self) -> float | None:
         return self._fitsheadermixin_rotation
@@ -322,8 +327,9 @@ class ImageFitsHeaderMixin(FitsHeaderMixin):
             hdr["CUNIT1"] = ("deg", "Units of CRVAL1, CDELT1")
             hdr["CUNIT2"] = ("deg", "Units of CRVAL2, CDELT2")
             hdr["WCSAXES"] = (2, "Number of WCS axes")
-        else:
+        elif not self._fitsheadermixin_warned_cdelt:
             log.warning("Could not calculate CDELT1/CDELT2 (DET-PIXL/TEL-FOCL/DET-BIN1/DET-BIN2 missing).")
+            self._fitsheadermixin_warned_cdelt = True
 
         # centre pixel
         if self._fitsheadermixin_centre is not None:
@@ -341,10 +347,11 @@ class ImageFitsHeaderMixin(FitsHeaderMixin):
                 off_y = v("YORGSUBF") if "YORGSUBF" in hdr else 0.0
             hdr["CRPIX1"] = ((v("DET-CPX1") - off_x) / v("DET-BIN1"), "Reference x-pixel position in binned image")
             hdr["CRPIX2"] = ((v("DET-CPX2") - off_y) / v("DET-BIN2"), "Reference y-pixel position in binned image")
-        else:
+        elif not self._fitsheadermixin_warned_crpix:
             log.warning(
                 "Could not calculate CRPIX1/CRPIX2 " "(XORGSUBF/YORGSUBF/DET-CPX1/TEL-CPX2/DET-BIN1/DET-BIN2) missing."
             )
+            self._fitsheadermixin_warned_crpix = True
         # only add all this stuff for OBJECT images
         if "IMAGETYP" not in hdr or hdr["IMAGETYP"] not in ["dark", "bias"]:
             # projection, only override if not already set
@@ -368,8 +375,9 @@ class ImageFitsHeaderMixin(FitsHeaderMixin):
                 hdr["PC1_2"] = (-sin_theta, "Partial of first axis coordinate w.r.t. y")
                 hdr["PC2_1"] = (+sin_theta, "Partial of second axis coordinate w.r.t. x")
                 hdr["PC2_2"] = (+cos_theta, "Partial of second axis coordinate w.r.t. y")
-            else:
+            elif not self._fitsheadermixin_warned_cd_matrix:
                 log.warning("Could not calculate CD matrix (rotation or CDELT1/CDELT2 missing.")
+                self._fitsheadermixin_warned_cd_matrix = True
 
 
 class SpectrumFitsHeaderMixin(FitsHeaderMixin):

{pyobs_core-2.0.0.dev61 → pyobs_core-2.0.0.dev63}/pyobs/modules/pointing/acquisition.py

@@ -174,7 +174,7 @@ class Acquisition(BasePointing, CameraSettingsMixin, IAcquisition):
 
             # calculate distance from offset
             if not image.has_meta(OnSkyDistance):
-                log.warning("No on-sky distance found in meta.")
+                log.info("No on-sky distance found in meta.")
                 continue
                 # raise exc.ImageError("No on sky distance found in meta.")
             osd = image.get_meta(OnSkyDistance)

{pyobs_core-2.0.0.dev61 → pyobs_core-2.0.0.dev63}/pyobs/robotic/storage/backend/observationarchive.py

@@ -9,7 +9,7 @@ import aiohttp
 
 from pyobs.robotic import ObservationArchive, Task, TaskArchive
 from pyobs.robotic.observation import Observation, ObservationList, ObservationState
-from pyobs.utils.http import http_request_with_retries
+from pyobs.utils.http import http_request_paginated, http_request_with_retries
 from pyobs.utils.time import Time
 
 log = logging.getLogger(__name__)
@@ -146,6 +146,9 @@ class BackendObservationArchive(ObservationArchive):
             if obs.state == "pending" and obs.start < time < obs.end:
                 if task_archive is not None:
                     await obs.fetch_task(task_archive)
+                    if obs.task is None:
+                        log.error("Could not resolve task for observation %s, skipping.", obs.id)
+                        continue
                 return obs
         else:
             return None
@@ -165,6 +168,9 @@ class BackendObservationArchive(ObservationArchive):
             if obs.state == "in_progress":
                 if task_archive is not None:
                     await obs.fetch_task(task_archive)
+                    if obs.task is None:
+                        log.error("Could not resolve task for observation %s, skipping.", obs.id)
+                        continue
                 return obs
         else:
             return None
@@ -223,8 +229,8 @@ class BackendObservationArchive(ObservationArchive):
             params["end_before"] = end_before.isot
         if end_after is not None:
             params["end_after"] = end_after.isot
-        observations = await http_request_with_retries(self._session, url, params=params)
-        return ObservationList([self.pyobs_model_validate(Observation, obs) for obs in observations["results"]])
+        observations = await http_request_paginated(self._session, url, params=params)
+        return ObservationList([self.pyobs_model_validate(Observation, obs) for obs in observations])
 
 
 __all__ = ["BackendObservationArchive"]

{pyobs_core-2.0.0.dev61 → pyobs_core-2.0.0.dev63}/pyobs/robotic/storage/backend/taskarchive.py

@@ -7,7 +7,7 @@ import aiohttp
 
 from pyobs.robotic.storage.taskarchive import TaskArchive
 from pyobs.robotic.task import Project, Task
-from pyobs.utils.http import http_request_with_retries
+from pyobs.utils.http import http_request_paginated, http_request_with_retries
 from pyobs.utils.time import Time
 
 log = logging.getLogger(__name__)
@@ -75,13 +75,13 @@ class BackendTaskArchive(TaskArchive):
 
     async def _get_projects(self) -> list[Project]:
         """Fetch projects from backend."""
-        projects = await http_request_with_retries(self._session, urljoin(self._url, "/api/projects/"))
-        return [self.pyobs_model_validate(Project, project) for project in projects["results"]]
+        projects = await http_request_paginated(self._session, urljoin(self._url, "/api/projects/"))
+        return [self.pyobs_model_validate(Project, project) for project in projects]
 
     async def _get_tasks(self) -> list[Task]:
         """Fetch tasks from backend."""
-        tasks = await http_request_with_retries(self._session, urljoin(self._url, "/api/tasks/"))
-        return [self.pyobs_model_validate(Task, task) for task in tasks["results"]]
+        tasks = await http_request_paginated(self._session, urljoin(self._url, "/api/tasks/"))
+        return [self.pyobs_model_validate(Task, task) for task in tasks]
 
     async def last_changed(self) -> Time | None:
         """Returns time when last time any tasks changed."""

{pyobs_core-2.0.0.dev61 → pyobs_core-2.0.0.dev63}/pyobs/utils/http.py

@@ -28,3 +28,19 @@ async def http_request_with_retries(
         if response.status != expected_status:
             raise RuntimeError(f"Invalid response from server: HTTP {response.status}")
         return cast(dict[str, Any], await response.json())
+
+
+async def http_request_paginated(
+    session: aiohttp.ClientSession, url: str, method: str = "get", expected_status: int = 200, **kwargs: Any
+) -> list[dict[str, Any]]:
+    """Fetches all pages of a DRF-style paginated list endpoint and returns the combined results."""
+    results: list[dict[str, Any]] = []
+    next_url: str | None = url
+    while next_url is not None:
+        data = await http_request_with_retries(
+            session, next_url, method=method, expected_status=expected_status, **kwargs
+        )
+        results.extend(data["results"])
+        next_url = data.get("next")
+        kwargs = {}
+    return results

{pyobs_core-2.0.0.dev61 → pyobs_core-2.0.0.dev63}/pyproject.toml

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