pyninaapiio 0.2.2.13.1__tar.gz → 0.2.2.13.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyninaapiio
-Version: 0.2.2.13.1
+Version: 0.2.2.13.2
 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.2}/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

{pyninaapiio-0.2.2.13.1 → pyninaapiio-0.2.2.13.2}/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,7 +130,6 @@ class NinaAPI:
     # #########################################################################
     async def application_info(self, client):
         try:
-            # _LOGGER.debug("Retrieve info: Application")
             _application_info: Response[GetVersionResponse200] = await get_version.asyncio(client=client)
             _application_info_data = ApplicationDataModel({"Version": _application_info.response, "Connected": True})
 
@@ -147,7 +146,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,7 +153,6 @@ 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)
             _camera_info_data = CameraDataModel(self._clean_dict(_camera_info.response.to_dict()))
 
@@ -172,7 +169,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,7 +176,6 @@ 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)
             _dome_info_data = DomeDataModel(self._clean_dict(_dome_info.response.to_dict()))
 
@@ -197,7 +192,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,7 +199,6 @@ 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)
             _filterwheel_info_data = FilterWheelDataModel(self._clean_dict(_filterwheel_info.response.to_dict()))
 
@@ -222,7 +215,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,7 +222,6 @@ 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)
             _focuser_info_data = FocuserDataModel(self._clean_dict(_focuser_info.response.to_dict()))
 
@@ -247,7 +238,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,7 +245,6 @@ 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)
             _guider_info_data = GuiderDataModel(self._clean_dict(_guider_info.response.to_dict()))
 
@@ -272,7 +261,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,7 +268,6 @@ 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
 
@@ -340,7 +327,6 @@ 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)
             _mount_info_data = MountDataModel(self._clean_dict(_mount_info.response.to_dict()))
 
@@ -360,7 +346,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,7 +353,6 @@ 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)
             _rotator_info_data = RotatorDataModel(self._clean_dict(_rotator_info.response.to_dict()))
 
@@ -385,7 +369,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,7 +376,6 @@ 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
             )
@@ -414,7 +396,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,7 +403,6 @@ 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)
             _switch_info_data = SwitchDataModel(self._clean_dict(_switch_info.response.to_dict()))
 
@@ -439,7 +419,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,7 +426,6 @@ 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)
             _weather_info_data = WeatherDataModel(self._clean_dict(_weather_info.response.to_dict()))
 
@@ -464,7 +442,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 +462,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.2}/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.2
 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.2}/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.2",
     license="MIT",
     description="Python Wrapper for N.I.N.A. Advanced API",
     long_description=" ".join(