pyninaapiio 0.2.2.13.7__tar.gz → 0.2.2.13.9__tar.gz

{pyninaapiio-0.2.2.13.7 → pyninaapiio-0.2.2.13.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyninaapiio
-Version: 0.2.2.13.7
+Version: 0.2.2.13.9
 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.7 → pyninaapiio-0.2.2.13.9}/pyninaapiio/dataclasses.py

@@ -303,6 +303,62 @@ class FilterWheelData(NinaData):
         return self.selected_filter.get("Name") if self.selected_filter is not None else ""
 
 
+# #########################################################################
+# FlatDevice
+# #########################################################################
+class FlatDeviceDataModel(TypedDict, total=False):
+    # response=FlatDeviceInfoResponse(cover_state=<FlatDeviceInfoResponseCoverState.CLOSED: 'Closed'>, localized_cover_state='Closed', localized_light_on_state='Off', light_on=False, brightness=0, supports_open_close=True, min_brightness=0, max_brightness=255, supports_on_off=True, supported_actions=['Dew Heater OFF', 'Dew Heater Level 1', 'Dew Heater Level 2', 'Dew Heater Level 3'], connected=True, name='WandererEmpire Cover 1', display_name='WandererEmpire Cover 1 (ASCOM)', description='Driver for WandererCover Device 1', driver_info='Driver for WandererCover Device 1', driver_version='2.0', device_id='ASCOM.WandererCover1.CoverCalibrator', additional_properties={}), error='', status_code=200, success=True, type='API', additional_properties={}
+    Connected: bool
+    Name: str | Unset
+    DisplayName: str | Unset
+    Description: str | Unset
+    DeviceId: str | Unset
+    DriverInfo: str | Unset
+    DriverVersion: str | Unset
+    SupportedActions: list[Any] | Unset
+
+    Brightness: int | Unset
+    CoverState: str | Unset
+    LightOn: bool | Unset
+    LocalizedCoverState: str | Unset
+    LocalizedLightOnState: str | Unset
+    MaxBrightness: int | Unset
+    MinBrightness: int | Unset
+    SupportsOnOff: bool | Unset
+    SupportsOpenClose: bool | Unset
+
+
+@typechecked
+class FlatDeviceData(NinaData):
+    def __init__(self, *, data: FlatDeviceDataModel):
+        self.connected = data.get("Connected")
+        self.name = data.get("Name")
+        self.display_name = data.get("DisplayName")
+        self.description = data.get("Description")
+        self.device_id = data.get("DeviceId")
+        self.driver_info = data.get("DriverInfo")
+        self.driver_version = data.get("DriverVersion")
+        self.supported_actions = data.get("SupportedActions")
+
+        self.brightness = data.get("Brightness")
+        self.cover_state = data.get("CoverState")
+        self.light_on = data.get("LightOn")
+        self.localized_cover_state = data.get("LocalizedCoverState")
+        self.localized_light_on_state = data.get("LocalizedLightOnState")
+        self.max_brightness = data.get("MaxBrightness")
+        self.min_brightness = data.get("MinBrightness")
+        self.supports_on_off = data.get("SupportsOnOff")
+        self.supports_open_close = data.get("SupportsOpenClose")
+
+    # @property
+    # def selected_filter_id(self) -> int:
+    #     return self.selected_filter.get("Id") if self.selected_filter is not None else -1
+
+    # @property
+    # def selected_filter_name(self) -> str:
+    #     return self.selected_filter.get("Name") if self.selected_filter is not None else ""
+
+
 # #########################################################################
 # Focuser
 # #########################################################################
@@ -349,6 +405,7 @@ class FocuserData(NinaData):
 # #########################################################################
 # Guider
 # #########################################################################
+# TODO: Remove Any
 class GuiderDataModel(TypedDict, total=False):
     Connected: bool
     Name: str | Unset
@@ -420,6 +477,7 @@ class GuiderData(NinaData):
 # #########################################################################
 # Image
 # #########################################################################
+# TODO: Remove Any
 class ImageDataModel(TypedDict, total=False):
     Connected: bool
     CameraName: str
@@ -880,7 +938,7 @@ class NinaDevicesDataModel(TypedDict, total=False):
     Camera: Optional[CameraData]
     Dome: Optional[DomeData]
     FilterWheel: Optional[FilterWheelData]
-    # FlatPanel: Optional[FlatPanelData]
+    FlatDevice: Optional[FlatDeviceData]
     Focuser: Optional[FocuserData]
     Guider: Optional[GuiderData]
     Image: Optional[ImageData]
@@ -903,6 +961,7 @@ class NinaDevicesData(NinaData):
         self.camera = data.get("Camera")
         self.dome = data.get("Dome")
         self.filterwheel = data.get("FilterWheel")
+        self.flatdevice = data.get("FlatDevice")
         self.focuser = data.get("Focuser")
         self.guider = data.get("Guider")
         self.image = data.get("Image")

{pyninaapiio-0.2.2.13.7 → pyninaapiio-0.2.2.13.9}/pyninaapiio/nina.py

@@ -12,6 +12,7 @@ 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.dome import get_equipment_dome_info
 from .advanced_api_client.api.filter_wheel import get_equipment_filterwheel_info
