pyobs-core 2.0.0.dev4__tar.gz → 2.0.0.dev6__tar.gz

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-core
-Version: 2.0.0.dev4
+Version: 2.0.0.dev6
 Summary: robotic telescope software
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT
@@ -8,6 +8,7 @@ License-File: LICENSE
 Requires-Python: >=3.11
 Requires-Dist: aiohttp<4,>=3.11.18
 Requires-Dist: astroplan<0.11,>=0.10.1
+Requires-Dist: astropy-iers-data>=0.2026.6.22.1.23.34
 Requires-Dist: astropy<8,>=7.0.1
 Requires-Dist: astropydantic>=0.0.5
 Requires-Dist: astroquery<0.5,>=0.4.10

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/application.py

@@ -19,6 +19,26 @@ from pyobs.utils.logging.context import ModuleNameFilter
 log = logging.getLogger(__name__)
 
 
+# --- IERS offline fallback ---------------------------------------------
+# When PYOBS_IERS_OFFLINE=1, skip live IERS/USNO downloads and rely on the
+# astropy-iers-data snapshot bundled with the installed astropy package.
+# Useful when the upstream IERS servers are down/unreachable, or when
+# running on a telescope control machine without outbound internet access.
+if os.environ.get("PYOBS_IERS_OFFLINE", "").lower() in ("1", "true", "yes"):
+    from astropy.utils.iers import conf as iers_conf
+
+    iers_conf.auto_download = False
+    iers_conf.auto_max_age = None
+    iers_conf.iers_degraded_accuracy = "warn"
+
+    log.warning(
+        "PYOBS_IERS_OFFLINE is set — disabling IERS auto-download and "
+        "relying on the bundled astropy-iers-data snapshot. Earth "
+        "orientation/UT1-UTC accuracy may degrade for predictions far "
+        "from the snapshot date."
+    )
+# -------------------------------------------------------------------------
+
 # turn RuntimeWarnings into errors
 warnings.filterwarnings("error", category=RuntimeWarning)
 
@@ -89,9 +109,9 @@ class Application:
 
         # systemd journal handler?
         if syslog:
-            from logging_journald import JournaldLogHandler  # type: ignore[import-untyped]
+            from logging_journald import JournaldLogHandler
 
-            class PyobsJournaldLogHandler(JournaldLogHandler):  # type: ignore[misc]
+            class PyobsJournaldLogHandler(JournaldLogHandler):
                 """JournaldLogHandler that adds SYSLOG_IDENTIFIER=pyobs and PYOBS_MODULE per record."""
 
                 def __init__(self, **kw: Any) -> None:

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/cli/pyobsd.py

@@ -340,9 +340,9 @@ class PyobsDaemon:
         stdout, stderr = proc.communicate(timeout=2)
         print(f"Warning: {module} launched but PID not confirmed.")
         if stdout:
-            print(f"  stdout: {stdout.decode(errors='replace').strip()}")
+            print(f"  stdout: {stdout.decode(errors='replace').strip()}")  # type: ignore[attr-defined]
         if stderr:
-            print(f"  stderr: {stderr.decode(errors='replace').strip()}")
+            print(f"  stderr: {stderr.decode(errors='replace').strip()}")  # type: ignore[attr-defined]
 
     def _stop_service(self, module: str) -> None:
         pid = self._running_pid(module)

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/comm/comm.py

@@ -4,7 +4,6 @@ import asyncio
 import functools
 import inspect
 import logging
-import sys
 from collections.abc import Callable, Coroutine
 from typing import TYPE_CHECKING, Any, overload
 
@@ -132,12 +131,20 @@ class Comm:
             except IndexError:
                 return None
 
+            # collect capabilities (fixed at proxy construction time)
+            capabilities: dict[type[Interface], Any] = {}
+            for interface in interfaces:
+                if interface.capabilities is not None:
+                    cap = await self._get_capabilities(client, interface)
+                    if cap is not None:
+                        capabilities[interface] = cap
+
             # create new proxy
-            proxy = Proxy(self, client, interfaces)
+            proxy = Proxy(self, client, interfaces, capabilities)
 
             # subscribe to state
             for interface in interfaces:
