pyninaapiio 0.0.5__tar.gz → 0.0.7__tar.gz

{pyninaapiio-0.0.5 → pyninaapiio-0.0.7}/PKG-INFO

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

{pyninaapiio-0.0.5 → pyninaapiio-0.0.7}/pyninaapiio/dataclasses.py

@@ -8,9 +8,19 @@ from typing import Any, Optional, TypedDict
 
 from typeguard import typechecked
 
+from pyninaapiio.models.fw_info_response_available_filters_item import FWInfoResponseAvailableFiltersItem
+from pyninaapiio.models.fw_info_response_selected_filter import FWInfoResponseSelectedFilter
 from pyninaapiio.models.guider_info_response_last_guide_step import GuiderInfoResponseLastGuideStep
 from pyninaapiio.models.guider_info_response_rms_error import GuiderInfoResponseRMSError
 from pyninaapiio.models.guider_info_response_state import GuiderInfoResponseState
+from pyninaapiio.models.mount_info_response_alignment_mode import MountInfoResponseAlignmentMode
+from pyninaapiio.models.mount_info_response_coordinates import MountInfoResponseCoordinates
+from pyninaapiio.models.mount_info_response_equatorial_system import MountInfoResponseEquatorialSystem
+from pyninaapiio.models.mount_info_response_primary_axis_rates_item import MountInfoResponsePrimaryAxisRatesItem
+from pyninaapiio.models.mount_info_response_secondary_axis_rates_item import MountInfoResponseSecondaryAxisRatesItem
+from pyninaapiio.models.mount_info_response_side_of_pier import MountInfoResponseSideOfPier
+from pyninaapiio.models.mount_info_response_tracking_modes_item import MountInfoResponseTrackingModesItem
+from pyninaapiio.models.mount_info_response_tracking_rate import MountInfoResponseTrackingRate
 
 
 # #########################################################################
@@ -157,6 +167,46 @@ class CameraData:
         self.device_id = data.get("DeviceId")
 
 
+# #########################################################################
+# FilterWheel
+# #########################################################################
+class FilterWheelDataModel(TypedDict, total=False):
+    AvailableFilters: list[FWInfoResponseAvailableFiltersItem]
+    Connected: bool
+    Description: str
+    DeviceId: str
+    DisplayName: str
+    DriverInfo: str
+    DriverVersion: str
+    IsMoving: bool
+    Name: str
+    SelectedFilter: FWInfoResponseSelectedFilter
+    SupportedActions: list[Any]
+
+
+class FilterWheelData:
+    def __init__(self, *, data: FilterWheelDataModel):
+        self.available_filters = data.get("AvailableFilters")
+        self.connected = data.get("Connected")
+        self.description = data.get("Description")
+        self.device_id = data.get("DeviceId")
+        self.display_name = data.get("DisplayName")
+        self.driver_info = data.get("DriverInfo")
+        self.driver_version = data.get("DriverVersion")
+        self.is_moving = data.get("IsMoving")
+        self.name = data.get("Name")
+        self.selected_filter = data.get("SelectedFilter")
+        self.supported_actions = data.get("SupportedActions")
+
+    @property
+    def selected_filter_id(self) -> int:
+        return self.selected_filter.get("Id")
+
+    @property
+    def selected_filter_name(self) -> str:
+        return self.selected_filter.get("Name")
+
+
 # #########################################################################
 # Focuser
 # #########################################################################
@@ -236,6 +286,26 @@ class GuiderData:
         self.last_guide_step = data.get("LastGuideStep")
         self.state = data.get("State")
 
+    @property
+    def rms_error_ra_arcsec(self) -> float:
+        return self.rms_error.get("RA").get("Arcseconds")
+
+    @property
+    def rms_error_ra_peak_arcsec(self) -> float:
+        return self.rms_error.get("PeakRA").get("Arcseconds")
+
+    @property
+    def rms_error_dec_arcsec(self) -> float:
+        return self.rms_error.get("Dec").get("Arcseconds")
+
+    @property
+    def rms_error_dec_peak_arcsec(self) -> float:
+        return self.rms_error.get("PeakDec").get("Arcseconds")
+
+    @property
+    def rms_error_total_arcsec(self) -> float:
+        return self.rms_error.get("Total").get("Arcseconds")
+
 
 # #########################################################################
 # Image
@@ -298,17 +368,56 @@ class DeviceMountData:
         # self.additional_properties = data.get("additional_properties")
 
 