+from .advanced_api_client.api.flat_panel import get_equipment_flatdevice_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
@@ -24,6 +25,7 @@ from .advanced_api_client.client import Client
 from .advanced_api_client.models.camera_info import CameraInfo
 from .advanced_api_client.models.focuser_info import FocuserInfo
 from .advanced_api_client.models.fw_info import FWInfo
+from .advanced_api_client.models.flat_device_info import FlatDeviceInfo
 from .advanced_api_client.models.get_image_history_response_200 import GetImageHistoryResponse200
 from .advanced_api_client.models.get_image_index_bayer_pattern import GetImageIndexBayerPattern
 from .advanced_api_client.models.get_image_index_response_200 import GetImageIndexResponse200
@@ -44,6 +46,8 @@ from .dataclasses import (
     DomeDataModel,
     FilterWheelData,
     FilterWheelDataModel,
+    FlatDeviceData,
+    FlatDeviceDataModel,
     FocuserData,
     FocuserDataModel,
     GuiderData,
@@ -86,6 +90,7 @@ class NinaAPI:
         camera_enabled=False,
         dome_enabled=False,
         filterwheel_enabled=False,
+        flatdevice_enabled=False,
         focuser_enabled=False,
         guider_enabled=False,
         image_enabled=False,
@@ -102,6 +107,7 @@ class NinaAPI:
         self._camera_enabled = camera_enabled
         self._dome_enabled = dome_enabled
         self._filterwheel_enabled = filterwheel_enabled
+        self._flatdevice_enabled = flatdevice_enabled
         self._focuser_enabled = focuser_enabled
         self._guider_enabled = guider_enabled
         self._image_enabled = image_enabled
@@ -221,6 +227,30 @@ class NinaAPI:
             _LOGGER.debug(f"KeyError (Filterwheel): {ke}")
             return FilterWheelData(data={"Connected": False})
 
+    # #########################################################################
+    # Flat Device
+    # #########################################################################
+    async def flatdevice_info(self, client):
+        try:
+            _flatdevice_info: Response[FlatDeviceInfo] = await get_equipment_flatdevice_info.asyncio(client=client)
+            _LOGGER.debug(_flatdevice_info)
+            _flatdevice_info_data = FlatDeviceDataModel(self._clean_dict(_flatdevice_info.response.to_dict()))
+
+            return FlatDeviceData(data=_flatdevice_info_data)
+
+        except ConnectError as ce:
+            _LOGGER.warning("Astro server not available.")
+            return FlatDeviceData(data={"Connected": False})
+        except ConnectTimeout as ct:
+            _LOGGER.warning("N.I.N.A. not available.")
+            return FlatDeviceData(data={"Connected": False})
+        except TypeCheckError as tce:
+            _LOGGER.warning(f"TypeCheckError (FlatDevice): {tce}")
+            return FlatDeviceData(data={"Connected": False})
+        except KeyError as ke:
+            _LOGGER.debug(f"KeyError (FlatDevice): {ke}")
+            return FlatDeviceData(data={"Connected": False})
+
     # #########################################################################
     # Focuser
     # #########################################################################
@@ -286,7 +316,7 @@ class NinaAPI:
             _LOGGER.warning("N.I.N.A. not available.")
             return ImageData(data={"Connected": False})
 
-        if _image_index_latest > self._image_index_latest:
+        if _image_index_latest != self._image_index_latest:  # or 1 == 1:
             self._image_index_latest = _image_index_latest
 
             try:
@@ -309,16 +339,17 @@ class NinaAPI:
                 )
                 if image.success:
                     image_data = base64.b64decode(image.response)
+                    _LOGGER.debug(f"Image: Retrieve capture successful {len(image_data)}")
                     self._image_data = image_data
                 else:
                     _LOGGER.error(f"{image.error}")
             except ReadTimeout as rt:
                 _LOGGER.warning("Image: Timeout retrieving capture. Try increasing the timeout.")
                 return ImageData(data={"Connected": False})
-        # else:
-        #     _LOGGER.debug(f"Image: Returning previous capture with index {self._image_index_latest}")
+        else:
+            _LOGGER.debug(f"Image: Returning previous capture with index {self._image_index_latest}")
 
-        # _LOGGER.debug(f"Image Capture Index: {self._image_index_latest}")
+        _LOGGER.debug(f"Image Capture Index: {self._image_index_latest}")
         _camera_data = ImageDataModel(
             {
                 "Connected": True,
@@ -486,6 +517,7 @@ class NinaAPI:
                     "Camera": await self.camera_info(client) if self._camera_enabled else None,
                     "Dome": await self.dome_info(client) if self._dome_enabled else None,
                     "FilterWheel": await self.filterwheel_info(client) if self._filterwheel_enabled else None,
+                    "FlatDevice": await self.flatdevice_info(client) if self._flatdevice_enabled else None,
                     "Focuser": await self.focuser_info(client) if self._focuser_enabled else None,
                     "Guider": await self.guider_info(client) if self._guider_enabled else None,
                     "Image": await self.image_latest(client) if self._image_enabled else None,

{pyninaapiio-0.2.2.13.7 → pyninaapiio-0.2.2.13.9}/pyninaapiio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyninaapiio
-Version: 0.2.2.13.7
+Version: 0.2.2.13.9
 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.7 → pyninaapiio-0.2.2.13.9}/setup.py

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