pyninaapiio 0.2.2.13.1__tar.gz → 0.2.2.13.4__tar.gz

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.4}/PKG-INFO

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

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.4}/pyninaapiio/advanced_api_client/models/mount_info_response_tracking_mode.py

@@ -5,7 +5,7 @@ class MountInfoResponseTrackingMode(str, Enum):
     CUSTOM = "Custom"
     KING = "King"
     LUNAR = "Lunar"
-    SIDERIAL = "Siderial"
+    SIDEREAL = "Sidereal"
     SOLAR = "Solar"
     STOPPED = "Stopped"
 

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.4}/pyninaapiio/advanced_api_client/models/mount_info_response_tracking_modes_item.py

@@ -5,7 +5,7 @@ class MountInfoResponseTrackingModesItem(str, Enum):
     CUSTOM = "Custom"
     KING = "King"
     LUNAR = "Lunar"
-    SIDERIAL = "Siderial"
+    SIDEREAL = "Sidereal"
     SOLAR = "Solar"
     STOPPED = "Stopped"
 

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.4}/pyninaapiio/dataclasses.py

@@ -78,6 +78,7 @@ class CameraDataModel(TypedDict, total=False):
     GainMax: int
     GainMin: int
     Gains: list[Any]
+    HasBattery: bool
     HasDewHeater: bool
     HasShutter: bool
     IsExposing: bool
@@ -148,6 +149,7 @@ class CameraData(NinaData):
         self.gain_max = data.get("GainMax")
         self.gain_min = data.get("GainMin")
         self.gains = data.get("Gains")
+        self.has_battery = data.get("HasBattery")
         self.has_dew_heater = data.get("HasDewHeater")
         self.has_shutter = data.get("HasShutter")
         self.is_exposing = data.get("IsExposing")
@@ -273,7 +275,7 @@ class FilterWheelDataModel(TypedDict, total=False):
 
     AvailableFilters: list[Any] | Unset
     IsMoving: bool | Unset
-    SelectedFilter: str | Unset
+    SelectedFilter: dict | str | Unset
 
 
 @typechecked
@@ -363,7 +365,7 @@ class GuiderDataModel(TypedDict, total=False):
     LastGuideStep: Optional[GuiderInfoResponseLastGuideStep] | Unset
     PixelScale: float
     RMSError: GuiderInfoResponseRMSError | Unset
-    State: GuiderInfoResponseState | Unset
+    State: GuiderInfoResponseState | str | Unset
 
 
 @typechecked
@@ -505,8 +507,8 @@ class MountDataModel(TypedDict, total=False):
     DeclinationString: str
     DeviceId: str | Unset
     EquatorialSystem: str | Unset
-    GuideRateDeclinationArcsecPerSec: int | Unset
-    GuideRateRightAscensionArcsecPerSec: int | Unset
+    GuideRateDeclinationArcsecPerSec: float | int | Unset
+    GuideRateRightAscensionArcsecPerSec: float | int | Unset
     HasUnknownEpoch: bool
     HoursToMeridianString: str
     IsPulseGuiding: bool
@@ -525,6 +527,7 @@ class MountDataModel(TypedDict, total=False):
     TimeToMeridianFlip: float
     TimeToMeridianFlipString: str
     TrackingEnabled: bool
+    TrackingMode: str | Unset
     TrackingModes: list | Unset
     TrackingRate: dict | Unset
     UTCDate: str
@@ -593,6 +596,7 @@ class MountData(NinaData):
         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_mode = data.get("TrackingMode")
         self.tracking_modes = data.get("TrackingModes")
         self.tracking_rate = data.get("TrackingRate")
         self.utc_date = data.get("UTCDate")

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.4}/pyninaapiio/nina.py

@@ -3,7 +3,7 @@ import logging
 import math
 import sys
 import traceback
-from pprint import pprint as pp
+# from pprint import pprint as pp
 
 from httpx import ConnectError, ConnectTimeout, ReadTimeout, Limits
 from typeguard import TypeCheckError
@@ -130,8 +130,8 @@ class NinaAPI:
     # #########################################################################
     async def application_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Application")
             _application_info: Response[GetVersionResponse200] = await get_version.asyncio(client=client)
+            _LOGGER.debug(_application_info)
             _application_info_data = ApplicationDataModel({"Version": _application_info.response, "Connected": True})
 
             return ApplicationData(data=_application_info_data)
@@ -147,7 +147,6 @@ class NinaAPI:
             return ApplicationData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Application): {ke}")
