pyobs-core 2.0.0.dev16__tar.gz → 2.0.0.dev18__tar.gz

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/PKG-INFO

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

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyobs/cli/pyobsd.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import argparse
 import glob
 import json
 import logging
@@ -49,9 +50,9 @@ class PyobsDaemonCLI(CLI):
         )
         self._parser.add_argument(
             "--syslog",
-            action="store_true",
-            help="send module logs to systemd journal",
-            default=self._config.get("syslog", False),
+            action=argparse.BooleanOptionalAction,
+            help="send module logs to systemd journal (use --no-syslog to disable)",
+            default=self._config.get("syslog", True),
         )
         self._parser.add_argument("--chuid", type=str, default=self._config.get("chuid", "pyobs:pyobs"))
         self._parser.add_argument("-v", "--verbose", action="store_true")
@@ -63,6 +64,9 @@ class PyobsDaemonCLI(CLI):
         sp.add_parser("restart", help="restart modules").add_argument("modules", type=str, nargs="*")
         sp.add_parser("status", help="status of modules").add_argument("--json", action="store_true")
         sp.add_parser("list", help="list of modules")
+        sp.add_parser("logs", help="show/follow module logs via journalctl").add_argument(
+            "args", nargs=argparse.REMAINDER, help="[module] [journalctl arguments...]"
+        )
 
     def run(self) -> None:
         # init daemon
@@ -88,6 +92,8 @@ class PyobsDaemonCLI(CLI):
                 daemon.status(print_json=self._config["json"])
             case "list":
                 daemon.list()
+            case "logs":
+                daemon.logs(self._config["args"])
 
 
 class PyobsDaemon:
@@ -292,6 +298,21 @@ class PyobsDaemon:
     def list(self) -> None:
         print("\n".join(self._list_configs()))
 
+    def logs(self, args: list[str]) -> None:
+        """Show/follow module logs by exec'ing into journalctl."""
+        match_args = ["SYSLOG_IDENTIFIER=pyobs"]
+        remainder = list(args)
+        # "--" may have been auto-inserted by main() to work around argparse.REMAINDER
+        # refusing to swallow a leading flag (e.g. "pyobsd logs -f") — drop it here.
+        if remainder and remainder[0] == "--":
+            remainder.pop(0)
+        if remainder and remainder[0] in self._list_configs():
+            match_args.append(f"PYOBS_MODULE={remainder.pop(0)}")
+        cmd = ["journalctl", *match_args, *remainder]
+        if self._verbose:
+            print(f"[DEBUG] Executing: {' '.join(cmd)}")
+        os.execvp("journalctl", cmd)
+
     # ── process management ────────────────────────────────────────────────────
 
     def _start_service(self, module: str) -> None:
@@ -388,6 +409,14 @@ class PyobsDaemon:
 
 
 def main() -> None:
+    # argparse.REMAINDER can't swallow a leading flag (e.g. "pyobsd logs -f")
+    # unless a "--" already precedes it — insert one automatically so users
+    # don't need to type it themselves.
+    if "logs" in sys.argv:
+        idx = sys.argv.index("logs") + 1
+        if idx < len(sys.argv) and sys.argv[idx].startswith("-") and sys.argv[idx] != "--":
+            sys.argv.insert(idx, "--")
+
     cli = PyobsDaemonCLI()
     cli()
 

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyobs/interfaces/IModule.py

@@ -7,10 +7,19 @@ from typing import Any
 from .interface import Interface
 
 
+@dataclass
+class ModuleLocation:
+    longitude: float = 0.0
+    latitude: float = 0.0
+    elevation: float = 0.0
+    timezone: str = "utc"
+
+
 @dataclass
 class ModuleCapabilities:
     label: str = ""
     version: str = ""
+    location: ModuleLocation | None = None
 
 
 class IModule(Interface, metaclass=ABCMeta):