-                if getattr(interface, "State", None) is not None:
+                if interface.state is not None:
                     await self.subscribe_state(client, interface, functools.partial(proxy.update_state, interface))
 
             self._proxies[client] = proxy
@@ -450,22 +457,17 @@ class Comm:
     async def _set_state(self, interface: type[Interface], state: Any) -> None:
         pass
 
-    @staticmethod
-    def _interface_from_capabilities(caps_cls: type) -> type:
-        outer_name = caps_cls.__qualname__.rsplit(".", 1)[0]
-        return getattr(sys.modules[caps_cls.__module__], outer_name)
-
-    async def set_capabilities(self, capabilities: Any) -> None:
+    async def set_capabilities(self, interface: type[Interface], capabilities: Any) -> None:
         """Publish capabilities for this module.
 
-        Called by Module.open() for each interface that defines a Capabilities
+        Called by Module.open() for each interface that defines a capabilities
         dataclass. Not intended to be called directly by module authors after
         that point — capabilities are fixed for the module lifetime.
 
         Args:
+            interface: Interface type the capabilities belong to.
             capabilities: Capabilities dataclass instance.
         """
-        interface = Comm._interface_from_capabilities(type(capabilities))
         await self._set_capabilities(interface, capabilities)
 
     async def _set_capabilities(self, interface: type[Interface], capabilities: Any) -> None:
@@ -512,6 +514,13 @@ class Comm:
     def _get_client_state(self, module: str) -> tuple[ModuleState, str] | None:
         return None
 
