pyobs-core 2.0.0.dev95__tar.gz → 2.0.0.dev98__tar.gz

{pyobs_core-2.0.0.dev95 → pyobs_core-2.0.0.dev98}/PKG-INFO

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

{pyobs_core-2.0.0.dev95 → pyobs_core-2.0.0.dev98}/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_core-2.0.0.dev95 → pyobs_core-2.0.0.dev98}/pyobs/robotic/observation.py

@@ -39,6 +39,12 @@ class Observation(BaseModel):
     """Per-night observation number, e.g. "20260810-001". Assigned by Mastermind when the
     observation starts running; None before that (or if never observed)."""
 
+    archive_url: str | None = None
+    """Link to this observation's data in the archive's own frontend, as serialized by
+    pyobs-portal (pyobs-portal#82). Portal-only UI metadata: Mastermind tolerates but never
+    consumes it -- it is always None for the pending/in_progress states Mastermind schedules
+    on, and is declared so the portal's payloads keep validating under ``extra="forbid"``."""
+
     def __str__(self) -> str:
         return (
             f"Observation {self.id} of {self.task.name} (#{self.task.id}) "

pyobs_core-2.0.0.dev98/pyobs/robotic/storage/portal/__init__.py

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

{pyobs_core-2.0.0.dev95/pyobs/robotic/storage/backend → pyobs_core-2.0.0.dev98/pyobs/robotic/storage/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_core-2.0.0.dev95/pyobs/robotic/storage/backend → pyobs_core-2.0.0.dev98/pyobs/robotic/storage/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_core-2.0.0.dev95 → pyobs_core-2.0.0.dev98}/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_core-2.0.0.dev95 → pyobs_core-2.0.0.dev98}/pyproject.toml

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

pyobs_core-2.0.0.dev95/pyobs/robotic/storage/backend/__init__.py

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