pyninaapiio 0.0.6__tar.gz → 0.0.8__tar.gz

{pyninaapiio-0.0.6 → pyninaapiio-0.0.8}/PKG-INFO

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

{pyninaapiio-0.0.6 → pyninaapiio-0.0.8}/pyninaapiio/dataclasses.py

@@ -8,29 +8,33 @@ 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_side_of_pier import MountInfoResponseSideOfPier
-from pyninaapiio.models.mount_info_response_tracking_modes_item import MountInfoResponseTrackingModesItem
 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
-from pyninaapiio.models.mount_info_response_coordinates import MountInfoResponseCoordinates
 
 
 # #########################################################################
 # Application
 # #########################################################################
 class ApplicationDataModel(TypedDict, total=False):
-    Dummy: int
+    Connected: bool
+    Version: str
 
 
 class ApplicationData:
     def __init__(self, *, data: ApplicationDataModel):
-        self.dummy = data.get("Dummy")
+        self.version = data.get("Version")
+        self.connected = data.get("Connected")
 
 
 # #########################################################################
@@ -165,6 +169,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
 # #########################################################################
@@ -244,6 +288,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
@@ -413,6 +477,23 @@ class MountData:
         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")
+
 
 # #########################################################################
 # Switch
@@ -483,10 +564,10 @@ class SwitchData:
 class NinaDevicesDataModel(TypedDict, total=False):
     # device_list_response_item
 
-    # Application: Optional[ApplicationData]
+    Application: Optional[ApplicationData]
     Camera: Optional[CameraData]
     # Dome: Optional[DomeData]
-    # FilterWheel: Optional[FilterWheelData]
+    FilterWheel: Optional[FilterWheelData]
     # FlatPanel: Optional[FlatPanelData]
     Focuser: Optional[FocuserData]
     Guider: Optional[GuiderData]
@@ -504,8 +585,9 @@ class NinaDevicesData:
     """A representation of the geographic location."""
 
     def __init__(self, *, data: NinaDevicesDataModel):
-        # self.application = data.get("Application")
+        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.6 → pyninaapiio-0.0.8}/pyninaapiio/nina.py

@@ -1,12 +1,14 @@
-# import asyncio
 import base64
-
-# import io
 import logging
 import sys
+import traceback
 from pprint import pprint as pp
 
+from httpx import ConnectTimeout
+
+from pyninaapiio.api.application import get_version
 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,43 +20,35 @@ 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.get_version_response_200 import GetVersionResponse200
 from pyninaapiio.models.guider_info import GuiderInfo
 from pyninaapiio.models.mount_info import MountInfo
 from pyninaapiio.models.switch_info import SwitchInfo
 from pyninaapiio.types import Response
 
-import traceback
-
 _LOGGER = logging.getLogger(__name__)
 logging.basicConfig(
     stream=sys.stdout,
@@ -63,6 +57,8 @@ logging.basicConfig(
     datefmt="%Y-%m-%d %H:%M:%S",
 )
 
+API_TIMEOUT = 10
+
 
 # async with client as client:
 class NinaAPI:
@@ -71,8 +67,9 @@ class NinaAPI:
         # session: Optional[ClientSession] = None,
         session=None,
         base_url="http://192.168.1.234:1888/v2/api",
-        # application_enabled=False,
+        application_enabled=False,
         camera_enabled=False,
+        filterwheel_enabled=False,
         focuser_enabled=False,
         guider_enabled=False,
         image_enabled=False,
@@ -80,9 +77,10 @@ class NinaAPI:
         switch_enabled=False,
     ):
         self._session = session
-        self._client = Client(base_url=base_url)
-        # self._application_enabled = application_enabled
+        self._client = Client(base_url=base_url, timeout=API_TIMEOUT, verify_ssl=False)
+        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
@@ -98,19 +96,18 @@ class NinaAPI:
     # #########################################################################
     # Application
     # #########################################################################
-    # async def application_info(self):
-    #     try:
-    #         _LOGGER.debug(f"Retrieve application info")
-    #         _application_info: Response[ApplicationInfo] = await get_equipment_application_info.asyncio(
-    #             client=self._client
-    #         )
-    #         print(_application_info.response)
-    #         _application_info_data = ApplicationDataModel(_application_info.response.to_dict())
+    async def application_info(self):
+        try:
+            _LOGGER.debug(f"Retrieve application info")
+            _application_info: Response[GetVersionResponse200] = await get_version.asyncio(client=self._client)
+            print(_application_info)
+            _application_info_data = ApplicationDataModel({"Version": _application_info.response, "Connected": True})
 
-    #         return ApplicationData(data=_application_info_data)
+            return ApplicationData(data=_application_info_data)
 
-    #     except KeyError as ke:
-    #         _LOGGER.warning(f"Application not connected. {ke}")
+        except KeyError as ke:
+            traceback.print_exc()
+            _LOGGER.warning(f"Application not connected. {ke}")
 
     # #########################################################################
     # Camera
@@ -127,6 +124,21 @@ class NinaAPI:
             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
     # #########################################################################
@@ -243,8 +255,9 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve nina info")
             _nina = {
-                # "Application": await self.application_info() if application_enabled else None,
+                "Application": await self.application_info() if self._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,
@@ -255,6 +268,8 @@ class NinaAPI:
 
             return NinaDevicesData(data=_nina_info_data)
 
+        except ConnectTimeout as ct:
+            _LOGGER.debug(f"Nina not available.")
         except KeyError as ke:
             traceback.print_exc()
-            _LOGGER.warning(f"Nina not connected. {ke}")
+            _LOGGER.debug(f"Nina not connected. {ke}")

{pyninaapiio-0.0.6 → pyninaapiio-0.0.8}/pyninaapiio.egg-info/PKG-INFO

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

{pyninaapiio-0.0.6 → pyninaapiio-0.0.8}/setup.py

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