-            # print(traceback.format_exc())
             return ApplicationData(data={"Connected": False})
 
     # #########################################################################
@@ -155,8 +154,8 @@ class NinaAPI:
     # #########################################################################
     async def camera_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Camera")
             _camera_info: Response[CameraInfo] = await get_equipment_camera_info.asyncio(client=client)
+            _LOGGER.debug(_camera_info)
             _camera_info_data = CameraDataModel(self._clean_dict(_camera_info.response.to_dict()))
 
             return CameraData(data=_camera_info_data)
@@ -172,7 +171,6 @@ class NinaAPI:
             return CameraData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Camera): {ke}")
-            # print(traceback.format_exc())
             return CameraData(data={"Connected": False})
 
     # #########################################################################
@@ -180,8 +178,8 @@ class NinaAPI:
     # #########################################################################
     async def dome_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Dome")
             _dome_info: Response[FWInfo] = await get_equipment_dome_info.asyncio(client=client)
+            _LOGGER.debug(_dome_info)
             _dome_info_data = DomeDataModel(self._clean_dict(_dome_info.response.to_dict()))
 
             return DomeData(data=_dome_info_data)
@@ -197,7 +195,6 @@ class NinaAPI:
             return DomeData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Dome): {ke}")
-            # print(traceback.format_exc())
             return DomeData(data={"Connected": False})
 
     # #########################################################################
@@ -205,8 +202,8 @@ class NinaAPI:
     # #########################################################################
     async def filterwheel_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Filterwheel")
             _filterwheel_info: Response[FWInfo] = await get_equipment_filterwheel_info.asyncio(client=client)
+            _LOGGER.debug(_filterwheel_info)
             _filterwheel_info_data = FilterWheelDataModel(self._clean_dict(_filterwheel_info.response.to_dict()))
 
             return FilterWheelData(data=_filterwheel_info_data)
@@ -222,7 +219,6 @@ class NinaAPI:
             return FilterWheelData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Filterwheel): {ke}")
-            # print(traceback.format_exc())
             return FilterWheelData(data={"Connected": False})
 
     # #########################################################################
@@ -230,8 +226,8 @@ class NinaAPI:
     # #########################################################################
     async def focuser_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Focuser")
             _focuser_info: Response[FocuserInfo] = await get_equipment_focuser_info.asyncio(client=client)
+            _LOGGER.debug(_focuser_info)
             _focuser_info_data = FocuserDataModel(self._clean_dict(_focuser_info.response.to_dict()))
 
             return FocuserData(data=_focuser_info_data)
@@ -247,7 +243,6 @@ class NinaAPI:
             return FocuserData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Focuser): {ke}")
-            # print(traceback.format_exc())
             return FocuserData(data={"Connected": False})
 
     # #########################################################################
@@ -255,8 +250,8 @@ class NinaAPI:
     # #########################################################################
     async def guider_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Guider")
             _guider_info: Response[GuiderInfo] = await get_equipment_guider_info.asyncio(client=client)
+            _LOGGER.debug(_guider_info)
             _guider_info_data = GuiderDataModel(self._clean_dict(_guider_info.response.to_dict()))
 
             return GuiderData(data=_guider_info_data)
@@ -272,7 +267,6 @@ class NinaAPI:
             return GuiderData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Guider): {ke}")
-            # print(traceback.format_exc())
             return GuiderData(data={"Connected": False})
 
     # #########################################################################
@@ -280,9 +274,9 @@ class NinaAPI:
     # #########################################################################
     async def image_latest(self, client):
         try:
-            # _LOGGER.debug("Image: Get index of last capture")
-            image_history: GetImageHistoryResponse200 = await get_image_history.asyncio(client=client, count=True)
-            image_index_latest = image_history.response - 1
+            _image_history: GetImageHistoryResponse200 = await get_image_history.asyncio(client=client, count=True)
+            _LOGGER.debug(_image_history)
+            _image_index_latest = _image_history.response - 1
 
         except ConnectError as ce:
             _LOGGER.warning("Astro server not available.")
@@ -291,19 +285,19 @@ class NinaAPI:
             _LOGGER.warning("N.I.N.A. not available.")
             return ImageData(data={"Connected": False})
 
-        if image_index_latest > self._image_index_latest:
-            self._image_index_latest = image_index_latest
+        if _image_index_latest > self._image_index_latest:
+            self._image_index_latest = _image_index_latest
 
             try:
                 _LOGGER.debug("Image: Retrieve capture detail data")
                 image_details: GetImageHistoryResponse200 = await get_image_history.asyncio(
-                    client=client, index=image_index_latest
+                    client=client, index=_image_index_latest
                 )
                 self._image_details_data = self._clean_dict(image_details.response[0].to_dict())
 
