pyobs-core 2.0.0.dev3__py3-none-any.whl → 2.0.0.dev4__py3-none-any.whl

pyobs/comm/comm.py

@@ -438,19 +438,13 @@ class Comm:
     ) -> None:
         pass
 
-    @staticmethod
-    def _interface_from_state(state_cls: type) -> type:
-        outer_name = state_cls.__qualname__.rsplit(".", 1)[0]
-        return getattr(sys.modules[state_cls.__module__], outer_name)
-
-    async def set_state(self, state: Any) -> None:
+    async def set_state(self, interface: type[Interface], state: Any) -> None:
         """Publish state for this module.
 
         Args:
             interface: Interface type for the state.
             state: State object to publish.
         """
-        interface = Comm._interface_from_state(type(state))
         await self._set_state(interface, state)
 
     async def _set_state(self, interface: type[Interface], state: Any) -> None:

pyobs/comm/xmpp/xmppcomm.py

@@ -658,7 +658,7 @@ class XmppComm(Comm):
                     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:
-                        state_obj = _xml_to_dataclass(payload, interface.State)
+                        state_obj = _xml_to_dataclass(payload, interface.state)
                         for callback in callbacks:
                             callback(state_obj)
         else:
@@ -786,7 +786,7 @@ class XmppComm(Comm):
             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:
-                callback(_xml_to_dataclass(payload, interface.State))
+                callback(_xml_to_dataclass(payload, interface.state))
         except (slixmpp.exceptions.IqError, slixmpp.exceptions.IqTimeout):
             pass
 
@@ -902,7 +902,7 @@ class XmppComm(Comm):
             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:
                 _, callbacks = self._state_node_handlers[node]
-                state_obj = _xml_to_dataclass(payload, interface.State)
+                state_obj = _xml_to_dataclass(payload, interface.state)
                 for cb in callbacks:
                     cb(state_obj)
         except (slixmpp.exceptions.IqError, slixmpp.exceptions.IqTimeout):

pyobs/interfaces/IBinning.py

@@ -8,20 +8,23 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class BinningState:
+    x: int
+    y: int
+    time: Time = field(default_factory=Time.now)
+
+
 class IBinning(Interface, metaclass=ABCMeta):
     """The camera supports binning, to be used together with :class:`~pyobs.interfaces.ICamera`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        x: int
-        y: int
-        time: Time = field(default_factory=Time.now)
+    state = BinningState
 
     @dataclass
     class Capabilities:
-        binnings: list[IBinning.State] = field(default_factory=list)
+        binnings: list[BinningState] = field(default_factory=list)
 
     @abstractmethod
     async def set_binning(self, x: int, y: int, **kwargs: Any) -> None:
@@ -37,4 +40,4 @@ class IBinning(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IBinning"]
+__all__ = ["IBinning", "BinningState"]

pyobs/interfaces/ICooling.py

@@ -9,17 +9,20 @@ from ..utils.time import Time
 from .ITemperatures import ITemperatures
 
 
+@dataclass
+class CoolingState:
+    setpoint: Annotated[float, Unit.CELSIUS] | None
+    power: Annotated[int, Unit.PERCENT] | None
+    enabled: bool
+    time: Time = field(default_factory=Time.now)
+
+
 class ICooling(ITemperatures, metaclass=ABCMeta):
     """The module can control the cooling of a device."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        setpoint: Annotated[float, Unit.CELSIUS] | None
-        power: Annotated[int, Unit.PERCENT] | None
-        enabled: bool
-        time: Time = field(default_factory=Time.now)
+    state = CoolingState
 
     @abstractmethod
     async def set_cooling(self, enabled: bool, setpoint: Annotated[float, Unit.CELSIUS], **kwargs: Any) -> None:
@@ -35,4 +38,4 @@ class ICooling(ITemperatures, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["ICooling"]
+__all__ = ["ICooling", "CoolingState"]

pyobs/interfaces/IExposure.py

@@ -10,17 +10,20 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class ExposureState:
+    status: ExposureStatus
+    progress: Annotated[float, Unit.PERCENT]
+    exposure_time_left: Annotated[float, Unit.SECONDS] = 0.0
+    time: Time = field(default_factory=Time.now)
+
+
 class IExposure(Interface, metaclass=ABCMeta):
     """The module controls a camera."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        status: ExposureStatus
-        progress: Annotated[float, Unit.PERCENT]
-        exposure_time_left: Annotated[float, Unit.SECONDS] = 0.0
-        time: Time = field(default_factory=Time.now)
+    state = ExposureState
 
 
-__all__ = ["IExposure"]
+__all__ = ["IExposure", "ExposureState"]

pyobs/interfaces/IExposureTime.py

@@ -9,15 +9,18 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class ExposureTimeState:
+    exposure_time: Annotated[float, Unit.SECONDS]
+    time: Time = field(default_factory=Time.now)
+
+
 class IExposureTime(Interface, metaclass=ABCMeta):
     """The camera supports exposure times, to be used together with :class:`~pyobs.interfaces.ICamera`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        exposure_time: Annotated[float, Unit.SECONDS]
-        time: Time = field(default_factory=Time.now)
+    state = ExposureTimeState
 
     @abstractmethod
     async def set_exposure_time(self, exposure_time: Annotated[float, Unit.SECONDS], **kwargs: Any) -> None:
@@ -32,4 +35,4 @@ class IExposureTime(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IExposureTime"]
+__all__ = ["IExposureTime", "ExposureTimeState"]

pyobs/interfaces/IFilters.py

@@ -8,15 +8,18 @@ from ..utils.time import Time
 from .IMotion import IMotion
 
 
+@dataclass
+class FilterState:
+    filter: str
+    time: Time = field(default_factory=Time.now)
+
+
 class IFilters(IMotion, metaclass=ABCMeta):
     """The module can change filters in a device."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        filter: str
-        time: Time = field(default_factory=Time.now)
+    state = FilterState
 
     @dataclass
     class Capabilities:
@@ -36,4 +39,4 @@ class IFilters(IMotion, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IFilters"]
+__all__ = ["IFilters", "FilterState"]

pyobs/interfaces/IFocuser.py

@@ -8,16 +8,19 @@ from ..utils.time import Time
 from .IMotion import IMotion
 
 
+@dataclass
+class FocuserState:
+    focus: float
+    focus_offset: float
+    time: Time = field(default_factory=Time.now)
+
+
 class IFocuser(IMotion, metaclass=ABCMeta):
     """The module is a focusing device."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        focus: float
-        focus_offset: float
-        time: Time = field(default_factory=Time.now)
+    state = FocuserState
 
     @abstractmethod
     async def set_focus(self, focus: float, **kwargs: Any) -> None:
@@ -46,4 +49,4 @@ class IFocuser(IMotion, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IFocuser"]
+__all__ = ["IFocuser", "FocuserState"]

pyobs/interfaces/IGain.py

@@ -8,16 +8,19 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class GainState:
+    gain: float
+    offset: float
+    time: Time = field(default_factory=Time.now)
+
+
 class IGain(Interface, metaclass=ABCMeta):
     """The camera supports setting of gain, to be used together with :class:`~pyobs.interfaces.ICamera`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        gain: float
-        offset: float
-        time: Time = field(default_factory=Time.now)
+    state = GainState
 
     @abstractmethod
     async def set_gain(self, gain: float, **kwargs: Any) -> None:
@@ -44,4 +47,4 @@ class IGain(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IGain"]
+__all__ = ["IGain", "GainState"]

pyobs/interfaces/IImageFormat.py

@@ -10,15 +10,18 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class ImageFormatState:
+    image_format: ImageFormat
+    time: Time = field(default_factory=Time.now)
+
+
 class IImageFormat(Interface, metaclass=ABCMeta):
     """The module supports different image formats (e.g. INT16, FLOAT32), mainly used by cameras."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        image_format: ImageFormat
-        time: Time = field(default_factory=Time.now)
+    state = ImageFormatState
 
     @dataclass
     class Capabilities:
@@ -37,4 +40,4 @@ class IImageFormat(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IImageFormat"]
+__all__ = ["IImageFormat", "ImageFormatState"]

pyobs/interfaces/IImageType.py

@@ -10,15 +10,18 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class ImageTypeState:
+    image_type: ImageType
+    time: Time = field(default_factory=Time.now)
+
+
 class IImageType(Interface, metaclass=ABCMeta):
     """The module supports different image types (e.g. object, bias, dark, etc), mainly used by cameras."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        image_type: ImageType
-        time: Time = field(default_factory=Time.now)
+    state = ImageTypeState
 
     @abstractmethod
     async def set_image_type(self, image_type: ImageType, **kwargs: Any) -> None:
@@ -30,4 +33,4 @@ class IImageType(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IImageType"]
+__all__ = ["IImageType", "ImageTypeState"]

pyobs/interfaces/IMode.py

@@ -8,20 +8,23 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class ModeState:
+    modes: dict[str, str] = field(default_factory=dict)  # group -> current mode
+    time: Time = field(default_factory=Time.now)
+
+
 class IMode(Interface, metaclass=ABCMeta):
     """The module can change modes in a device."""
 
     __module__ = "pyobs.interfaces"
 
+    state = ModeState
+
     @dataclass
     class Capabilities:
         modes: dict[str, list[str]] = field(default_factory=dict)  # group -> list of modes
 
-    @dataclass
-    class State:
-        modes: dict[str, str] = field(default_factory=dict)  # group -> current mode
-        time: Time = field(default_factory=Time.now)
-
     @abstractmethod
     async def set_mode(self, mode: str, group: int = 0, **kwargs: Any) -> None:
         """Set the current mode.
@@ -37,4 +40,4 @@ class IMode(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IMode"]
+__all__ = ["IMode", "ModeState"]

pyobs/interfaces/IMotion.py

@@ -10,21 +10,25 @@ from ..utils.time import Time
 from .IReady import IReady
 
 
+@dataclass
+class DeviceMotionStatus:
+    name: str
+    status: MotionStatus
+
+
+@dataclass
+class MotionState:
+    status: MotionStatus
+    devices: list[DeviceMotionStatus] = field(default_factory=list)
+    time: Time = field(default_factory=Time.now)
+
+
 class IMotion(IReady, metaclass=ABCMeta):
     """The module controls a device that can move."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class DeviceMotionStatus:
-        name: str
-        status: MotionStatus
-
-    @dataclass
-    class State:
-        status: MotionStatus
-        devices: list[IMotion.DeviceMotionStatus] = field(default_factory=list)
-        time: Time = field(default_factory=Time.now)
+    state = MotionState
 
     @abstractmethod
     async def init(self, **kwargs: Any) -> None:
@@ -54,4 +58,4 @@ class IMotion(IReady, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IMotion"]
+__all__ = ["IMotion", "DeviceMotionStatus", "MotionState"]

pyobs/interfaces/IMultiFiber.py

@@ -8,25 +8,28 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class MultiFiberState:
+    fiber: str = ""
+    pixel_x: float = 0.0
+    pixel_y: float = 0.0
+    radius: float = 0.0
+    time: Time = field(default_factory=Time.now)
+
+
 class IMultiFiber(Interface, metaclass=ABCMeta):
     """An interface for multi-fiber setups that helps to set/get a fiber and retrieve position and size of the
     current fiber on the acquisition/guiding image."""
 
     __module__ = "pyobs.interfaces"
 
+    state = MultiFiberState
+
     @dataclass
     class Capabilities:
         fiber_count: int = 0
         fiber_names: list[str] = field(default_factory=list)
 
-    @dataclass
-    class State:
-        fiber: str = ""
-        pixel_x: float = 0.0
-        pixel_y: float = 0.0
-        radius: float = 0.0
-        time: Time = field(default_factory=Time.now)
-
     @abstractmethod
     async def abort(self, **kwargs: Any) -> None:
         """Abort current actions."""
@@ -42,4 +45,4 @@ class IMultiFiber(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IMultiFiber"]
+__all__ = ["IMultiFiber", "MultiFiberState"]

pyobs/interfaces/IOffsetsAltAz.py

@@ -9,17 +9,20 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class AltAzOffsetState:
+    alt: Annotated[float, Unit.DEGREES]
+    az: Annotated[float, Unit.DEGREES]
+    time: Time = field(default_factory=Time.now)
+
+
 class IOffsetsAltAz(Interface, metaclass=ABCMeta):
     """The module supports Alt/Az offsets, usually combined with :class:`~pyobs.interfaces.ITelescope` and
     :class:`~pyobs.interfaces.IPointingAltAz`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        alt: Annotated[float, Unit.DEGREES]
-        az: Annotated[float, Unit.DEGREES]
-        time: Time = field(default_factory=Time.now)
+    state = AltAzOffsetState
 
     @abstractmethod
     async def set_offsets_altaz(
@@ -37,4 +40,4 @@ class IOffsetsAltAz(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IOffsetsAltAz"]
+__all__ = ["IOffsetsAltAz", "AltAzOffsetState"]

pyobs/interfaces/IOffsetsRaDec.py

@@ -9,17 +9,20 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class RaDecOffsetState:
+    ra: Annotated[float, Unit.DEGREES]
+    dec: Annotated[float, Unit.DEGREES]
+    time: Time = field(default_factory=Time.now)
+
+
 class IOffsetsRaDec(Interface, metaclass=ABCMeta):
     """The module supports RA/Dec offsets, usually combined with :class:`~pyobs.interfaces.ITelescope` and
     :class:`~pyobs.interfaces.IPointingRaDec`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        ra: Annotated[float, Unit.DEGREES]
-        dec: Annotated[float, Unit.DEGREES]
-        time: Time = field(default_factory=Time.now)
+    state = RaDecOffsetState
 
     @abstractmethod
     async def set_offsets_radec(
@@ -37,4 +40,4 @@ class IOffsetsRaDec(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IOffsetsRaDec"]
+__all__ = ["IOffsetsRaDec", "RaDecOffsetState"]

pyobs/interfaces/IPointingAltAz.py

@@ -9,16 +9,19 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class AltAzState:
+    alt: Annotated[float, Unit.DEGREES]
+    az: Annotated[float, Unit.DEGREES]
+    time: Time = field(default_factory=Time.now)
+
+
 class IPointingAltAz(Interface, metaclass=ABCMeta):
     """The module can move to Alt/Az coordinates, usually combined with :class:`~pyobs.interfaces.ITelescope`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        alt: Annotated[float, Unit.DEGREES]
-        az: Annotated[float, Unit.DEGREES]
-        time: Time = field(default_factory=Time.now)
+    state = AltAzState
 
     @abstractmethod
     async def move_altaz(
@@ -36,4 +39,4 @@ class IPointingAltAz(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IPointingAltAz"]
+__all__ = ["IPointingAltAz", "AltAzState"]

pyobs/interfaces/IPointingHGS.py

@@ -9,16 +9,19 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class HGSState:
+    lon: Annotated[float, Unit.DEGREES]
+    lat: Annotated[float, Unit.DEGREES]
+    time: Time = field(default_factory=Time.now)
+
+
 class IPointingHGS(Interface, metaclass=ABCMeta):
     """The module can move to Mu/Psi coordinates, usually combined with :class:`~pyobs.interfaces.ITelescope`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        lon: Annotated[float, Unit.DEGREES]
-        lat: Annotated[float, Unit.DEGREES]
-        time: Time = field(default_factory=Time.now)
+    state = HGSState
 
     @abstractmethod
     async def move_hgs_lon_lat(
@@ -36,4 +39,4 @@ class IPointingHGS(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IPointingHGS"]
+__all__ = ["IPointingHGS", "HGSState"]

pyobs/interfaces/IPointingHelioprojective.py

@@ -9,16 +9,19 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class HelioprojectiveState:
+    theta_x: Annotated[float, Unit.DEGREES]
+    theta_y: Annotated[float, Unit.DEGREES]
+    time: Time = field(default_factory=Time.now)
+
+
 class IPointingHelioprojective(Interface, metaclass=ABCMeta):
     """The module can move to Mu/Psi coordinates, usually combined with :class:`~pyobs.interfaces.ITelescope`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        theta_x: Annotated[float, Unit.DEGREES]
-        theta_y: Annotated[float, Unit.DEGREES]
-        time: Time = field(default_factory=Time.now)
+    state = HelioprojectiveState
 
     @abstractmethod
     async def move_helioprojective(
@@ -36,4 +39,4 @@ class IPointingHelioprojective(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IPointingHelioprojective"]
+__all__ = ["IPointingHelioprojective", "HelioprojectiveState"]

pyobs/interfaces/IPointingRaDec.py

@@ -9,16 +9,19 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class RaDecState:
+    ra: Annotated[float, Unit.DEGREES]
+    dec: Annotated[float, Unit.DEGREES]
+    time: Time = field(default_factory=Time.now)
+
+
 class IPointingRaDec(Interface, metaclass=ABCMeta):
     """The module can move to RA/Dec coordinates, usually combined with :class:`~pyobs.interfaces.ITelescope`."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        ra: Annotated[float, Unit.DEGREES]
-        dec: Annotated[float, Unit.DEGREES]
-        time: Time = field(default_factory=Time.now)
+    state = RaDecState
 
     @abstractmethod
     async def move_radec(
@@ -36,4 +39,4 @@ class IPointingRaDec(Interface, metaclass=ABCMeta):
         ...
 
 
-__all__ = ["IPointingRaDec"]
+__all__ = ["IPointingRaDec", "RaDecState"]

pyobs/interfaces/IReady.py

@@ -7,15 +7,18 @@ from ..utils.time import Time
 from .interface import Interface
 
 
+@dataclass
+class ReadyState:
+    ready: bool
+    time: Time = field(default_factory=Time.now)
+
+
 class IReady(Interface, metaclass=ABCMeta):
     """The module can be in a "not ready" state for science and need to be initialized in some way."""
 
     __module__ = "pyobs.interfaces"
 
-    @dataclass
-    class State:
-        ready: bool
-        time: Time = field(default_factory=Time.now)
+    state = ReadyState
 
 
-__all__ = ["IReady"]
+__all__ = ["IReady", "ReadyState"]