-class MountDataModel(TypedDict):
-    connected: bool
-    name: str
-    display_name: str
-    device_id: str
-    sidereal_time: float
-    right_ascension: float
-    declination: float
-    site_latitude: float
-    site_longitude: float
-    site_elevation: float
+class MountDataModel(TypedDict, total=False):
+    Connected: bool
+    Name: str
+    DisplayName: str
+    AlignmentMode: MountInfoResponseAlignmentMode | Any
+    Altitude: float
+    AltitudeString: str
+    AtHome: bool
+    AtPark: bool
+    Azimuth: float
+    AzimuthString: str
+    CanFindHome: bool
+    CanMovePrimaryAxis: bool
+    CanMoveSecondaryAxis: bool
+    CanPark: bool
+    CanPulseGuide: bool
+    CanSetDeclinationRate: bool
+    CanSetPark: bool
+    CanSetPierSide: bool
+    CanSetRightAscensionRate: bool
+    CanSetTrackingEnabled: bool
+    CanSlew: bool
+    Coordinates: MountInfoResponseCoordinates | Any
+    Declination: float
+    DeclinationString: str
+    DeviceId: str
+    EquatorialSystem: MountInfoResponseEquatorialSystem | Any
+    GuideRateDeclinationArcsecPerSec: int | Any
+    GuideRateRightAscensionArcsecPerSec: int | Any
+    HasUnknownEpoch: bool
+    HoursToMeridianString: str
+    IsPulseGuiding: bool
+    PrimaryAxisRates: MountInfoResponsePrimaryAxisRatesItem | Any
+    RightAscension: float
+    RightAscensionString: str
+    SecondaryAxisRates: MountInfoResponseSecondaryAxisRatesItem | Any
+    SideOfPier: MountInfoResponseSideOfPier | Any
+    SiderealTime: float
+    SiderealTimeString: str
+    SiteElevation: float
+    SiteLatitude: float
+    SiteLongitude: float
+    Slewing: bool
+    SupportedActions: list[str]
+    TimeToMeridianFlip: float
+    TimeToMeridianFlipString: str
+    TrackingEnabled: bool
+    TrackingModes: MountInfoResponseTrackingModesItem | Any
+    TrackingRate: MountInfoResponseTrackingRate | Any
+    UTCDate: str
 
 
 @typechecked
@@ -316,16 +425,72 @@ class MountData:
     """A representation of the geographic location."""
 
     def __init__(self, *, data: MountDataModel):
-        self.connected = data.get("connected")
-        self.name = data.get("name")
-        self.display_name = data.get("display_name")
-        self.device_id = data.get("device_id")
-        self.sidereal_time = data.get("sidereal_time")
-        self.right_ascension = data.get("right_ascension")
-        self.declination = data.get("declination")
-        self.site_latitude = data.get("site_latitude")
-        self.site_longitude = data.get("site_longitude")
-        self.site_elevation = data.get("site_elevation")
+        self.connected = data.get("Connected")
+        self.name = data.get("Name")
+        self.display_name = data.get("DisplayName")
+        self.alignment_mode = data.get("AlignmentMode")
+        self.altitude = data.get("Altitude")
+        self.altitude_string = data.get("AltitudeString")
+        self.at_home = data.get("AtHome")
+        self.at_park = data.get("AtPark")
+        self.azimuth = data.get("Azimuth")
+        self.azimuth_string = data.get("AzimuthString")
+        self.can_find_home = data.get("CanFindHome")
+        self.can_move_primary_axis = data.get("CanMovePrimaryAxis")
+        self.can_move_secondary_axis = data.get("CanMoveSecondaryAxis")
+        self.can_park = data.get("CanPark")
+        self.can_pulse_guide = data.get("CanPulseGuide")
+        self.can_set_declination_rate = data.get("CanSetDeclinationRate")
+        self.can_set_park = data.get("CanSetPark")
+        self.can_set_pier_side = data.get("CanSetPierSide")
+        self.can_set_right_ascension_rate = data.get("CanSetRightAscensionRate")
+        self.can_set_tracking_enabled = data.get("CanSetTrackingEnabled")
+        self.can_slew = data.get("CanSlew")
+        self.coordinates = data.get("Coordinates")
+        self.declination = data.get("Declination")
+        self.declination_string = data.get("DeclinationString")
+        self.device_id = data.get("DeviceId")
+        self.equatorial_system = data.get("EquatorialSystem")
+        self.guide_rate_declination_arcsec_per_sec = data.get("GuideRateDeclinationArcsecPerSec")
+        self.guide_rate_right_ascension_arcsec_per_sec = data.get("GuideRateRightAscensionArcsecPerSec")
+        self.has_unknown_epoch = data.get("HasUnknownEpoch")
+        self.hours_to_meridian_string = data.get("HoursToMeridianString")
+        self.is_pulse_guiding = data.get("IsPulseGuiding")
+        self.primary_axis_rates = data.get("PrimaryAxisRates")
+        self.right_ascension = data.get("RightAscension")
+        self.right_ascension_string = data.get("RightAscensionString")
+        self.secondary_axis_rates = data.get("SecondaryAxisRates")
+        self.side_of_pier = data.get("SideOfPier")
+        self.sidereal_time = data.get("SiderealTime")
+        self.sidereal_time_string = data.get("SiderealTimeString")
+        self.site_elevation = data.get("SiteElevation")
+        self.site_latitude = data.get("SiteLatitude")
+        self.site_longitude = data.get("SiteLongitude")
+        self.slewing = data.get("Slewing")
+        self.supported_actions = data.get("SupportedActions")
+        self.time_to_meridian_flip = data.get("TimeToMeridianFlip")
+        self.time_to_meridian_flip_string = data.get("TimeToMeridianFlipString")
+        self.tracking_enabled = data.get("TrackingEnabled")
+        self.tracking_modes = data.get("TrackingModes")
+        self.tracking_rate = data.get("TrackingRate")
+        self.utc_date = data.get("UTCDate")
+
+    @property
+    def coordinates_ra(self) -> float:
+        print(self.coordinates)
+        return self.coordinates.get("RA")
+
+    @property
+    def coordinates_ra_str(self) -> str:
+        return self.coordinates.get("RAString")
+
+    @property
+    def coordinates_dec(self) -> float:
+        return self.coordinates.get("Dec")
+
+    @property
+    def coordinates_dec_str(self) -> str:
+        return self.coordinates.get("DecString")
 
 
 # #########################################################################
