pyobs-core 2.0.0.dev83__py3-none-any.whl → 2.0.0.dev85__py3-none-any.whl

pyobs/robotic/task.py

@@ -149,6 +149,7 @@ class Project(BaseModel):
     code: str
     name: str = ""
     priority: float | None = Field(ge=0.0, le=9999.0, default=1.0)
+    users: list[str] = Field(default_factory=list)
 
 
 __all__ = ["Task", "TaskData", "Project"]

pyobs/utils/http.py

@@ -14,6 +14,16 @@ from tenacity import (
 log = logging.getLogger(__name__)
 
 
+class InvalidResponseError(RuntimeError):
+    """Raised when the server returns an unexpected HTTP status. Carries the status and, if
+    available, the parsed JSON body, so callers can distinguish specific failure modes."""
+
+    def __init__(self, status: int, body: Any = None):
+        self.status = status
+        self.body = body
+        super().__init__(f"Invalid response from server: HTTP {status}")
+
+
 @retry(
     retry=retry_if_exception_type((aiohttp.ClientError, asyncio.TimeoutError, RuntimeError)),
     wait=wait_exponential(multiplier=1, min=1, max=30),
@@ -26,21 +36,44 @@ async def http_request_with_retries(
 ) -> dict[str, Any]:
     async with session.request(method, url, **kwargs) as response:
         if response.status != expected_status:
-            raise RuntimeError(f"Invalid response from server: HTTP {response.status}")
+            body = None
+            try:
+                body = await response.json()
+            except (aiohttp.ContentTypeError, ValueError):
+                pass
+            raise InvalidResponseError(response.status, body)
         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."""
+    """Fetches all pages of a DRF-style paginated list endpoint and returns the combined results.
+
+    If a page beyond the first becomes invalid mid-fetch (DRF's "Invalid page." 404, which can
+    happen when concurrent writes shift page boundaries on a live-growing dataset), pagination
+    stops early with whatever was already fetched instead of failing the whole request.
+    """
     results: list[dict[str, Any]] = []
     next_url: str | None = url
+    is_first_page = True
     while next_url is not None:
-        data = await http_request_with_retries(
-            session, next_url, method=method, expected_status=expected_status, **kwargs
-        )
+        try:
+            data = await http_request_with_retries(
+                session, next_url, method=method, expected_status=expected_status, **kwargs
+            )
+        except InvalidResponseError as e:
+            if (
+                not is_first_page
+                and e.status == 404
+                and isinstance(e.body, dict)
+                and e.body.get("detail") == "Invalid page."
+            ):
+                log.warning("Pagination page became invalid mid-fetch, stopping early with %d result(s).", len(results))
+                break
+            raise
         results.extend(data["results"])
         next_url = data.get("next")
         kwargs = {}
+        is_first_page = False
     return results

{pyobs_core-2.0.0.dev83.dist-info → pyobs_core-2.0.0.dev85.dist-info}/METADATA

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

{pyobs_core-2.0.0.dev83.dist-info → pyobs_core-2.0.0.dev85.dist-info}/RECORD

@@ -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=e8gZWnaDahWFpXIpn04o_4Q18UyAq5mjipP0Eb3AoCU,5421
+pyobs/robotic/task.py,sha256=ZXsxeyV41gNCnrUmOfU1i9XUH6Ez_MLO0-H_5LaX7l0,5472
 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
@@ -380,7 +380,7 @@ pyobs/utils/curvefit.py,sha256=DIOPofmAP2GzAWCwV4L8h4mGK1GCvy1hyfGYE3Z78YI,1343
 pyobs/utils/enums.py,sha256=vzmsyUEbQyBsZgcMwkgcEHZJIm25v6EIZauSnDfMeQM,5558
 pyobs/utils/exceptions.py,sha256=7sgyVIwP40I1L14rSNgYFRB5IAc3W4RAmRbViWQa1TM,6923
 pyobs/utils/fits.py,sha256=3Xy9a-3aPGLXeHhWmF4gtBaCv2jpmpsiN2dGWmcwylI,9213
-pyobs/utils/http.py,sha256=2Rhw1EmPWx8p15_3pF0Ju3SKSF4aK4BUj_ZyAr2gG7A,1576
+pyobs/utils/http.py,sha256=RsEH8dDjJ1kfliNR83x3d0_GWHha3MdImcWfwZVrsLg,2900
 pyobs/utils/influxdb.py,sha256=0rd67kxslI9H_F_-sNFLTPMFl8hlSA0ihO6qoUGsyzw,2505
 pyobs/utils/logger.py,sha256=3TMZ3DmapBMfWd0wX334VCr3uhmwzNl0Gy3-T6RnFB4,671
 pyobs/utils/modulegui.py,sha256=k7JhACvBFWyqOxDfwCfU2v7Z-YmTN_QoaOEx2mmy2pw,1744
@@ -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.dev83.dist-info/METADATA,sha256=3vSeZzX93RmtWHfn4SbzqP-VlOAziDW-UX6cLGZb_vg,1990
-pyobs_core-2.0.0.dev83.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-pyobs_core-2.0.0.dev83.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
-pyobs_core-2.0.0.dev83.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
-pyobs_core-2.0.0.dev83.dist-info/RECORD,,
+pyobs_core-2.0.0.dev85.dist-info/METADATA,sha256=Rmhd6f2Xn7W7mvzfycgpzCaQcMVsDB28usco_L0O2ss,1990
+pyobs_core-2.0.0.dev85.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+pyobs_core-2.0.0.dev85.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
+pyobs_core-2.0.0.dev85.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
+pyobs_core-2.0.0.dev85.dist-info/RECORD,,