pyninaapiio 0.0.14__tar.gz → 0.0.15__tar.gz

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

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

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

@@ -43,6 +43,7 @@ class ApplicationDataModel(TypedDict, total=False):
     Version: str
 
 
+@typechecked
 class ApplicationData:
     def __init__(self, *, data: ApplicationDataModel):
         self.version = data.get("Version")
@@ -96,9 +97,9 @@ class CameraDataModel(TypedDict, total=False):
     OffsetMax: int
     OffsetMin: int
     PixelSize: int
-    ReadoutMode: str
-    ReadoutModeForNormalImages: int
-    ReadoutModeForSnapImages: int
+    ReadoutMode: int | str
+    ReadoutModeForNormalImages: int | str
+    ReadoutModeForSnapImages: int | str
     ReadoutModes: str
     SensorType: str
     SubSampleHeight: int
@@ -116,6 +117,7 @@ class CameraDataModel(TypedDict, total=False):
     YSize: int
 
 
+@typechecked
 class CameraData:
     def __init__(self, *, data: CameraDataModel):
         self.connected = data.get("Connected")
@@ -161,9 +163,21 @@ class CameraData:
         self.offset_max = data.get("OffsetMax")
         self.offset_min = data.get("OffsetMin")
         self.pixel_size = data.get("PixelSize")
-        self.readout_mode = data.get("ReadoutModes")[data.get("ReadoutMode")]
-        self.readout_mode_for_normal_images = data.get("ReadoutModes")[data.get("ReadoutModeForNormalImages")]
-        self.readout_mode_for_snap_images = data.get("ReadoutModes")[data.get("ReadoutModeForSnapImages")]
+        self.readout_mode = (
+            data.get("ReadoutModes")[data.get("ReadoutMode")]
+            if data.get("ReadoutMode") is not None and data.get("ReadoutModes") is not None
+            else None
+        )
+        self.readout_mode_for_normal_images = (
+            data.get("ReadoutModes")[data.get("ReadoutModeForNormalImages")]
+            if data.get("ReadoutModeForNormalImages") is not None and data.get("ReadoutModes") is not None
+            else None
+        )
+        self.readout_mode_for_snap_images = (
+            data.get("ReadoutModes")[data.get("ReadoutModeForSnapImages")]
+            if data.get("ReadoutModeForSnapImages") is not None and data.get("ReadoutModes") is not None
+            else None
+        )
         self.readout_modes = data.get("ReadoutModes")
         self.sensor_type = data.get("SensorType")
         self.sub_sample_height = data.get("SubSampleHeight")
@@ -198,6 +212,7 @@ class FilterWheelDataModel(TypedDict, total=False):
     SupportedActions: list[Any]
 
 
+@typechecked
 class FilterWheelData:
     def __init__(self, *, data: FilterWheelDataModel):
         self.connected = data.get("Connected")
@@ -242,6 +257,7 @@ class FocuserDataModel(TypedDict, total=False):
     Temperature: float
 
 
+@typechecked
 class FocuserData:
     def __init__(self, *, data: FocuserDataModel):
         self.connected = data.get("Connected")
@@ -282,6 +298,7 @@ class GuiderDataModel(TypedDict, total=False):
     SupportedActions: list[Any]
 
 
+@typechecked
 class GuiderData:
     def __init__(self, *, data: GuiderDataModel):
         self.connected = data.get("Connected")
@@ -356,6 +373,7 @@ class ImageDataModel(TypedDict, total=False):
     Temperature: float
 
 
+@typechecked
 class ImageData:
     def __init__(self, *, data: ImageDataModel):
         self.connected = data.get("Connected")
@@ -473,6 +491,7 @@ class MountDataModel(TypedDict, total=False):
     SiteLongitude: float
     Slewing: bool
     SupportedActions: list[str]
+    TargetCoordinates: Any
     TimeToMeridianFlip: float
     TimeToMeridianFlipString: str
     TrackingEnabled: bool
