pyninaapiio 0.0.7__tar.gz → 0.0.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyninaapiio
-Version: 0.0.7
+Version: 0.0.9
 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.9}/README.md

@@ -7,6 +7,11 @@
 pip install openapi-python-client
 
 openapi-python-client generate --url https://bump.sh/christian-photo/doc/advanced-api.json
+
+# or
+
+curl -O https://bump.sh/christian-photo/doc/advanced-api.json
+openapi-python-client generate --path advanced-api.json 
 ```
 
 ## advanced-api-client

pyninaapiio-0.0.9/advanced_api_client/__init__.py

@@ -0,0 +1,8 @@
+"""A client library for accessing Advanced API"""
+
+from .client import AuthenticatedClient, Client
+
+__all__ = (
+    "AuthenticatedClient",
+    "Client",
+)

pyninaapiio-0.0.9/pyninaapiio/__init__.py

@@ -0,0 +1,10 @@
+"""A client library for accessing Advanced API"""
+
+# from advanced_api_client.client import AuthenticatedClient, Client
+# from pyninaapiio.nina import NinaAPI
+
+# __all__ = (
+#     "AuthenticatedClient",
+#     "Client",
+#     "NinaAPI",
+# )

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

@@ -8,31 +8,44 @@ from typing import Any, Optional, TypedDict
 
 from typeguard import typechecked
 
-from pyninaapiio.models.fw_info_response_available_filters_item import FWInfoResponseAvailableFiltersItem
-from pyninaapiio.models.fw_info_response_selected_filter import FWInfoResponseSelectedFilter
-from pyninaapiio.models.guider_info_response_last_guide_step import GuiderInfoResponseLastGuideStep
-from pyninaapiio.models.guider_info_response_rms_error import GuiderInfoResponseRMSError
-from pyninaapiio.models.guider_info_response_state import GuiderInfoResponseState
-from pyninaapiio.models.mount_info_response_alignment_mode import MountInfoResponseAlignmentMode
-from pyninaapiio.models.mount_info_response_coordinates import MountInfoResponseCoordinates
-from pyninaapiio.models.mount_info_response_equatorial_system import MountInfoResponseEquatorialSystem
-from pyninaapiio.models.mount_info_response_primary_axis_rates_item import MountInfoResponsePrimaryAxisRatesItem
-from pyninaapiio.models.mount_info_response_secondary_axis_rates_item import MountInfoResponseSecondaryAxisRatesItem
-from pyninaapiio.models.mount_info_response_side_of_pier import MountInfoResponseSideOfPier
-from pyninaapiio.models.mount_info_response_tracking_modes_item import MountInfoResponseTrackingModesItem
-from pyninaapiio.models.mount_info_response_tracking_rate import MountInfoResponseTrackingRate
+from advanced_api_client.models.fw_info_response_available_filters_item import (
+    FWInfoResponseAvailableFiltersItem,
+)
+from advanced_api_client.models.fw_info_response_selected_filter import FWInfoResponseSelectedFilter
+from advanced_api_client.models.guider_info_response_last_guide_step import GuiderInfoResponseLastGuideStep
+from advanced_api_client.models.guider_info_response_rms_error import GuiderInfoResponseRMSError
+from advanced_api_client.models.guider_info_response_state import GuiderInfoResponseState
+from advanced_api_client.models.mount_info_response_alignment_mode import MountInfoResponseAlignmentMode
+from advanced_api_client.models.mount_info_response_coordinates import MountInfoResponseCoordinates
+from advanced_api_client.models.mount_info_response_equatorial_system import (
+    MountInfoResponseEquatorialSystem,
+)
+from advanced_api_client.models.mount_info_response_primary_axis_rates_item import (
+    MountInfoResponsePrimaryAxisRatesItem,
+)
+from advanced_api_client.models.mount_info_response_secondary_axis_rates_item import (
+    MountInfoResponseSecondaryAxisRatesItem,
+)
+from advanced_api_client.models.mount_info_response_side_of_pier import MountInfoResponseSideOfPier
+from advanced_api_client.models.mount_info_response_tracking_modes_item import (
+    MountInfoResponseTrackingModesItem,
+)
+from advanced_api_client.models.mount_info_response_tracking_rate import MountInfoResponseTrackingRate
+from advanced_api_client.types import Unset
 
 
 # #########################################################################
 # 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")
 
 
 # #########################################################################
@@ -175,11 +188,11 @@ class FilterWheelDataModel(TypedDict, total=False):
     Connected: bool
     Description: str
     DeviceId: str
-    DisplayName: str
+    DisplayName: str | Unset
     DriverInfo: str
     DriverVersion: str
     IsMoving: bool
-    Name: str
+    Name: str | Unset
     SelectedFilter: FWInfoResponseSelectedFilter
     SupportedActions: list[Any]
 
@@ -220,8 +233,8 @@ class FocuserDataModel(TypedDict, total=False):
     TempCompAvailable: bool
     SupportedActions: list[Any]
     Connected: bool
-    Name: str
-    DisplayName: str
+    Name: str | Unset
+    DisplayName: str | Unset
     Description: str
     DriverInfo: str
     DriverVersion: str
@@ -256,7 +269,7 @@ class GuiderDataModel(TypedDict, total=False):
     CanSetShiftRate: bool
     CanGetLockPosition: bool
     PixelScale: float
-    Name: str
+    Name: str | Unset
     DisplayName: str
     Description: str
     DriverInfo: str
@@ -311,73 +324,78 @@ class GuiderData:
 # Image
 # #########################################################################
 class ImageDataModel(TypedDict, total=False):
+    Connected: bool
     DecodedData: bytes
+    DecodedDataLength: int
     IndexLatest: int
 
 
 class ImageData:
     def __init__(self, *, data: ImageDataModel):
+        self.connected = data.get("Connected")
         self.decoded_data = data.get("DecodedData")
+        self.decoded_data_length = data.get("DecodedDataLength")
         self.index_latest = data.get("IndexLatest")
 
 
 # #########################################################################
 # Mount
 # #########################################################################
-class DeviceMountListDataModel(TypedDict):
-    items: dict
-
-
-@typechecked
-class DeviceMountListData:
-    """A representation of the geographic location."""
-
-    def __init__(self, *, data: DeviceMountListDataModel):
-        self.items = data.get("items")
-
-
-class DeviceMountDataModel(TypedDict):
-    HasSetupDialog: bool
-    Id: str
-    Name: str
-    DisplayName: str
-    Category: str
-    Connected: bool
-    Description: str
-    DriverInfo: str
-    DriverVersion: str
-    SupportedActions: list
-    # additional_properties: dict
-
-
-@typechecked
-class DeviceMountData:
-    """A representation of the geographic location."""
-
-    def __init__(self, *, data: DeviceMountDataModel):
-        self.has_setup_dialog = data.get("HasSetupDialog")
-        self.id = data.get("Id")
-        self.name = data.get("Name")
-        self.display_name = data.get("DisplayName")
-        self.category = data.get("Category")
-        self.connected = data.get("Connected")
-        self.description = data.get("Description")
-        self.driver_info = data.get("DriverInfo")
-        self.driver_version = data.get("DriverVersion")
-        self.supported_actions = data.get("SupportedActions")
-        # self.additional_properties = data.get("additional_properties")
+# class DeviceMountListDataModel(TypedDict):
+#     items: dict
+
+
+# @typechecked
+# class DeviceMountListData:
+#     """A representation of the geographic location."""
+
+#     def __init__(self, *, data: DeviceMountListDataModel):
+#         self.items = data.get("items")
+
+
+# class DeviceMountDataModel(TypedDict):
+#     HasSetupDialog: bool | Unset
+#     Id: str | Unset
+#     Name: str | Unset
+#     DisplayName: str | Unset
+#     Category: str | Unset
+#     Connected: bool
+#     Description: str | Unset
+#     DriverInfo: str | Unset
+#     DriverVersion: str | Unset
+#     SupportedActions: list | Unset
+#     # additional_properties: dict
+
+
+# @typechecked
+# class DeviceMountData:
+#     """A representation of the geographic location."""
+
+#     def __init__(self, *, data: DeviceMountDataModel):
+#         print("init")
+#         self.has_setup_dialog = data.get("HasSetupDialog")
+#         self.id = data.get("Id")
+#         self.name = data.get("Name")
+#         self.display_name = data.get("DisplayName")
+#         self.category = data.get("Category")
+#         self.connected = data.get("Connected")
+#         self.description = data.get("Description")
+#         self.driver_info = data.get("DriverInfo")
+#         self.driver_version = data.get("DriverVersion")
+#         self.supported_actions = data.get("SupportedActions")
+#         # self.additional_properties = data.get("additional_properties")
 
 
 class MountDataModel(TypedDict, total=False):
     Connected: bool
-    Name: str
-    DisplayName: str
+    Name: str | Unset
+    DisplayName: str | Unset
     AlignmentMode: MountInfoResponseAlignmentMode | Any
-    Altitude: float
+    Altitude: float | str
     AltitudeString: str
     AtHome: bool
     AtPark: bool
-    Azimuth: float
+    Azimuth: float | str
     AzimuthString: str
     CanFindHome: bool
     CanMovePrimaryAxis: bool
@@ -393,7 +411,7 @@ class MountDataModel(TypedDict, total=False):
     Coordinates: MountInfoResponseCoordinates | Any
     Declination: float
     DeclinationString: str
-    DeviceId: str
+    DeviceId: str | Unset
     EquatorialSystem: MountInfoResponseEquatorialSystem | Any
     GuideRateDeclinationArcsecPerSec: int | Any
     GuideRateRightAscensionArcsecPerSec: int | Any
@@ -562,7 +580,8 @@ class SwitchData:
 class NinaDevicesDataModel(TypedDict, total=False):
     # device_list_response_item
 
-    # Application: Optional[ApplicationData]
+    Connected: bool
+    Application: Optional[ApplicationData]
     Camera: Optional[CameraData]
     # Dome: Optional[DomeData]
     FilterWheel: Optional[FilterWheelData]
@@ -583,11 +602,12 @@ class NinaDevicesData:
     """A representation of the geographic location."""
 
     def __init__(self, *, data: NinaDevicesDataModel):
-        # self.application = data.get("Application")
-        self.camera = data["Camera"]
-        self.filterwheel = data["FilterWheel"]
-        self.focuser = data["Focuser"]
-        self.guider = data["Guider"]
-        self.image = data["Image"]
-        self.mount = data["Mount"]
-        self.switch = data["Switch"]
+        self.connected = data.get("Connected")
+        self.application = data.get("Application")
+        self.camera = data.get("Camera")
+        self.filterwheel = data.get("FilterWheel")
+        self.focuser = data.get("Focuser")
+        self.guider = data.get("Guider")
+        self.image = data.get("Image")
+        self.mount = data.get("Mount")
+        self.switch = data.get("Switch")