@@ -400,7 +565,7 @@ class NinaDevicesDataModel(TypedDict, total=False):
     # Application: Optional[ApplicationData]
     Camera: Optional[CameraData]
     # Dome: Optional[DomeData]
-    # FilterWheel: Optional[FilterWheelData]
+    FilterWheel: Optional[FilterWheelData]
     # FlatPanel: Optional[FlatPanelData]
     Focuser: Optional[FocuserData]
     Guider: Optional[GuiderData]
@@ -420,6 +585,7 @@ class NinaDevicesData:
     def __init__(self, *, data: NinaDevicesDataModel):
         # self.application = data.get("Application")
         self.camera = data["Camera"]
+        self.filterwheel = data["FilterWheel"]
         self.focuser = data["Focuser"]
         self.guider = data["Guider"]
         self.image = data["Image"]

{pyninaapiio-0.0.5 → pyninaapiio-0.0.7}/pyninaapiio/models/mount_info_response.py

@@ -365,11 +365,11 @@ class MountInfoResponse:
         d = dict(src_dict)
         connected = d.pop("Connected")
 
-        name = d.pop("Name")
+        name = d.pop("Name", UNSET)
 
-        display_name = d.pop("DisplayName")
+        display_name = d.pop("DisplayName", UNSET)
 
-        device_id = d.pop("DeviceId")
+        device_id = d.pop("DeviceId", UNSET)
 
         sidereal_time = d.pop("SiderealTime", UNSET)
 

{pyninaapiio-0.0.5 → pyninaapiio-0.0.7}/pyninaapiio/nina.py

@@ -1,12 +1,11 @@
-# import asyncio
 import base64
-
-# import io
 import logging
 import sys
+import traceback
 from pprint import pprint as pp
 
 from pyninaapiio.api.camera import get_equipment_camera_info
+from pyninaapiio.api.filter_wheel import get_equipment_filterwheel_info
 from pyninaapiio.api.focuser import get_equipment_focuser_info
 from pyninaapiio.api.guider import get_equipment_guider_info
 from pyninaapiio.api.image import get_image_history, get_image_index
@@ -18,35 +17,28 @@ from pyninaapiio.dataclasses import (
     ApplicationDataModel,
     CameraData,
     CameraDataModel,
-    # CameraData,
-    # CameraDataModel,
     DeviceMountData,
     DeviceMountDataModel,
+    FilterWheelData,
+    FilterWheelDataModel,
     FocuserData,
     FocuserDataModel,
     GuiderData,
     GuiderDataModel,
     ImageData,
     ImageDataModel,
-    # DeviceMountListData,
-    # DeviceMountListDataModel,
     MountData,
     MountDataModel,
     NinaDevicesData,
     NinaDevicesDataModel,
     SwitchData,
-    # SwitchPortData,
-    # SwitchPortDataModel,
     SwitchDataModel,
 )
 from pyninaapiio.models.camera_info import CameraInfo
 from pyninaapiio.models.device_list import DeviceList
-
-# from pyninaapiio.models.device_list_response_item import DeviceListResponseItem
 from pyninaapiio.models.focuser_info import FocuserInfo
