pyninaapiio 0.0.7__tar.gz → 0.0.8__tar.gz

{pyninaapiio-0.0.7 → pyninaapiio-0.0.8}/PKG-INFO

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

{pyninaapiio-0.0.7 → pyninaapiio-0.0.8}/pyninaapiio/dataclasses.py

@@ -27,12 +27,14 @@ from pyninaapiio.models.mount_info_response_tracking_rate import MountInfoRespon
 # Application
 # #########################################################################
 class ApplicationDataModel(TypedDict, total=False):
-    Dummy: int
+    Connected: bool
+    Version: str
 
 
 class ApplicationData:
     def __init__(self, *, data: ApplicationDataModel):
-        self.dummy = data.get("Dummy")
+        self.version = data.get("Version")
+        self.connected = data.get("Connected")
 
 
 # #########################################################################
@@ -562,7 +564,7 @@ class SwitchData:
 class NinaDevicesDataModel(TypedDict, total=False):
     # device_list_response_item
 
-    # Application: Optional[ApplicationData]
+    Application: Optional[ApplicationData]
     Camera: Optional[CameraData]
     # Dome: Optional[DomeData]
     FilterWheel: Optional[FilterWheelData]
@@ -583,7 +585,7 @@ class NinaDevicesData:
     """A representation of the geographic location."""
 
     def __init__(self, *, data: NinaDevicesDataModel):
-        # self.application = data.get("Application")
+        self.application = data.get("Application")
         self.camera = data["Camera"]
         self.filterwheel = data["FilterWheel"]
         self.focuser = data["Focuser"]

{pyninaapiio-0.0.7 → pyninaapiio-0.0.8}/pyninaapiio/nina.py

@@ -4,6 +4,9 @@ import sys
 import traceback
 from pprint import pprint as pp
 
+from httpx import ConnectTimeout
+
+from pyninaapiio.api.application import get_version
 from pyninaapiio.api.camera import get_equipment_camera_info
 from pyninaapiio.api.filter_wheel import get_equipment_filterwheel_info
 from pyninaapiio.api.focuser import get_equipment_focuser_info
@@ -40,6 +43,7 @@ from pyninaapiio.models.focuser_info import FocuserInfo
 from pyninaapiio.models.fw_info import FWInfo
 from pyninaapiio.models.get_image_history_response_200 import GetImageHistoryResponse200
 from pyninaapiio.models.get_image_index_response_200 import GetImageIndexResponse200
+from pyninaapiio.models.get_version_response_200 import GetVersionResponse200
 from pyninaapiio.models.guider_info import GuiderInfo
 from pyninaapiio.models.mount_info import MountInfo
 from pyninaapiio.models.switch_info import SwitchInfo
@@ -53,6 +57,8 @@ logging.basicConfig(
     datefmt="%Y-%m-%d %H:%M:%S",
 )
 
+API_TIMEOUT = 10
+
 
 # async with client as client:
 class NinaAPI:
@@ -61,7 +67,7 @@ class NinaAPI:
         # session: Optional[ClientSession] = None,
         session=None,
         base_url="http://192.168.1.234:1888/v2/api",
-        # application_enabled=False,
+        application_enabled=False,
         camera_enabled=False,
         filterwheel_enabled=False,
         focuser_enabled=False,
@@ -71,8 +77,8 @@ class NinaAPI:
         switch_enabled=False,
     ):
         self._session = session
-        self._client = Client(base_url=base_url)
-        # self._application_enabled = application_enabled
+        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
         self._focuser_enabled = focuser_enabled
@@ -90,19 +96,18 @@ class NinaAPI:
     # #########################################################################
     # Application
     # #########################################################################
-    # async def application_info(self):
-    #     try:
-    #         _LOGGER.debug(f"Retrieve application info")
-    #         _application_info: Response[ApplicationInfo] = await get_equipment_application_info.asyncio(
-    #             client=self._client
-    #         )
-    #         print(_application_info.response)
-    #         _application_info_data = ApplicationDataModel(_application_info.response.to_dict())
+    async def application_info(self):
+        try:
+            _LOGGER.debug(f"Retrieve application info")
+            _application_info: Response[GetVersionResponse200] = await get_version.asyncio(client=self._client)
+            print(_application_info)
+            _application_info_data = ApplicationDataModel({"Version": _application_info.response, "Connected": True})
 
-    #         return ApplicationData(data=_application_info_data)
+            return ApplicationData(data=_application_info_data)
 
-    #     except KeyError as ke:
-    #         _LOGGER.warning(f"Application not connected. {ke}")
+        except KeyError as ke:
+            traceback.print_exc()
+            _LOGGER.warning(f"Application not connected. {ke}")
 
     # #########################################################################
     # Camera
@@ -250,7 +255,7 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve nina info")
             _nina = {
-                # "Application": await self.application_info() if application_enabled else None,
+                "Application": await self.application_info() if self._application_enabled else None,
                 "Camera": await self.camera_info() if self._camera_enabled else None,
                 "FilterWheel": await self.filterwheel_info() if self._filterwheel_enabled else None,
                 "Focuser": await self.focuser_info() if self._focuser_enabled else None,
@@ -263,6 +268,8 @@ class NinaAPI:
 
             return NinaDevicesData(data=_nina_info_data)
 
+        except ConnectTimeout as ct:
+            _LOGGER.debug(f"Nina not available.")
         except KeyError as ke:
             traceback.print_exc()
-            _LOGGER.warning(f"Nina not connected. {ke}")
+            _LOGGER.debug(f"Nina not connected. {ke}")

{pyninaapiio-0.0.7 → pyninaapiio-0.0.8}/pyninaapiio.egg-info/PKG-INFO

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

{pyninaapiio-0.0.7 → pyninaapiio-0.0.8}/setup.py

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