pyninaapiio 0.0.9__tar.gz → 0.0.11__tar.gz

{pyninaapiio-0.0.9/pyninaapiio.egg-info → pyninaapiio-0.0.11}/PKG-INFO

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

{pyninaapiio-0.0.9 → pyninaapiio-0.0.11}/pyninaapiio/dataclasses.py

@@ -8,30 +8,30 @@ from typing import Any, Optional, TypedDict
 
 from typeguard import typechecked
 
-from advanced_api_client.models.fw_info_response_available_filters_item import (
+from .advanced_api_client.models.fw_info_response_available_filters_item import (
     FWInfoResponseAvailableFiltersItem,
 )
-from advanced_api_client.models.fw_info_response_selected_filter import FWInfoResponseSelectedFilter
-from advanced_api_client.models.guider_info_response_last_guide_step import GuiderInfoResponseLastGuideStep
-from advanced_api_client.models.guider_info_response_rms_error import GuiderInfoResponseRMSError
-from advanced_api_client.models.guider_info_response_state import GuiderInfoResponseState
-from advanced_api_client.models.mount_info_response_alignment_mode import MountInfoResponseAlignmentMode
-from advanced_api_client.models.mount_info_response_coordinates import MountInfoResponseCoordinates
-from advanced_api_client.models.mount_info_response_equatorial_system import (
+from .advanced_api_client.models.fw_info_response_selected_filter import FWInfoResponseSelectedFilter
+from .advanced_api_client.models.guider_info_response_last_guide_step import GuiderInfoResponseLastGuideStep
+from .advanced_api_client.models.guider_info_response_rms_error import GuiderInfoResponseRMSError
+from .advanced_api_client.models.guider_info_response_state import GuiderInfoResponseState
+from .advanced_api_client.models.mount_info_response_alignment_mode import MountInfoResponseAlignmentMode
+from .advanced_api_client.models.mount_info_response_coordinates import MountInfoResponseCoordinates
+from .advanced_api_client.models.mount_info_response_equatorial_system import (
     MountInfoResponseEquatorialSystem,
 )
-from advanced_api_client.models.mount_info_response_primary_axis_rates_item import (
+from .advanced_api_client.models.mount_info_response_primary_axis_rates_item import (
     MountInfoResponsePrimaryAxisRatesItem,
 )
-from advanced_api_client.models.mount_info_response_secondary_axis_rates_item import (
+from .advanced_api_client.models.mount_info_response_secondary_axis_rates_item import (
     MountInfoResponseSecondaryAxisRatesItem,
 )
-from advanced_api_client.models.mount_info_response_side_of_pier import MountInfoResponseSideOfPier
-from advanced_api_client.models.mount_info_response_tracking_modes_item import (
+from .advanced_api_client.models.mount_info_response_side_of_pier import MountInfoResponseSideOfPier
+from .advanced_api_client.models.mount_info_response_tracking_modes_item import (
     MountInfoResponseTrackingModesItem,
 )
-from advanced_api_client.models.mount_info_response_tracking_rate import MountInfoResponseTrackingRate
-from advanced_api_client.types import Unset
+from .advanced_api_client.models.mount_info_response_tracking_rate import MountInfoResponseTrackingRate
+from .advanced_api_client.types import Unset
 
 
 # #########################################################################

{pyninaapiio-0.0.9 → pyninaapiio-0.0.11}/pyninaapiio/nina.py

@@ -4,18 +4,30 @@ import sys
 import traceback
 from pprint import pprint as pp
 
-from httpx import ConnectTimeout
-
-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.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.switch import get_equipment_switch_info
-from advanced_api_client.client import Client
-from pyninaapiio.dataclasses import (
+from httpx import ConnectTimeout, ReadTimeout
+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.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.switch import get_equipment_switch_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
+from .advanced_api_client.models.focuser_info import FocuserInfo
+from .advanced_api_client.models.fw_info import FWInfo
+from .advanced_api_client.models.get_image_history_response_200 import GetImageHistoryResponse200
+from .advanced_api_client.models.get_image_index_response_200 import GetImageIndexResponse200
+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.switch_info import SwitchInfo
+from .advanced_api_client.types import Response
+from .dataclasses import (
     ApplicationData,
     ApplicationDataModel,
     CameraData,
@@ -35,18 +47,6 @@ from pyninaapiio.dataclasses import (
     SwitchData,
     SwitchDataModel,
 )
-from advanced_api_client.models.camera_info import CameraInfo
-from advanced_api_client.models.device_list import DeviceList
-from advanced_api_client.models.focuser_info import FocuserInfo
-from advanced_api_client.models.fw_info import FWInfo
-from advanced_api_client.models.get_image_history_response_200 import GetImageHistoryResponse200
-from advanced_api_client.models.get_image_index_response_200 import GetImageIndexResponse200
-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.switch_info import SwitchInfo
-from advanced_api_client.types import Response
-from typeguard import TypeCheckError
 
 _LOGGER = logging.getLogger(__name__)
 logging.basicConfig(
@@ -56,7 +56,7 @@ logging.basicConfig(
     datefmt="%Y-%m-%d %H:%M:%S",
 )
 
-API_TIMEOUT = 3
+DEFAULT_API_TIMEOUT = 10
 
 
 # async with client as client:
@@ -74,9 +74,10 @@ class NinaAPI:
         image_enabled=False,
         mount_enabled=False,
         switch_enabled=False,
+        api_timeout=DEFAULT_API_TIMEOUT,
     ):
         self._session = session
-        self._client = Client(base_url=base_url, timeout=API_TIMEOUT, verify_ssl=False)
+        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
@@ -97,17 +98,17 @@ class NinaAPI:
     # #########################################################################
     async def application_info(self):
         try:
-            _LOGGER.info(f"Retrieve application info")
+            _LOGGER.info("Retrieve info")
             _application_info: Response[GetVersionResponse200] = await get_version.asyncio(client=self._client)
             _application_info_data = ApplicationDataModel({"Version": _application_info.response, "Connected": True})
 
             return ApplicationData(data=_application_info_data)
 
         except ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return ApplicationData(data={"Connected": False})
         except KeyError as ke:
-            _LOGGER.info(f"Application not connected.")
+            _LOGGER.info("Application not connected.")
             return ApplicationData(data={"Connected": False})
 
     # #########################################################################
@@ -115,17 +116,17 @@ class NinaAPI:
     # #########################################################################
     async def camera_info(self):
         try:
-            _LOGGER.info(f"Retrieve camera info")
+            _LOGGER.info("Retrieve info")
             _camera_info: Response[CameraInfo] = await get_equipment_camera_info.asyncio(client=self._client)
             _camera_info_data = CameraDataModel(_camera_info.response.to_dict())
 
             return CameraData(data=_camera_info_data)
 
         except ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return None
         except KeyError as ke:
-            _LOGGER.info(f"Camera not connected.")
+            _LOGGER.info("Camera not connected.")
             return CameraData(data={"Connected": False})
 
     # #########################################################################
@@ -133,17 +134,17 @@ class NinaAPI:
     # #########################################################################
     async def filterwheel_info(self):
         try:
-            _LOGGER.info(f"Retrieve filterwheel info")
+            _LOGGER.info("Retrieve 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 ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return None
         except KeyError as ke:
-            _LOGGER.info(f"FilterWheel not connected.")
+            _LOGGER.info("FilterWheel not connected.")
             return FilterWheelData(data={"Connected": False})
 
     # #########################################################################
@@ -151,20 +152,17 @@ class NinaAPI:
     # #########################################################################
     async def focuser_info(self):
         try:
-            _LOGGER.info(f"Retrieve focuser info")
-            _focuser_info: Response[FocuserInfo] = await get_equipment_focuser_info.asyncio_detailed(
-                client=self._client
-            )
-            pp(_focuser_info)
+            _LOGGER.info("Retrieve info")
+            _focuser_info: Response[FocuserInfo] = await get_equipment_focuser_info.asyncio(client=self._client)
             _focuser_info_data = FocuserDataModel(_focuser_info.response.to_dict())
 
             return FocuserData(data=_focuser_info_data)
 
         except ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return None
         except KeyError as ke:
-            _LOGGER.info(f"Focuser not connected.")
+            _LOGGER.info("Focuser not connected.")
             return FocuserData(data={"Connected": False})
 
     # #########################################################################
@@ -172,39 +170,47 @@ class NinaAPI:
     # #########################################################################
     async def guider_info(self):
         try:
-            _LOGGER.info(f"Retrieve info")
+            _LOGGER.info("Retrieve info")
             _guider_info: Response[GuiderInfo] = await get_equipment_guider_info.asyncio(client=self._client)
             _guider_info_data = GuiderDataModel(_guider_info.response.to_dict())
 
             return GuiderData(data=_guider_info_data)
 
         except ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return None
         except KeyError as ke:
-            _LOGGER.info(f"Guider not connected.")
+            _LOGGER.info("Guider not connected.")
             return GuiderData(data={"Connected": False})
 
     # #########################################################################
     # Image
     # #########################################################################
     async def image_latest(self):
-        _LOGGER.info(f"Retrieve index of last capture")
-        image_history: GetImageHistoryResponse200 = await get_image_history.asyncio(client=self._client, count=True)
-        image_index_latest = image_history.response - 1
+        try:
+            _LOGGER.info("Retrieve index of last capture")
+            image_history: GetImageHistoryResponse200 = await get_image_history.asyncio(client=self._client, count=True)
+            image_index_latest = image_history.response - 1
+        except ConnectTimeout as ct:
+            _LOGGER.info("N.I.N.A. not available.")
+            return None
 
         if image_index_latest > self._image_index_latest:
             self._image_index_latest = image_index_latest
 
-            _LOGGER.info(f"Retrieve capture with index {image_index_latest}")
-            image: GetImageIndexResponse200 = await get_image_index.asyncio(
-                index=image_index_latest, client=self._client
-            )  # , debayer=True, bayer_pattern=GetImageIndexBayerPattern.RGGB)
-            if image.success:
-                image_data = base64.b64decode(image.response)
-                self._image_data = image_data
-            else:
-                _LOGGER.error(f"{image.error}")
+            try:
+                _LOGGER.info(f"Retrieve capture with index {image_index_latest}")
+                image: GetImageIndexResponse200 = await get_image_index.asyncio(
+                    index=image_index_latest, client=self._client
+                )  # , debayer=True, bayer_pattern=GetImageIndexBayerPattern.RGGB)
+                if image.success:
+                    image_data = base64.b64decode(image.response)
+                    self._image_data = image_data
+                else:
+                    _LOGGER.error(f"{image.error}")
+            except ReadTimeout as rt:
+                _LOGGER.info("Timeout retrieving capture. Try increasing the timeout.")
+                return None
         else:
             _LOGGER.info(f"Returning previous capture with index {self._image_index_latest}")
 
@@ -243,17 +249,17 @@ class NinaAPI:
 
     async def mount_info(self):
         try:
-            _LOGGER.info(f"Retrieve info")
+            _LOGGER.info("Retrieve info")
             _mount_info: Response[MountInfo] = await get_equipment_mount_info.asyncio(client=self._client)
             _mount_info_data = MountDataModel(_mount_info.response.to_dict())
 
             return MountData(data=_mount_info_data)
 
         except ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return None
         except KeyError as ke:
-            _LOGGER.info(f"Mount not connected.")
+            _LOGGER.info("Mount not connected.")
             return MountData(data={"Connected": False})
 
     # #########################################################################
@@ -261,49 +267,34 @@ class NinaAPI:
     # #########################################################################
     async def switch_info(self):
         try:
-            _LOGGER.info(f"Retrieve info")
+            _LOGGER.info("Retrieve info")
             _switch_info: Response[SwitchInfo] = await get_equipment_switch_info.asyncio(client=self._client)
             _switch_info_data = SwitchDataModel(_switch_info.response.to_dict())
 
             return SwitchData(data=_switch_info_data)
 
         except ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return None
         except KeyError as ke:
-            _LOGGER.info(f"Switch not connected.")
+            _LOGGER.info("Switch not connected.")
             return SwitchData(data={"Connected": False})
 
     # #########################################################################
-    # Nina
+    # N.I.N.A.
     # #########################################################################
     async def nina_info(
         self,
-    ):
-        # try:
-        #     _LOGGER.info(f"Retrieve N.I.N.A. info")
-        #     application_data: ApplicationData = await self.application_info()
-
-        #     if application_data.connected is False:
-        #         _LOGGER.info(f"Nina not available.")
-        #         return NinaDevicesData(data={"Connected": False})
-        # except ConnectTimeout as ct:
-        #     _LOGGER.info(f"Nina not available.")
-        #     return NinaDevicesData(data={"Connected": False})
-        # except KeyError as ke:
-        #     # traceback.print_exc()
-        #     _LOGGER.info(f"Nina not connected.")
-        #     return NinaDevicesData(data={"Connected": False})
-
-        _LOGGER.info(f"Connecting to N.I.N.A.")
+    ) -> NinaDevicesData:
+        _LOGGER.info("Connecting to N.I.N.A.")
         application_data: ApplicationData = await self.application_info()
 
         if application_data.connected is False:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return NinaDevicesData(data={"Connected": False})
 
         try:
-            _LOGGER.info(f"Retrieve N.I.N.A. info")
+            _LOGGER.info("Retrieve info")
             _nina = {
                 "Application": await self.application_info() if self._application_enabled else None,
                 "Camera": await self.camera_info() if self._camera_enabled else None,
@@ -319,9 +310,9 @@ class NinaAPI:
             return NinaDevicesData(data=_nina_info_data)
 
         except ConnectTimeout as ct:
-            _LOGGER.info(f"Nina not available.")
+            _LOGGER.info("N.I.N.A. not available.")
             return NinaDevicesData(data={"Connected": False})
         except KeyError as ke:
             # traceback.print_exc()
-            _LOGGER.info(f"Nina not connected.")
+            _LOGGER.info("N.I.N.A. not connected.")
             return NinaDevicesData(data={"Connected": False})

{pyninaapiio-0.0.9 → pyninaapiio-0.0.11/pyninaapiio.egg-info}/PKG-INFO

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