-                _LOGGER.debug(f"Image: Retrieve capture with index {image_index_latest}")
+                _LOGGER.debug(f"Image: Retrieve capture with index {_image_index_latest}")
                 image: GetImageIndexResponse200 = await get_image_index.asyncio(
-                    index=image_index_latest,
+                    index=_image_index_latest,
                     client=client,
                     debayer=self._image_details_data.get("IsBayered", False),
                     bayer_pattern=GetImageIndexBayerPattern.RGGB,
@@ -340,8 +334,8 @@ class NinaAPI:
     # #########################################################################
     async def mount_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Mount")
             _mount_info: Response[MountInfo] = await get_equipment_mount_info.asyncio(client=client)
+            _LOGGER.debug(_mount_info)
             _mount_info_data = MountDataModel(self._clean_dict(_mount_info.response.to_dict()))
 
             return MountData(data=_mount_info_data)
@@ -360,7 +354,6 @@ class NinaAPI:
             return MountData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Mount): {ke}")
-            # print(traceback.format_exc())
             return MountData(data={"Connected": False})
 
     # #########################################################################
@@ -368,8 +361,8 @@ class NinaAPI:
     # #########################################################################
     async def rotator_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Rotator")
             _rotator_info: Response[RotatorInfo] = await get_equipment_rotator_info.asyncio(client=client)
+            _LOGGER.debug(_rotator_info)
             _rotator_info_data = RotatorDataModel(self._clean_dict(_rotator_info.response.to_dict()))
 
             return RotatorData(data=_rotator_info_data)
@@ -385,7 +378,6 @@ class NinaAPI:
             return RotatorData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Rotator): {ke}")
-            # print(traceback.format_exc())
             return RotatorData(data={"Connected": False})
 
     # #########################################################################
@@ -393,10 +385,10 @@ class NinaAPI:
     # #########################################################################
     async def safety_monitor_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: SafetyMonitor")
             _safety_monitor_info: Response[SafetyMonitorInfo] = await get_equipment_safetymonitor_info.asyncio(
                 client=client
             )
+            _LOGGER.debug(_safety_monitor_info)
             _safety_monitor_info_data = SafetyMonitorDataModel(
                 self._clean_dict(_safety_monitor_info.response.to_dict())
             )
@@ -414,7 +406,6 @@ class NinaAPI:
             return SafetyMonitorData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Safety Monitor): {ke}")
-            # print(traceback.format_exc())
             return SafetyMonitorData(data={"Connected": False})
 
     # #########################################################################
@@ -422,8 +413,8 @@ class NinaAPI:
     # #########################################################################
     async def switch_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Switch")
             _switch_info: Response[SwitchInfo] = await get_equipment_switch_info.asyncio(client=client)
+            _LOGGER.debug(_switch_info)
             _switch_info_data = SwitchDataModel(self._clean_dict(_switch_info.response.to_dict()))
 
             return SwitchData(data=_switch_info_data)
@@ -439,7 +430,6 @@ class NinaAPI:
             return SwitchData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Switch): {ke}")
-            # print(traceback.format_exc())
             return SwitchData(data={"Connected": False})
 
     # #########################################################################
@@ -447,8 +437,8 @@ class NinaAPI:
     # #########################################################################
     async def weather_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Weather")
             _weather_info: Response[WeatherInfo] = await get_equipment_weather_info.asyncio(client=client)
+            _LOGGER.debug(_weather_info)
             _weather_info_data = WeatherDataModel(self._clean_dict(_weather_info.response.to_dict()))
 
             return WeatherData(data=_weather_info_data)
@@ -464,7 +454,6 @@ class NinaAPI:
             return WeatherData(data={"Connected": False})
         except KeyError as ke:
             _LOGGER.debug(f"KeyError (Weather): {ke}")
-            # print(traceback.format_exc())
             return WeatherData(data={"Connected": False})
 
     # #########################################################################
@@ -485,7 +474,7 @@ class NinaAPI:
             application_data: ApplicationData = await self.application_info(client)
 
             if application_data.connected is False:
-                print("returning clean not connected nina_info")
+                _LOGGER.warning("returning clean not connected nina_info")
                 return NinaDevicesData(data={"Connected": False})
 
             try:

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.4}/pyninaapiio.egg-info/PKG-INFO

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

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.4}/setup.py

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