+from pyninaapiio.models.fw_info import FWInfo
 from pyninaapiio.models.get_image_history_response_200 import GetImageHistoryResponse200
-
-# from pyninaapiio.models.get_image_index_bayer_pattern import GetImageIndexBayerPattern
 from pyninaapiio.models.get_image_index_response_200 import GetImageIndexResponse200
 from pyninaapiio.models.guider_info import GuiderInfo
 from pyninaapiio.models.mount_info import MountInfo
@@ -56,7 +48,7 @@ from pyninaapiio.types import Response
 _LOGGER = logging.getLogger(__name__)
 logging.basicConfig(
     stream=sys.stdout,
-    level=logging.INFO,
+    level=logging.DEBUG,
     format="%(asctime)s %(levelname)s (%(threadName)s) [%(funcName)s] %(message)s",
     datefmt="%Y-%m-%d %H:%M:%S",
 )
@@ -71,6 +63,7 @@ class NinaAPI:
         base_url="http://192.168.1.234:1888/v2/api",
         # application_enabled=False,
         camera_enabled=False,
+        filterwheel_enabled=False,
         focuser_enabled=False,
         guider_enabled=False,
         image_enabled=False,
@@ -81,6 +74,7 @@ class NinaAPI:
         self._client = Client(base_url=base_url)
         # self._application_enabled = application_enabled
         self._camera_enabled = camera_enabled
+        self._filterwheel_enabled = filterwheel_enabled
         self._focuser_enabled = focuser_enabled
         self._guider_enabled = guider_enabled
         self._image_enabled = image_enabled
@@ -117,14 +111,29 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve camera info")
             _camera_info: Response[CameraInfo] = await get_equipment_camera_info.asyncio(client=self._client)
-            print(_camera_info.response)
             _camera_info_data = CameraDataModel(_camera_info.response.to_dict())
 
             return CameraData(data=_camera_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Camera not connected. {ke}")
 
+    # #########################################################################
+    # FilterWheel
+    # #########################################################################
+    async def filterwheel_info(self):
+        try:
+            _LOGGER.debug(f"Retrieve filterwheel info")
+            _filterwheel_info: Response[FWInfo] = await get_equipment_filterwheel_info.asyncio(client=self._client)
+            _filterwheel_info_data = FilterWheelDataModel(_filterwheel_info.response.to_dict())
+
+            return FilterWheelData(data=_filterwheel_info_data)
+
+        except KeyError as ke:
+            traceback.print_exc()
+            _LOGGER.warning(f"FilterWheel not connected. {ke}")
+
     # #########################################################################
     # Focuser
     # #########################################################################
@@ -132,12 +141,12 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve focuser info")
             _focuser_info: Response[FocuserInfo] = await get_equipment_focuser_info.asyncio(client=self._client)
-            print(_focuser_info.response)
             _focuser_info_data = FocuserDataModel(_focuser_info.response.to_dict())
 
             return FocuserData(data=_focuser_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Focuser not connected. {ke}")
 
     # #########################################################################
@@ -147,12 +156,12 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve guider info")
             _guider_info: Response[GuiderInfo] = await get_equipment_guider_info.asyncio(client=self._client)
-            print(_guider_info.response)
             _guider_info_data = GuiderDataModel(_guider_info.response.to_dict())
 
             return GuiderData(data=_guider_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Guider not connected. {ke}")
 
     # #########################################################################
@@ -174,6 +183,7 @@ class NinaAPI:
                 image_data = base64.b64decode(image.response)
                 self._image_data = image_data
             else:
+                traceback.print_exc()
                 _LOGGER.error(f"{image.error}")
         else:
             _LOGGER.debug(f"Returning previous capture with index {self._image_index_latest}")
@@ -213,6 +223,7 @@ class NinaAPI:
             return MountData(data=_mount_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Mount not connected. {ke}")
 
     # #########################################################################
@@ -227,6 +238,7 @@ class NinaAPI:
             return SwitchData(data=_switch_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Switch not connected. {ke}")
 
     # #########################################################################
@@ -240,6 +252,7 @@ class NinaAPI:
             _nina = {
                 # "Application": await self.application_info() if application_enabled else None,
                 "Camera": await self.camera_info() if self._camera_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,
@@ -251,4 +264,5 @@ class NinaAPI:
             return NinaDevicesData(data=_nina_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Nina not connected. {ke}")

{pyninaapiio-0.0.5 → pyninaapiio-0.0.7}/pyninaapiio.egg-info/PKG-INFO

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

{pyninaapiio-0.0.5 → pyninaapiio-0.0.7}/setup.py

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