@@ -31,4 +40,4 @@ class IModule(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IModule", "ModuleCapabilities"]
+__all__ = ["IModule", "ModuleCapabilities", "ModuleLocation"]

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyobs/interfaces/__init__.py

@@ -36,7 +36,7 @@ from .IGain import GainState, IGain
 from .IImageFormat import IImageFormat, ImageFormatCapabilities, ImageFormatState
 from .IImageType import IImageType, ImageTypeState
 from .IMode import IMode, ModeCapabilities, ModeState
-from .IModule import IModule, ModuleCapabilities
+from .IModule import IModule, ModuleCapabilities, ModuleLocation
 from .IMotion import DeviceMotionStatus, IMotion, MotionState
 from .IMultiFiber import IMultiFiber, MultiFiberCapabilities, MultiFiberState
 from .interface import Interface
@@ -118,6 +118,7 @@ __all__ = [
     "ModeState",
     "IModule",
     "ModuleCapabilities",
+    "ModuleLocation",
     "IMotion",
     "DeviceMotionStatus",
     "MotionState",

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyobs/modules/camera/basevideo.py

@@ -147,6 +147,7 @@ class BaseVideo(Module, ImageFitsHeaderMixin, IVideo, IImageType, metaclass=ABCM
         self._app.add_routes(
             [
                 web.get("/", self.web_handler),
+                web.get("/ping", self.ping_handler),
                 web.get("/video.mjpg", self.video_handler),
                 web.get("/{filename}", self.image_handler),
             ]
@@ -194,6 +195,17 @@ class BaseVideo(Module, ImageFitsHeaderMixin, IVideo, IImageType, metaclass=ABCM
         """
         return web.Response(text=INDEX_HTML, content_type="text/html")
 
+    async def ping_handler(self, request: web.Request) -> web.Response:
+        """Handles GET access to /ping for testing connectivity.
+
+        Args:
+            request: Request to respond to.
+
+        Returns:
+            Response with a JSON status.
+        """
+        return web.json_response({"status": "ok"})
+
     async def video_handler(self, request: web.Request) -> web.StreamResponse:
         """Handles access to /video.mjpg and returns the video.
 

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyobs/modules/module.py

@@ -11,7 +11,15 @@ import packaging.version
 from py_expression_eval import Parser
 
 from pyobs.events import Event, ModuleOpenedEvent
-from pyobs.interfaces import ConfigCapabilities, ConfigValue, IConfig, IModule, Interface, ModuleCapabilities
+from pyobs.interfaces import (
+    ConfigCapabilities,
+    ConfigValue,
+    IConfig,
+    IModule,
+    Interface,
+    ModuleCapabilities,
+    ModuleLocation,
+)
 from pyobs.object import Object
 from pyobs.utils import exceptions as exc
 from pyobs.utils.enums import ModuleState
@@ -163,11 +171,22 @@ class Module(Object, IModule, IConfig):
 
         # publish base capabilities
         if self._comm is not None:
+            location = (
+                ModuleLocation(
+                    longitude=self._location.lon.degree,
+                    latitude=self._location.lat.degree,
+                    elevation=self._location.height.value,
+                    timezone=str(self._timezone),
+                )
+                if self._location is not None
+                else None
+            )
             await self._comm.set_capabilities(
                 IModule,
                 ModuleCapabilities(
                     version=await self.get_version(),
                     label=await self.get_label(),
+                    location=location,
                 ),
             )
             await self._comm.set_capabilities(
@@ -215,12 +234,36 @@ class Module(Object, IModule, IConfig):
             async with self.proxy(sender, IModule) as proxy:
                 caps = proxy.get_capabilities(IModule)
                 module_version = caps.version if caps is not None else ""
+                remote_location = caps.location if caps is not None else None
         except exc.RemoteError:
             return True
 
         # log it
         log.debug("Other module %s found, running on pyobs %s.", sender, module_version)
 
+        # compare location, if both sides have one configured -- surfaces config drift between
+        # modules that are supposed to share a site, since pyobs has no shared "site" concept
+        if remote_location is not None and self._location is not None:
+            from astropy.coordinates import EarthLocation
+
+            remote = EarthLocation.from_geodetic(
+                remote_location.longitude, remote_location.latitude, remote_location.elevation
+            )
+            distance = (
+                (remote.x - self._location.x) ** 2
+                + (remote.y - self._location.y) ** 2
+                + (remote.z - self._location.z) ** 2
+            ) ** 0.5
+            if distance.to_value("m") > 100:  # tolerance, tune as needed
+                log.warning(
+                    "Module %s reports a location %.0fm from ours (lon=%.4f, lat=%.4f, elevation=%.1fm).",
+                    sender,
+                    distance.to_value("m"),
+                    remote_location.longitude,
+                    remote_location.latitude,
+                    remote_location.elevation,
+                )
+
         # no version reported, cannot compare
         if not module_version:
             return True

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyobs/modules/telescope/dummytelescope.py

@@ -108,6 +108,7 @@ class DummyTelescope(
         self._dest_coords: SkyCoord | None = None
         self._drift = (0.0, 0.0)
         self._sim_status = MotionStatus.IDLE
+        self._temperatures = {"M1": 10.0, "M2": 12.0}
 
         # locks
         self._lock_focus = asyncio.Lock()
@@ -172,6 +173,14 @@ class DummyTelescope(
                 drift_dec = random.gauss(self._drift_rate[1], max(self._drift_rate[1] / 10.0, 1e-9))
                 self._drift = (self._drift[0] + drift_ra, self._drift[1] + drift_dec)
 
+            self._temperatures = {name: value + random.gauss(0.0, 0.05) for name, value in self._temperatures.items()}
+            await self.comm.set_state(
+                ITemperatures,
+                TemperaturesState(
+                    readings=[SensorReading(name=name, value=value) for name, value in self._temperatures.items()]
+                ),
+            )
+
             await asyncio.sleep(1)
 
     async def open(self) -> None:
@@ -191,10 +200,7 @@ class DummyTelescope(
         await self.comm.set_state(
             ITemperatures,
             TemperaturesState(
-                readings=[
-                    SensorReading(name="M1", value=10.0),
-                    SensorReading(name="M2", value=12.0),
-                ]
+                readings=[SensorReading(name=name, value=value) for name, value in self._temperatures.items()]
             ),
         )
         await self.comm.set_state(IReady, ReadyState(ready=True))
@@ -318,7 +324,7 @@ class DummyTelescope(
             await self._change_motion_status(MotionStatus.IDLE)
 
     async def set_focus_offset(self, offset: float, **kwargs: Any) -> None:
-        log.error("Not implemented")
+        raise NotImplementedError
 
 
 __all__ = ["DummyTelescope"]

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyobs/modules/utils/httpfilecache.py

@@ -34,7 +34,13 @@ class HttpFileCache(Module):
 
         # define web server
         self._app = web.Application(client_max_size=self._max_file_size)
-        self._app.add_routes([web.get("/{filename}", self.download_handler), web.post("/", self.upload_handler)])
+        self._app.add_routes(
+            [
+                web.get("/ping", self.ping_handler),
+                web.get("/{filename}", self.download_handler),
+                web.post("/", self.upload_handler),
+            ]
+        )
         self._runner = web.AppRunner(self._app)
         self._site: web.TCPSite | None = None
 
@@ -61,6 +67,17 @@ class HttpFileCache(Module):
         """Whether the server is started."""
         return self._is_listening
 
+    async def ping_handler(self, request: web.Request) -> web.Response:
+        """Handles GET access to /ping for testing connectivity.
+
+        Args:
+            request: Request to respond to.
+
+        Returns:
+            Response with a JSON status.
+        """
+        return web.json_response({"status": "ok"})
+
     async def download_handler(self, request: web.Request) -> web.Response:
         """Handles GET access to /{filename} and returns image.
 

{pyobs_core-2.0.0.dev16 → pyobs_core-2.0.0.dev18}/pyproject.toml

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