+    def get_own_state(self, interface: type[Interface]) -> Any:
+        """Return the last state published by this module for the given interface, or None."""
+        return self._get_own_state(interface)
+
+    def _get_own_state(self, interface: type[Interface]) -> Any:
+        return None
+
     async def subscribe_state(
         self,
         module: str,

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/comm/local/localcomm.py

@@ -79,6 +79,10 @@ class LocalComm(Comm):
     # State
     # -------------------------------------------------------------------------
 
+    def _get_own_state(self, interface: type[Interface]) -> Any:
+        node = f"pyobs:state:{self._name}:{interface.__name__}:{interface.version}"
+        return self._states.get(node)
+
     async def _set_state(self, interface: type[Interface], state: Any) -> None:
         """Publish state locally and dispatch to subscribers."""
         node = f"pyobs:state:{self._name}:{interface.__name__}:{interface.version}"
@@ -120,7 +124,7 @@ class LocalComm(Comm):
 
     async def _get_capabilities(self, module: str, interface: type[Interface]) -> Any | None:
         """Fetch capabilities from a remote module."""
-        if not hasattr(interface, "Capabilities"):
+        if interface.capabilities is None:
             return None
         try:
             remote = self._network.get_client(module)

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/comm/proxy.py

@@ -21,13 +21,20 @@ class Proxy:
 
     __module__ = "pyobs.comm"
 
-    def __init__(self, comm: Comm, client: str, interfaces: list[type[Interface]]):
+    def __init__(
+        self,
+        comm: Comm,
+        client: str,
+        interfaces: list[type[Interface]],
+        capabilities: dict[type[Interface], Any] | None = None,
+    ):
         """Creates a new proxy.
 
         Args:
             comm: Comm object to use for connection.
             client: Name of client to connect to.
             interfaces: List of interfaces supported by client.
+            capabilities: Pre-populated capabilities dict, keyed by interface type.
         """
 
         # set client and interfaces
@@ -48,13 +55,14 @@ class Proxy:
 
         # add interfaces as base classes
         cls = self.__class__
-        self.__class__ = cls.__class__("Proxy", tuple([cls] + interfaces), {})  # type: ignore
+        self.__class__ = type("Proxy", tuple([cls] + interfaces), {})
 
         # create methods
         self._methods = self._create_methods()
 
-        # store state
+        # store state and capabilities
         self._state: dict[type[Interface], Any] = {}
+        self._capabilities: dict[type[Interface], Any] = capabilities if capabilities is not None else {}
 
     @property
     def name(self) -> str:
@@ -131,6 +139,9 @@ class Proxy:
         for interface in self._interfaces:
             # loop all methods:
             for func_name, func in inspect.getmembers(interface, predicate=inspect.isfunction):
+                # skip base Interface infrastructure methods — Proxy provides its own implementations
+                if func_name in Interface.__dict__:
+                    continue
                 # set method
                 my_func = types.MethodType(self._remote_function_wrapper(func_name), self)
                 setattr(self, func_name, my_func)
@@ -166,10 +177,14 @@ class Proxy:
         """Clear all cached state. Called by Comm when the remote module disconnects."""
         self._state.clear()
 
-    def state(self, interface: type[Interface]) -> Any | None:
+    def get_state(self, interface: type[Interface]) -> Any | None:
         """Latest known state for the given interface, or None if nothing has arrived yet."""
         return self._state.get(interface)
 
+    def get_capabilities(self, interface: type[Interface]) -> Any | None:
+        """Capabilities for the given interface, populated once at Proxy construction."""
+        return self._capabilities.get(interface)
+
     async def wait_for_state(
         self,
         interface: type[Interface],

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/comm/xmpp/rpc.py

@@ -115,8 +115,8 @@ def xml_to_fault(fault_elem: ET.Element) -> tuple[str, str]:
         return "RemoteError", "Unknown error"
     exc_el = pyobs_fault.find("exception")
     msg_el = pyobs_fault.find("message")
-    exc_name = exc_el.text if exc_el is not None else "RemoteError"
-    msg = msg_el.text if msg_el is not None else ""
+    exc_name = (exc_el.text if exc_el is not None else None) or "RemoteError"
+    msg = (msg_el.text if msg_el is not None else None) or ""
     return exc_name, msg
 
 
@@ -201,7 +201,7 @@ class RPC:
             if hasattr(method, "timeout"):
                 timeout = await getattr(method, "timeout")(self._handler, **ba.arguments)
                 if timeout:
-                    response = self._client.plugin["xep_0009_timeout"].make_iq_method_timeout(
+                    response = self._client.plugin["xep_0009_timeout"].make_iq_method_timeout(  # type: ignore[typeddict-item]
                         iq["id"], iq["from"], int(timeout)
                     )
                     response.send()
@@ -272,7 +272,7 @@ class RPC:
         if issubclass(exception_class, exc.RemoteError):
             exception = exception_class(message=msg, module=sender)
         else:
-            exception = exception_class(message=msg)
+            exception = exception_class(msg)
 
         if not future.done():
             future.set_exception(exc.InvocationError(module=sender, exception=exception))

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/comm/xmpp/serializer.py

@@ -174,10 +174,10 @@ def xml_to_value(elem: ET.Element, type_hint: Any) -> Any:
         return elem.text == "true"
 
     if tag == "int":
-        return int(elem.text)
+        return int(elem.text) if elem.text is not None else 0
 
     if tag == "double":
-        return float(elem.text)
+        return float(elem.text) if elem.text is not None else 0.0
 
     if tag == "string":
         text = elem.text or ""

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/comm/xmpp/xep_0009/binding.py

@@ -42,7 +42,7 @@ def py2xml(*args: Any) -> ET.Element:
     return params
 
 
-def _py2xml(*args: Any) -> ET.Element:
+def _py2xml(*args: Any) -> ET.Element:  # type: ignore[return]
     for x in args:
         val = ET.Element(f"{{{_namespace}}}value")
         if x is None:
@@ -100,7 +100,7 @@ def xml2py(params: ET.Element) -> list[Any]:
     return vals
 
 
-def _xml2py(value: ET) -> Any:
+def _xml2py(value: Any) -> Any:
     namespace = "jabber:iq:rpc"
     find_value = value.find
     if find_value(f"{{{namespace}}}nil") is not None:

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/comm/xmpp/xmppcomm.py

@@ -185,6 +185,7 @@ class XmppComm(Comm):
         self._state_node_handlers: dict[str, tuple[type[Interface], list[Callable[[Any], None]]]] = {}
         self._client_states: dict[str, tuple[ModuleState, str]] = {}  # jid -> (state, error_string)
         self._capabilities: dict[type, Any] = {}  # interface → Capabilities instance
+        self._own_states: dict[type, Any] = {}  # interface → last published state for this module
         self._presence_callbacks: dict[str, list[Callable[[ModuleState, str], None]]] = {}
 
     def _set_module(self, module: Module) -> None:
@@ -273,7 +274,7 @@ class XmppComm(Comm):
 
         # connect
         await self._xmpp.connect(host=server, port=port)
-        self._xmpp.init_plugins()  # type: ignore
+        self._xmpp.init_plugins()
 
         # wait for connected
         if not await self._xmpp.wait_connect():
@@ -657,7 +658,7 @@ class XmppComm(Comm):
                     interface, callbacks = self._state_node_handlers[node]
                     item_xml = items_xml.find(f"{{{pubsub_ns}}}item")
                     payload = list(item_xml)[0] if item_xml is not None and len(item_xml) > 0 else None
-                    if payload is not None:
+                    if payload is not None and interface.state is not None:
                         state_obj = _xml_to_dataclass(payload, interface.state)
                         for callback in callbacks:
                             callback(state_obj)
@@ -727,7 +728,7 @@ class XmppComm(Comm):
                 await asyncio.sleep(self._safe_send_wait)
 
         # never should reach this
-        raise slixmpp.exceptions.IqTimeout(iq)  # type: ignore
+        raise slixmpp.exceptions.IqTimeout(iq)
 
     def cast_to_simple_pre(self, value: Any, annotation: Any | None = None) -> tuple[bool, Any]:
         """Special treatment of single parameters when converting them to be sent via Comm.
@@ -785,13 +786,17 @@ class XmppComm(Comm):
             items_xml = pubsub_xml.find(f"{{{pubsub_ns}}}items") if pubsub_xml is not None else None
             item_xml = items_xml.find(f"{{{pubsub_ns}}}item") if items_xml is not None else None
             payload = list(item_xml)[0] if item_xml is not None and len(item_xml) > 0 else None
-            if payload is not None:
+            if payload is not None and interface.state is not None:
                 callback(_xml_to_dataclass(payload, interface.state))
         except (slixmpp.exceptions.IqError, slixmpp.exceptions.IqTimeout):
             pass
 
+    def _get_own_state(self, interface: type[Interface]) -> Any:
+        return self._own_states.get(interface)
+
     async def _set_state(self, interface: type[Interface], state: Any) -> None:
-        node = self._state_node(self._module.name, interface)
+        self._own_states[interface] = state
+        node = self._state_node(self._module.name, interface)  # type: ignore[union-attr]
         stanza = StateStanza()
         stanza.xml = _dataclass_to_xml(state, self._state_namespace(interface))
         await self._safe_send(self.client["xep_0060"].publish, self._pubsub_service, node, payload=stanza)
@@ -828,7 +833,7 @@ class XmppComm(Comm):
 
     async def _get_capabilities(self, module: str, interface: type[Interface]) -> Any | None:
         """Fetch and deserialize capabilities for a remote module's interface."""
-        if not hasattr(interface, "Capabilities"):
+        if interface.capabilities is None:
             return None
         # Use full JID (with resource) if we know it — bare JID may not route correctly
         full_jid = next(
@@ -848,7 +853,7 @@ class XmppComm(Comm):
             for elem in child:
                 tag = elem.tag.split("}")[-1]
                 if tag == "capabilities" and f"{{{ns}}}" in elem.tag:
-                    return _xml_to_dataclass(elem, interface.Capabilities)
+                    return _xml_to_dataclass(elem, interface.capabilities)
         return None
 
     async def _set_presence(self, state: ModuleState, error_string: str = "") -> None:
@@ -900,7 +905,7 @@ class XmppComm(Comm):
             items_xml = pubsub_xml.find(f"{{{pubsub_ns}}}items") if pubsub_xml is not None else None
             item_xml = items_xml.find(f"{{{pubsub_ns}}}item") if items_xml is not None else None
             payload = list(item_xml)[0] if item_xml is not None and len(item_xml) > 0 else None
-            if payload is not None and node in self._state_node_handlers:
+            if payload is not None and node in self._state_node_handlers and interface.state is not None:
                 _, callbacks = self._state_node_handlers[node]
                 state_obj = _xml_to_dataclass(payload, interface.state)
                 for cb in callbacks:

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/events/event.py

@@ -52,6 +52,8 @@ class EventFactory:
         # create class
         cls: Event | None = None
         for p in EventFactory.packages:
+            if p is None:
+                continue
             # import package
             parts = p.split(".")
             pkg = __import__(parts[0])

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/image.py

@@ -403,11 +403,13 @@ class Image:
         # import PIL Image
         import PIL.Image
 
-        # copy data
-        data: NDArray[Any] = np.copy(self._data)  # type: ignore
-        if data is None:
+        # check data
+        if self._data is None:
             raise ValueError("No data in image.")
 
+        # copy data
+        data: NDArray[Any] = np.copy(self._data)
+
         # no vmin/vmax?
         if vmin is None or vmax is None:
             flattened = sorted(data.flatten())
@@ -569,7 +571,7 @@ class Image:
     @property
     def meta(self) -> dict[Any, Any]:
         if self._meta is None:
-            self._meta = {}
+            self._meta = {}  # type: ignore[assignment]
         return self._meta
 
     @meta.setter

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/meta/skyoffsets.py

@@ -8,7 +8,7 @@ class SkyOffsets:
         self.coord0 = coord0
         self.coord1 = coord1
 
-    def separation(self, frame: BaseCoordinateFrame = None) -> Angle:
+    def separation(self, frame: BaseCoordinateFrame | None = None) -> Angle:
         """Returns separatation between both coordinates, either in their own or a given frame.
 
         Args:
@@ -22,7 +22,7 @@ class SkyOffsets:
         coord0, coord1 = self._to_frame(frame)
         return coord0.separation(coord1)
 
-    def spherical_offsets(self, frame: BaseCoordinateFrame = None) -> tuple[Angle, Angle]:
+    def spherical_offsets(self, frame: BaseCoordinateFrame | None = None) -> tuple[Angle, Angle]:
         """Calculates spherical offset from first coordinate to second.
 
         Args:
@@ -37,7 +37,7 @@ class SkyOffsets:
         off0, off1 = coord0.spherical_offsets_to(coord1.frame)
         return off0, off1
 
-    def _to_frame(self, frame: BaseCoordinateFrame = None) -> tuple[SkyCoord, SkyCoord]:
+    def _to_frame(self, frame: BaseCoordinateFrame | None = None) -> tuple[SkyCoord, SkyCoord]:
         """
 
         Args:

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/annotation/_pillow.py

@@ -29,7 +29,7 @@ class PillowHelper:
     @staticmethod
     def value(image: Image, value: float | int | str) -> float | int:
         if isinstance(value, str):
-            return image.header[value]  # type: ignore
+            return image.header[value]
         return value
 
     @staticmethod

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/annotation/text.py

@@ -188,7 +188,7 @@ class Text(ImageProcessor):
         x, y = PillowHelper.position(image, self._x, self._y, self._wcs)
         fill = PillowHelper.color(self._fill)
         try:
-            text = self._text.format(**image.header)  # noqa: UP031
+            text = self._text.format(**image.header)  # noqa: UP031  # type: ignore[arg-type]
         except KeyError:
             text = self._text
 

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/detection/daophot.py

@@ -142,7 +142,7 @@ class DaophotSourceDetection(SourceDetection):
         daofind = DAOStarFinder(fwhm=self.fwhm, threshold=self.threshold * std)
 
         loop = asyncio.get_running_loop()
-        return await loop.run_in_executor(None, daofind, data)
+        return await loop.run_in_executor(None, daofind, data)  # type: ignore[arg-type]
 
     async def __call__(self, image: Image) -> Image:
         """Find stars in given image and append catalog.
@@ -164,7 +164,7 @@ class DaophotSourceDetection(SourceDetection):
         _, median, std = sigma_clipped_stats(background_corrected_data, sigma=3.0)
 
         median_corrected_data = background_corrected_data - median
-        sources = await self._find_stars(median_corrected_data, std)
+        sources = await self._find_stars(median_corrected_data, int(std))
 
         sources_catalog = _SourceCatalog.from_table(sources)
         sources_catalog.apply_fits_origin_convention()

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/image/download.py

@@ -37,7 +37,7 @@ class EncodedImageConverter(ImageConverter):
                 # move axis
                 data = np.moveaxis(data, 2, 0)
 
-        image = Image(data=data)  # type: ignore
+        image = Image(data=data)
         image.header["DATE-OBS"] = datetime.now().isoformat()
         image.header["EXPTIME"] = 0
 

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/image/normalize.py

@@ -118,7 +118,7 @@ class Normalize(ImageProcessor):
             return image
 
         output_image = image.copy()
-        output_image.data = ((output_image.data - vmin) / (vmax - vmin) * 255.0).astype(np.uint8)
+        output_image.data = ((output_image.data - vmin) / (vmax - vmin) * 255.0).astype(np.uint8)  # type: ignore[assignment]
 
         return output_image
 

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/misc/catalogcircularmask.py

@@ -142,7 +142,7 @@ class CatalogCircularMask(ImageProcessor):
         if isinstance(self._center[0], str) and isinstance(self._center[1], str):
             return image.header[self._center[0]], image.header[self._center[1]]
         else:
-            return self._center
+            return self._center  # type: ignore[return-value]
 
 
 __all__ = ["CatalogCircularMask"]

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/modules/getfitsheaders.py

@@ -103,7 +103,7 @@ class GetFitsHeaders(ImageProcessor):
         for sender in self._senders:
             # request headers
             async with self.proxy(sender, IFitsHeaderBefore) as proxy:
-                requests.append(asyncio.create_task(proxy.get_fits_header_before(self._namespace)))
+                requests.append(asyncio.create_task(proxy.get_fits_header_before(self._namespace)))  # type: ignore[arg-type]
 
         # copy image
         out = image.copy()

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/offsets/brighteststar.py

@@ -126,7 +126,7 @@ class BrightestStarOffsets(Offsets):
 
     @staticmethod
     def _get_brightest_star_position(catalog: Table) -> tuple[float, float]:
-        brightest_star: Row = max(catalog, key=lambda row: row["flux"])
+        brightest_star: Row = max(catalog, key=lambda row: row["flux"])  # type: ignore[type-var]
         return brightest_star["x"], brightest_star["y"]
 
     @staticmethod

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/offsets/brighteststar_guiding.py

@@ -154,7 +154,7 @@ class BrightestStarGuiding(Offsets):
 
     @staticmethod
     def _get_brightest_star_position(catalog: Table) -> tuple[float, float]:
-        brightest_star: Row = max(catalog, key=lambda row: row["flux"])
+        brightest_star: Row = max(catalog, key=lambda row: row["flux"])  # type: ignore[type-var]
         log.info("Found brightest star at x=%.2f, y=%.2f", brightest_star["x"], brightest_star["y"])
         return brightest_star["x"], brightest_star["y"]
 

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/offsets/spilled_light.py

@@ -79,8 +79,8 @@ class Ring:
         ny, nx = self.data.shape
         x, y = np.arange(0, nx), np.arange(0, ny)
         x_coordinates, y_coordinates = np.meshgrid(x, y)
-        section_mask = (min_angle < self.get_angle_from_position(x_coordinates, y_coordinates)) & (
-            max_angle > self.get_angle_from_position(x_coordinates, y_coordinates)
+        section_mask = (min_angle < self.get_angle_from_position(x_coordinates, y_coordinates)) & (  # type: ignore[call-overload]
+            max_angle > self.get_angle_from_position(x_coordinates, y_coordinates)  # type: ignore[call-overload]
         )
         section = self.data.copy()
         section *= section_mask
@@ -251,8 +251,8 @@ class SpilledLightGuiding(Offsets):
         Offsets.__init__(self, **kwargs)
 
         self._fibers = fibers
-        self._fibre_position: Any[tuple[float, float], None] = None
-        self._inner_radius: Any[float, None] = None
+        self._fibre_position: tuple[float, float] = (0.0, 0.0)
+        self._inner_radius: float = 0.0
         self._radius_ratio = radius_ratio
         self._max_relative_sigma = max_relative_sigma
         self._section_angular_width = section_angular_width
@@ -300,8 +300,9 @@ class SpilledLightGuiding(Offsets):
 
     async def _load_fibre_information(self) -> None:
         async with self.comm.proxy(self._fibers, IMultiFiber) as proxy:
-            self._fibre_position = await proxy.get_pixel_position()
-            self._inner_radius = await proxy.get_radius()
+            fiber_state = proxy.get_state(IMultiFiber)
+            self._fibre_position = (fiber_state.pixel_x, fiber_state.pixel_y) if fiber_state is not None else (0.0, 0.0)
+            self._inner_radius = fiber_state.radius if fiber_state is not None else 0.0
 
     async def _correct_for_binning(self, binning: int) -> None:
         self._fibre_position = (self._fibre_position[0] / binning, self._fibre_position[1] / binning)

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/photometry/_photometry_calculator.py

@@ -1,6 +1,6 @@
 from abc import ABCMeta, abstractmethod
 
-from astropy.table import QTable
+from astropy.table import Table
 
 from pyobs.images import Image
 
@@ -10,7 +10,7 @@ class _PhotometryCalculator(metaclass=ABCMeta):
 
     @property
     @abstractmethod
-    def catalog(self) -> QTable: ...
+    def catalog(self) -> Table | None: ...
 
     @abstractmethod
     def set_data(self, image: Image) -> None: ...

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/images/processors/wcs/solarhelioprojective.py

@@ -115,7 +115,7 @@ class SolarHelioprojective(ImageProcessor):
         Returns:
             Image with new WCS.
         """
-        import sunpy.coordinates  # type: ignore
+        import sunpy.coordinates
 
         obs_time = Time(image.header["DATE-OBS"], scale="utc")
         cdelt = sunpy.coordinates.sun.angular_radius(obs_time).degree / image.header[self._keyword_radius]

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/interfaces/IBinning.py

@@ -15,16 +15,18 @@ class BinningState:
     time: Time = field(default_factory=Time.now)
 
 
+@dataclass
+class BinningCapabilities:
+    binnings: list[BinningState] = field(default_factory=list)
+
+
 class IBinning(Interface, metaclass=ABCMeta):
     """The camera supports binning, to be used together with :class:`~pyobs.interfaces.ICamera`."""
 
     __module__ = "pyobs.interfaces"
 
     state = BinningState
-
-    @dataclass
-    class Capabilities:
-        binnings: list[BinningState] = field(default_factory=list)
+    capabilities = BinningCapabilities
 
     @abstractmethod
     async def set_binning(self, x: int, y: int, **kwargs: Any) -> None:
@@ -40,4 +42,4 @@ class IBinning(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IBinning", "BinningState"]
+__all__ = ["IBinning", "BinningState", "BinningCapabilities"]

{pyobs_core-2.0.0.dev4 → pyobs_core-2.0.0.dev6}/pyobs/interfaces/IConfig.py

@@ -7,16 +7,17 @@ from typing import Any
 from .interface import Interface
 
 
+@dataclass
+class ConfigCapabilities:
+    caps: dict[str, tuple[bool, bool, bool]] = field(default_factory=dict)
+
+
 class IConfig(Interface, metaclass=ABCMeta):
     """The module allows access to some of its configuration options."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class Capabilities:
-        readable: list[str] = field(default_factory=list)
-        writable: list[str] = field(default_factory=list)
-        options: dict[str, list[str]] = field(default_factory=dict)
+    capabilities = ConfigCapabilities
 
     @abstractmethod
     async def get_config_value(self, name: str, **kwargs: Any) -> Any:
@@ -47,4 +48,4 @@ class IConfig(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IConfig"]
+__all__ = ["IConfig", "ConfigCapabilities"]