pyninaapiio 0.0.15__tar.gz → 0.0.16__tar.gz

{pyninaapiio-0.0.15 → pyninaapiio-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyninaapiio
-Version: 0.0.15
+Version: 0.0.16
 Summary: Python Wrapper for N.I.N.A. Advanced API
 Home-page: https://github.com/mawinkler/pyninaapiio
 Author: Markus Winkler

{pyninaapiio-0.0.15 → pyninaapiio-0.0.16}/pyninaapiio/dataclasses.py

@@ -9,6 +9,7 @@ from typing import Any, Optional, TypedDict
 
 from typeguard import typechecked
 
+from .advanced_api_client.models.dome_info_response_shutter_status import DomeInfoResponseShutterStatus
 from .advanced_api_client.models.fw_info_response_available_filters_item import (
     FWInfoResponseAvailableFiltersItem,
 )
@@ -48,6 +49,7 @@ class ApplicationData:
     def __init__(self, *, data: ApplicationDataModel):
         self.version = data.get("Version")
         self.connected = data.get("Connected")
+        # self.screenshot
 
 
 # #########################################################################
@@ -79,10 +81,10 @@ class CameraDataModel(TypedDict, total=False):
     DefaultOffset: int
     DeviceId: str
     DewHeaterOn: bool
-    ElectronsPerADU: int
+    ElectronsPerADU: int | Any
     ExposureEndTime: str
-    ExposureMax: int
-    ExposureMin: int
+    ExposureMax: int | Any
+    ExposureMin: int | Any
     Gain: int
     GainMax: int
     GainMin: int
@@ -96,17 +98,17 @@ class CameraDataModel(TypedDict, total=False):
     Offset: int
     OffsetMax: int
     OffsetMin: int
-    PixelSize: int
+    PixelSize: int | Any
     ReadoutMode: int | str
     ReadoutModeForNormalImages: int | str
     ReadoutModeForSnapImages: int | str
-    ReadoutModes: str
+    ReadoutModes: list[str]
     SensorType: str
     SubSampleHeight: int
     SubSampleWidth: int
     SubSampleX: int
     SubSampleY: int
-    SupportedActions: str
+    SupportedActions: list[str]
     TargetTemp: float
     Temperature: int
     TemperatureSetPoint: int
@@ -195,6 +197,73 @@ class CameraData:
         self.y_size = data.get("YSize")
 
 
+# #########################################################################
+# Dome
+# #########################################################################
+class DomeDataModel(TypedDict, total=False):
+    Connected: bool
+    Name: str | Unset
+    DisplayName: str | Unset
+    Description: str
+    Altitude: float | str
+    AltitudeDMS: str
+    ApplicationFollowing: bool
+    AtHome: bool
+    AtPark: bool
+    Azimuth: float | str
+    AzimuthDMS: str
+    CanFindHome: bool
+    CanPark: bool
+    CanSetAzimuth: bool
+    CanSetPark: bool
+    CanSetShutter: bool
+    CanSyncAzimuth: bool
+    DeviceId: str
+    DriverCanFollow: bool
+    DriverFollowing: bool
+    DriverInfo: str
+    DriverVersion: str
+    FollowingType: str
+    IsFollowing: bool
+    IsSynchronized: bool
+    ShutterStatus: str  # DomeInfoResponseShutterStatus
+    Slewing: bool
+    SupportedActions: list[Any]
+
+
+@typechecked
+class DomeData:
+    def __init__(self, *, data: DomeDataModel):
+        self.connected = data.get("Connected")
+        self.name = data.get("Name")
+        self.display_name = data.get("DisplayName")
+        self.description = data.get("Description")
+        self.altitude = data.get("Altitude")
+        self.altitude_dms = data.get("AltitudeDMS")
+        self.application_following = data.get("ApplicationFollowing")
+        self.at_home = data.get("AtHome")
+        self.at_park = data.get("AtPark")
+        self.azimuth = data.get("Azimuth")
+        self.azimuth_dms = data.get("AzimuthDMS")
+        self.can_find_home = data.get("CanFindHome")
+        self.can_park = data.get("CanPark")
+        self.can_set_azimuth = data.get("CanSetAzimuth")
+        self.can_set_park = data.get("CanSetPark")
+        self.can_set_shutter = data.get("CanSetShutter")
+        self.can_sync_azimuth = data.get("CanSyncAzimuth")
+        self.device_id = data.get("DeviceId")
+        self.driver_can_follow = data.get("DriverCanFollow")
+        self.driver_following = data.get("DriverFollowing")
+        self.driver_info = data.get("DriverInfo")
+        self.driver_version = data.get("DriverVersion")
+        self.following_type = data.get("FollowingType")
+        self.is_following = data.get("IsFollowing")
+        self.is_synchronized = data.get("IsSynchronized")
+        self.shutter_status = data.get("ShutterStatus")
+        self.slewing = data.get("Slewing")
+        self.supported_actions = data.get("SupportedActions")
+
+
 # #########################################################################
 # FilterWheel
 # #########################################################################
@@ -202,13 +271,13 @@ class FilterWheelDataModel(TypedDict, total=False):
     Connected: bool
     Name: str | Unset
     DisplayName: str | Unset
-    AvailableFilters: list[FWInfoResponseAvailableFiltersItem]
+    AvailableFilters: list[Any]
     Description: str
     DeviceId: str
     DriverInfo: str
     DriverVersion: str
     IsMoving: bool
-    SelectedFilter: FWInfoResponseSelectedFilter
+    SelectedFilter: Any  # FWInfoResponseSelectedFilter
     SupportedActions: list[Any]
 
 
@@ -229,11 +298,11 @@ class FilterWheelData:
 
     @property
     def selected_filter_id(self) -> int:
-        return self.selected_filter.get("Id")
+        return self.selected_filter.get("Id") if self.selected_filter is not None else -1
 
     @property
     def selected_filter_name(self) -> str:
-        return self.selected_filter.get("Name")
+        return self.selected_filter.get("Name") if self.selected_filter is not None else ""
 
 
 # #########################################################################
@@ -293,8 +362,8 @@ class GuiderDataModel(TypedDict, total=False):
     DriverVersion: str
     LastGuideStep: Optional[GuiderInfoResponseLastGuideStep]
     PixelScale: float
-    RMSError: GuiderInfoResponseRMSError
-    State: GuiderInfoResponseState
+    RMSError: Any  # GuiderInfoResponseRMSError
+    State: Any  # GuiderInfoResponseState
     SupportedActions: list[Any]
 
 
@@ -319,31 +388,31 @@ class GuiderData:
 
     @property
     def last_guide_step_ra(self) -> float:
-        return self.last_guide_step.get("RADistanceRaw")
+        return self.last_guide_step.get("RADistanceRaw") if self.last_guide_step is not None else 0
 
     @property
     def last_guide_step_dec(self) -> float:
-        return self.last_guide_step.get("DECDistanceRaw")
+        return self.last_guide_step.get("DECDistanceRaw") if self.last_guide_step is not None else 0
 
     @property
     def rms_error_ra_arcsec(self) -> float:
-        return self.rms_error.get("RA").get("Arcseconds")
+        return self.rms_error.get("RA").get("Arcseconds") if self.rms_error is not None else 0
 
     @property
     def rms_error_ra_peak_arcsec(self) -> float:
-        return self.rms_error.get("PeakRA").get("Arcseconds")
+        return self.rms_error.get("PeakRA").get("Arcseconds") if self.rms_error is not None else 0
 
     @property
     def rms_error_dec_arcsec(self) -> float:
-        return self.rms_error.get("Dec").get("Arcseconds")
+        return self.rms_error.get("Dec").get("Arcseconds") if self.rms_error is not None else 0
 
     @property
     def rms_error_dec_peak_arcsec(self) -> float:
-        return self.rms_error.get("PeakDec").get("Arcseconds")
+        return self.rms_error.get("PeakDec").get("Arcseconds") if self.rms_error is not None else 0
 
     @property
     def rms_error_total_arcsec(self) -> float:
-        return self.rms_error.get("Total").get("Arcseconds")
+        return self.rms_error.get("Total").get("Arcseconds") if self.rms_error is not None else 0
 
 
 # #########################################################################
@@ -564,19 +633,119 @@ class MountData:
 
     @property
     def coordinates_ra(self) -> float:
-        return round(self.coordinates.get("RA"), 3) if self.coordinates.get("RA") is not None else None
+        return (
+            round(self.coordinates.get("RA"), 3)
+            if self.coordinates is not None and self.coordinates.get("RA") is not None
+            else 0
+        )
 
     @property
     def coordinates_ra_str(self) -> str:
-        return self.coordinates.get("RAString")
+        return (
+            self.coordinates.get("RAString")
+            if self.coordinates is not None and self.coordinates.get("RAString") is not None
+            else ""
+        )
 
     @property
     def coordinates_dec(self) -> float:
-        return round(self.coordinates.get("Dec"), 3) if self.coordinates.get("Dec") is not None else None
+        return (
+            round(self.coordinates.get("Dec"), 3)
+            if self.coordinates is not None and self.coordinates.get("Dec") is not None
+            else 0
+        )
 
     @property
     def coordinates_dec_str(self) -> str:
-        return self.coordinates.get("DecString")
+        return (
+            self.coordinates.get("DecString")
+            if self.coordinates is not None and self.coordinates.get("DecString") is not None
+            else ""
+        )
+
+
+# #########################################################################
+# Rotator
+# #########################################################################
+class RotatorDataModel(TypedDict, total=False):
+    # device_list_response_item
+
+    Connected: bool
+    Name: str
+    DisplayName: str
+    Description: str
+
+    CanReverse: bool
+    Reverse: bool
+    MechanicalPosition: int
+    Position: int
+    StepSize: float
+    IsMoving: bool
+    Synced: bool
+    SupportedActions: list[Any]
+    DriverInfo: str
+    DriverVersion: str
+    DeviceId: str
+    AdditionalProperties: dict[str, Any]
+
+
+@typechecked
+class RotatorData:
+    """A representation of the geographic location."""
+
+    def __init__(self, *, data: RotatorDataModel):
+        self.connected = data.get("Connected")
+        self.name = data.get("Name")
+        self.display_name = data.get("DisplayName")
+        self.description = data.get("Description")
+
+        self.can_reverse = data.get("CanReverse")
+        self.reverse = data.get("Reverse")
+        self.mechanical_position = data.get("MechanicalPosition")
+        self.position = data.get("Position")
+        self.step_size = data.get("StepSize")
+        self.is_moving = data.get("IsMoving")
+        self.synced = data.get("Synced")
+        self.supported_actions = data.get("SupportedActions")
+        self.driver_info = data.get("DriverInfo")
+        self.driver_version = data.get("DriverVersion")
+        self.device_id = data.get("DeviceId")
+        self.additional_properties = data.get("Name")
+
+
+# #########################################################################
+# SafetyMonitor
+# #########################################################################
+class SafetyMonitorDataModel(TypedDict, total=False):
+    # device_list_response_item
+
+    Connected: bool
+    Name: str
+    DisplayName: str
+    Description: str
+    DriverInfo: str
+    DriverVersion: str
+    DeviceId: str
+
+    IsSafe: bool
+    SupportedActions: list[Any]
+
+
+@typechecked
+class SafetyMonitorData:
+    """A representation of the geographic location."""
+
+    def __init__(self, *, data: SafetyMonitorDataModel):
+        self.connected = data.get("Connected")
+        self.name = data.get("Name")
+        self.display_name = data.get("DisplayName")
+        self.description = data.get("Description")
+
+        self.is_safe = data.get("IsSafe")
+        self.supported_actions = data.get("SupportedActions")
+        self.driver_info = data.get("DriverInfo")
+        self.driver_version = data.get("DriverVersion")
+        self.device_id = data.get("DeviceId")
 
 
 # #########################################################################
@@ -642,6 +811,66 @@ class SwitchData:
         self.writable_switches = data.get("WritableSwitches")
 
 
+# #########################################################################
+# Weather
+# #########################################################################
+class WeatherDataModel(TypedDict, total=False):
+    # device_list_response_item
+
+    Connected: bool
+    Name: str
+    DisplayName: str
+    Description: str
+
+    AveragePeriod: int
+    CloudCover: int
+    DewPoint: float
+    Humidity: int
+    Pressure: float
+    RainRate: float
+    SkyBrightness: str
+    SkyQuality: str
+    SkyTemperature: str
+    StarFWHM: str
+    Temperature: float
+    WindDirection: int
+    WindGust: float
+    WindSpeed: float
+    SupportedActions: list[str]
+    DriverInfo: str
+    DriverVersion: str
+    DeviceId: str
+
+
+@typechecked
+class WeatherData:
+    """A representation of the geographic location."""
+
+    def __init__(self, *, data: WeatherDataModel):
+        self.connected = data.get("Connected")
+        self.name = data.get("Name")
+        self.display_name = data.get("DisplayName")
+        self.description = data.get("Description")
+        self.average_period = data.get("AveragePeriod")
+        self.cloud_cover = data.get("CloudCover")
+        self.dew_point = round(data.get("DewPoint"), 1) if data.get("DewPoint") is not None else None
+        self.humidity = data.get("Humidity")
+        self.pressure = round(data.get("Pressure"), 1) if data.get("Pressure") is not None else None
+        self.rain_rate = round(data.get("RainRate"), 1) if data.get("RainRate") is not None else None
+        self.sky_brightness = data.get("SkyBrightness")
+        self.sky_quality = data.get("SkyQuality")
+        self.sky_temperature = data.get("SkyTemperature")
+        self.star_fwhm = data.get("StarFWHM")
+        self.temperature = round(data.get("Temperature"), 1) if data.get("Temperature") is not None else None
+        self.wind_direction = data.get("WindDirection")
+        self.wind_gust = round(data.get("WindGust"), 1) if data.get("WindGust") is not None else None
+        self.wind_speed = round(data.get("WindSpeed"), 1) if data.get("WindSpeed") is not None else None
+        self.supported_actions = data.get("SupportedActions")
+        self.driver_info = data.get("DriverInfo")
+        self.driver_version = data.get("DriverVersion")
+        self.device_id = data.get("DeviceId")
+
+
 # #########################################################################
 # N.I.N.A. Devices
 # #########################################################################
@@ -651,7 +880,7 @@ class NinaDevicesDataModel(TypedDict, total=False):
     Connected: bool
     Application: Optional[ApplicationData]
     Camera: Optional[CameraData]
-    # Dome: Optional[DomeData]
+    Dome: Optional[DomeData]
     FilterWheel: Optional[FilterWheelData]
     # FlatPanel: Optional[FlatPanelData]
     Focuser: Optional[FocuserData]
@@ -659,10 +888,11 @@ class NinaDevicesDataModel(TypedDict, total=False):
     Image: Optional[ImageData]
     Mount: Optional[MountData]
     # Profile: Optional[ProfileData]
-    # Rotator: Optional[RotatorData]
-    # SafetyMonitor: Optional[SafetyMonitorData]
+    Rotator: Optional[RotatorData]
+    SafetyMonitor: Optional[SafetyMonitorData]
     # Sequence: Optional[SequenceData]
     Switch: Optional[SwitchData]
+    Weather: Optional[WeatherData]
 
 
 @typechecked
@@ -673,9 +903,13 @@ class NinaDevicesData:
         self.connected = data.get("Connected")
         self.application = data.get("Application")
         self.camera = data.get("Camera")
+        self.dome = data.get("Dome")
         self.filterwheel = data.get("FilterWheel")
         self.focuser = data.get("Focuser")
         self.guider = data.get("Guider")
         self.image = data.get("Image")
         self.mount = data.get("Mount")
+        self.rotator = data.get("Rotator")
+        self.safety_monitor = data.get("SafetyMonitor")
         self.switch = data.get("Switch")
+        self.weather = data.get("Weather")

{pyninaapiio-0.0.15 → pyninaapiio-0.0.16}/pyninaapiio/nina.py

@@ -9,12 +9,16 @@ from typeguard import TypeCheckError
 
 from .advanced_api_client.api.application import get_version
 from .advanced_api_client.api.camera import get_equipment_camera_info
+from .advanced_api_client.api.dome import get_equipment_dome_info
 from .advanced_api_client.api.filter_wheel import get_equipment_filterwheel_info
 from .advanced_api_client.api.focuser import get_equipment_focuser_info
 from .advanced_api_client.api.guider import get_equipment_guider_info
 from .advanced_api_client.api.image import get_image_history, get_image_index
 from .advanced_api_client.api.mount import get_equipment_mount_info, get_equipment_mount_list_devices
+from .advanced_api_client.api.rotator import get_equipment_rotator_info
+from .advanced_api_client.api.safety_monitor import get_equipment_safetymonitor_info
 from .advanced_api_client.api.switch import get_equipment_switch_info
+from .advanced_api_client.api.weather import get_equipment_weather_info
 from .advanced_api_client.client import Client
 from .advanced_api_client.models.camera_info import CameraInfo
 from .advanced_api_client.models.device_list import DeviceList
@@ -26,13 +30,18 @@ from .advanced_api_client.models.get_image_index_response_200 import GetImageInd
 from .advanced_api_client.models.get_version_response_200 import GetVersionResponse200
 from .advanced_api_client.models.guider_info import GuiderInfo
 from .advanced_api_client.models.mount_info import MountInfo
+from .advanced_api_client.models.rotator_info import RotatorInfo
+from .advanced_api_client.models.safety_monitor_info import SafetyMonitorInfo
 from .advanced_api_client.models.switch_info import SwitchInfo
+from .advanced_api_client.models.weather_info import WeatherInfo
 from .advanced_api_client.types import Response
 from .dataclasses import (
     ApplicationData,
     ApplicationDataModel,
     CameraData,
     CameraDataModel,
+    DomeData,
+    DomeDataModel,
     FilterWheelData,
     FilterWheelDataModel,
     FocuserData,
@@ -45,8 +54,14 @@ from .dataclasses import (
     MountDataModel,
     NinaDevicesData,
     NinaDevicesDataModel,
+    RotatorData,
+    RotatorDataModel,
+    SafetyMonitorData,
+    SafetyMonitorDataModel,
     SwitchData,
     SwitchDataModel,
+    WeatherData,
+    WeatherDataModel,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -69,24 +84,32 @@ class NinaAPI:
         base_url="http://192.168.1.234:1888/v2/api",
         application_enabled=False,
         camera_enabled=False,
+        dome_enabled=False,
         filterwheel_enabled=False,
         focuser_enabled=False,
         guider_enabled=False,
         image_enabled=False,
         mount_enabled=False,
+        rotator_enabled=False,
+        safety_monitor_enabled=False,
         switch_enabled=False,
+        weather_enabled=False,
         api_timeout=DEFAULT_API_TIMEOUT,
     ):
         self._session = session
         self._client = Client(base_url=base_url, timeout=api_timeout, verify_ssl=False)
         self._application_enabled = application_enabled
         self._camera_enabled = camera_enabled
+        self._dome_enabled = dome_enabled
         self._filterwheel_enabled = filterwheel_enabled
         self._focuser_enabled = focuser_enabled
         self._guider_enabled = guider_enabled
         self._image_enabled = image_enabled
         self._mount_enabled = mount_enabled
+        self._rotator_enabled = rotator_enabled
+        self._safety_monitor_enabled = safety_monitor_enabled
         self._switch_enabled = switch_enabled
+        self._weather_enabled = weather_enabled
 
         # Save last capture
         self._image_index_latest = -1
@@ -127,7 +150,7 @@ class NinaAPI:
             _LOGGER.debug("Retrieve info: Camera")
             _camera_info: Response[CameraInfo] = await get_equipment_camera_info.asyncio(client=self._client)
             _camera_info_data = CameraDataModel(_camera_info.response.to_dict())
-
+            print(_camera_info_data)
             return CameraData(data=_camera_info_data)
 
         except ConnectError as ce:
@@ -143,6 +166,30 @@ class NinaAPI:
             _LOGGER.debug("Camera not connected.")
             return CameraData(data={"Connected": False})
 
+    # #########################################################################
+    # Dome
+    # #########################################################################
+    async def dome_info(self):
+        try:
+            _LOGGER.debug("Retrieve info: Filterwheel")
+            _dome_info: Response[FWInfo] = await get_equipment_dome_info.asyncio(client=self._client)
+            _dome_info_data = DomeDataModel(_dome_info.response.to_dict())
+
+            return DomeData(data=_dome_info_data)
+
+        except ConnectError as ce:
+            _LOGGER.warning("Astro server not available.")
+            return ApplicationData(data={"Connected": False})
+        except ConnectTimeout as ct:
+            _LOGGER.warning("N.I.N.A. not available.")
+            return None
+        except TypeCheckError as tce:
+            _LOGGER.warning(f"TypeCheckError: {tce}")
+            return None
+        except KeyError as ke:
+            _LOGGER.debug("Dome not connected.")
+            return DomeData(data={"Connected": False})
+
     # #########################################################################
     # FilterWheel
     # #########################################################################
@@ -318,6 +365,56 @@ class NinaAPI:
             _LOGGER.debug("Mount not connected.")
             return MountData(data={"Connected": False})
 
+    # #########################################################################
+    # Rotator
+    # #########################################################################
+    async def rotator_info(self):
+        try:
+            _LOGGER.debug("Retrieve inf: Rotator")
+            _rotator_info: Response[RotatorInfo] = await get_equipment_rotator_info.asyncio(client=self._client)
+            _rotator_info_data = RotatorDataModel(_rotator_info.response.to_dict())
+
+            return RotatorData(data=_rotator_info_data)
+
+        except ConnectError as ce:
+            _LOGGER.warning("Astro server not available.")
+            return ApplicationData(data={"Connected": False})
+        except ConnectTimeout as ct:
+            _LOGGER.warning("N.I.N.A. not available.")
+            return None
+        except TypeCheckError as tce:
+            _LOGGER.warning(f"TypeCheckError: {tce}")
+            return None
+        except KeyError as ke:
+            _LOGGER.debug("Rotator not connected.")
+            return RotatorData(data={"Connected": False})
+
+    # #########################################################################
+    # SafetyMonitor
+    # #########################################################################
+    async def safety_monitor_info(self):
+        try:
+            _LOGGER.debug("Retrieve inf: SafetyMonitor")
+            _safety_monitor_info: Response[SafetyMonitorInfo] = await get_equipment_safetymonitor_info.asyncio(
+                client=self._client
+            )
+            _safety_monitor_info_data = SafetyMonitorDataModel(_safety_monitor_info.response.to_dict())
+
+            return SafetyMonitorData(data=_safety_monitor_info_data)
+
+        except ConnectError as ce:
+            _LOGGER.warning("Astro server not available.")
+            return ApplicationData(data={"Connected": False})
+        except ConnectTimeout as ct:
+            _LOGGER.warning("N.I.N.A. not available.")
+            return None
+        except TypeCheckError as tce:
+            _LOGGER.warning(f"TypeCheckError: {tce}")
+            return None
+        except KeyError as ke:
+            _LOGGER.debug("SafetyMonitor not connected.")
+            return SafetyMonitorData(data={"Connected": False})
+
     # #########################################################################
     # Switch
     # #########################################################################
@@ -342,6 +439,30 @@ class NinaAPI:
             _LOGGER.debug("Switch not connected.")
             return SwitchData(data={"Connected": False})
 
+    # #########################################################################
+    # Weather
+    # #########################################################################
+    async def weather_info(self):
+        try:
+            _LOGGER.debug("Retrieve inf: Weather")
+            _weather_info: Response[WeatherInfo] = await get_equipment_weather_info.asyncio(client=self._client)
+            _weather_info_data = WeatherDataModel(_weather_info.response.to_dict())
+
+            return WeatherData(data=_weather_info_data)
+
+        except ConnectError as ce:
+            _LOGGER.warning("Astro server not available.")
+            return ApplicationData(data={"Connected": False})
+        except ConnectTimeout as ct:
+            _LOGGER.warning("N.I.N.A. not available.")
+            return None
+        except TypeCheckError as tce:
+            _LOGGER.warning(f"TypeCheckError: {tce}")
+            return None
+        except KeyError as ke:
+            _LOGGER.debug("Weather not connected.")
+            return WeatherData(data={"Connected": False})
+
     # #########################################################################
     # N.I.N.A.
     # #########################################################################
@@ -360,12 +481,16 @@ class NinaAPI:
             _nina = {
                 "Application": await self.application_info() if self._application_enabled else None,
                 "Camera": await self.camera_info() if self._camera_enabled else None,
+                "Dome": await self.dome_info() if self._dome_enabled else None,
                 "FilterWheel": await self.filterwheel_info() if self._filterwheel_enabled else None,
                 "Focuser": await self.focuser_info() if self._focuser_enabled else None,
                 "Guider": await self.guider_info() if self._guider_enabled else None,
                 "Image": await self.image_latest() if self._image_enabled else None,
                 "Mount": await self.mount_info() if self._mount_enabled else None,
+                "Rotator": await self.rotator_info() if self._rotator_enabled else None,
+                "SafetyMonitor": await self.safety_monitor_info() if self._safety_monitor_enabled else None,
                 "Switch": await self.switch_info() if self._switch_enabled else None,
+                "Weather": await self.weather_info() if self._weather_enabled else None,
             }
             _nina_info_data = NinaDevicesDataModel(_nina)
 

{pyninaapiio-0.0.15 → pyninaapiio-0.0.16}/pyninaapiio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyninaapiio
-Version: 0.0.15
+Version: 0.0.16
 Summary: Python Wrapper for N.I.N.A. Advanced API
 Home-page: https://github.com/mawinkler/pyninaapiio
 Author: Markus Winkler

{pyninaapiio-0.0.15 → pyninaapiio-0.0.16}/setup.py

@@ -11,7 +11,7 @@ if os.path.isfile(requirement_path):
 setup(
     name="pyninaapiio",
     packages=find_packages(),
-    version="0.0.15",
+    version="0.0.16",
     license="MIT",
     description="Python Wrapper for N.I.N.A. Advanced API",
     long_description=" ".join(