@@ -490,11 +509,17 @@ class MountData:
         self.name = data.get("Name")
         self.display_name = data.get("DisplayName")
         self.alignment_mode = data.get("AlignmentMode")
-        self.altitude = round(data.get("Altitude"), 3) if data.get("Altitude") is not None else None
+        self.altitude = (
+            round(data.get("Altitude"), 3)
+            if data.get("Altitude") is not None and data.get("Altitude") != "NaN"
+            else None
+        )
         self.altitude_string = data.get("AltitudeString")
         self.at_home = data.get("AtHome")
         self.at_park = data.get("AtPark")
-        self.azimuth = round(data.get("Azimuth"), 3) if data.get("Azimuth") is not None else None
+        self.azimuth = (
+            round(data.get("Azimuth"), 3) if data.get("Azimuth") is not None and data.get("Azimuth") != "NaN" else None
+        )
         self.azimuth_string = data.get("AzimuthString")
         self.can_find_home = data.get("CanFindHome")
         self.can_move_primary_axis = data.get("CanMovePrimaryAxis")
@@ -529,6 +554,7 @@ class MountData:
         self.site_longitude = round(data.get("SiteLongitude"), 3) if data.get("SiteLongitude") is not None else None
         self.slewing = data.get("Slewing")
         self.supported_actions = data.get("SupportedActions")
+        self.target_coordinates = data.get("TargetCoordinates")
         self.time_to_meridian_flip = data.get("TimeToMeridianFlip")
         self.time_to_meridian_flip_string = data.get("TimeToMeridianFlipString")
         self.tracking_enabled = data.get("TrackingEnabled")

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

@@ -4,7 +4,7 @@ import sys
 import traceback
 from pprint import pprint as pp
 
-from httpx import ConnectTimeout, ReadTimeout
+from httpx import ConnectError, ConnectTimeout, ReadTimeout
 from typeguard import TypeCheckError
 
 from .advanced_api_client.api.application import get_version
@@ -106,9 +106,15 @@ class NinaAPI:
 
             return ApplicationData(data=_application_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 ApplicationData(data={"Connected": False})
+        except TypeCheckError as tce:
+            _LOGGER.warning(f"TypeCheckError: {tce}")
+            return None
         except KeyError as ke:
             _LOGGER.debug("Application not connected.")
             return ApplicationData(data={"Connected": False})
@@ -124,9 +130,15 @@ class NinaAPI:
 
             return CameraData(data=_camera_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("Camera not connected.")
             return CameraData(data={"Connected": False})
@@ -142,9 +154,15 @@ class NinaAPI:
 
             return FilterWheelData(data=_filterwheel_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("FilterWheel not connected.")
             return FilterWheelData(data={"Connected": False})
@@ -160,9 +178,15 @@ class NinaAPI:
 
             return FocuserData(data=_focuser_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("Focuser not connected.")
             return FocuserData(data={"Connected": False})
@@ -178,9 +202,15 @@ class NinaAPI:
 
             return GuiderData(data=_guider_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("Guider not connected.")
             return GuiderData(data={"Connected": False})
@@ -194,6 +224,9 @@ class NinaAPI:
             image_history: GetImageHistoryResponse200 = await get_image_history.asyncio(client=self._client, count=True)
             image_index_latest = image_history.response - 1
 
+        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
@@ -272,9 +305,15 @@ class NinaAPI:
 
             return MountData(data=_mount_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("Mount not connected.")
             return MountData(data={"Connected": False})
@@ -290,9 +329,15 @@ class NinaAPI:
 
             return SwitchData(data=_switch_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("Switch not connected.")
             return SwitchData(data={"Connected": False})
@@ -326,9 +371,15 @@ class NinaAPI:
 
             return NinaDevicesData(data=_nina_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 NinaDevicesData(data={"Connected": False})
+        except TypeCheckError as tce:
+            _LOGGER.warning(f"TypeCheckError: {tce}")
+            return None
         except KeyError as ke:
             # traceback.print_exc()
             _LOGGER.debug("N.I.N.A. not connected.")

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

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

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

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