pyninaapiio 0.0.5__tar.gz → 0.0.6__tar.gz

{pyninaapiio-0.0.5 → pyninaapiio-0.0.6}/PKG-INFO

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

{pyninaapiio-0.0.5 → pyninaapiio-0.0.6}/pyninaapiio/dataclasses.py

@@ -11,6 +11,14 @@ from typeguard import typechecked
 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_equatorial_system import MountInfoResponseEquatorialSystem
+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_primary_axis_rates_item import MountInfoResponsePrimaryAxisRatesItem
+from pyninaapiio.models.mount_info_response_secondary_axis_rates_item import MountInfoResponseSecondaryAxisRatesItem
+from pyninaapiio.models.mount_info_response_tracking_rate import MountInfoResponseTrackingRate
+from pyninaapiio.models.mount_info_response_coordinates import MountInfoResponseCoordinates
 
 
 # #########################################################################
@@ -298,17 +306,56 @@ class DeviceMountData:
         # self.additional_properties = data.get("additional_properties")
 
 
-class MountDataModel(TypedDict):
-    connected: bool
-    name: str
-    display_name: str
-    device_id: str
-    sidereal_time: float
-    right_ascension: float
-    declination: float
-    site_latitude: float
-    site_longitude: float
-    site_elevation: float
+class MountDataModel(TypedDict, total=False):
+    Connected: bool
+    Name: str
+    DisplayName: str
+    AlignmentMode: MountInfoResponseAlignmentMode | Any
+    Altitude: float
+    AltitudeString: str
+    AtHome: bool
+    AtPark: bool
+    Azimuth: float
+    AzimuthString: str
+    CanFindHome: bool
+    CanMovePrimaryAxis: bool
+    CanMoveSecondaryAxis: bool
+    CanPark: bool
+    CanPulseGuide: bool
+    CanSetDeclinationRate: bool
+    CanSetPark: bool
+    CanSetPierSide: bool
+    CanSetRightAscensionRate: bool
+    CanSetTrackingEnabled: bool
+    CanSlew: bool
+    Coordinates: MountInfoResponseCoordinates | Any
+    Declination: float
+    DeclinationString: str
+    DeviceId: str
+    EquatorialSystem: MountInfoResponseEquatorialSystem | Any
+    GuideRateDeclinationArcsecPerSec: int | Any
+    GuideRateRightAscensionArcsecPerSec: int | Any
+    HasUnknownEpoch: bool
+    HoursToMeridianString: str
+    IsPulseGuiding: bool
+    PrimaryAxisRates: MountInfoResponsePrimaryAxisRatesItem | Any
+    RightAscension: float
+    RightAscensionString: str
+    SecondaryAxisRates: MountInfoResponseSecondaryAxisRatesItem | Any
+    SideOfPier: MountInfoResponseSideOfPier | Any
+    SiderealTime: float
+    SiderealTimeString: str
+    SiteElevation: float
+    SiteLatitude: float
+    SiteLongitude: float
+    Slewing: bool
+    SupportedActions: list[str]
+    TimeToMeridianFlip: float
+    TimeToMeridianFlipString: str
+    TrackingEnabled: bool
+    TrackingModes: MountInfoResponseTrackingModesItem | Any
+    TrackingRate: MountInfoResponseTrackingRate | Any
+    UTCDate: str
 
 
 @typechecked
@@ -316,16 +363,55 @@ class MountData:
     """A representation of the geographic location."""
 
     def __init__(self, *, data: MountDataModel):
-        self.connected = data.get("connected")
-        self.name = data.get("name")
-        self.display_name = data.get("display_name")
-        self.device_id = data.get("device_id")
-        self.sidereal_time = data.get("sidereal_time")
-        self.right_ascension = data.get("right_ascension")
-        self.declination = data.get("declination")
-        self.site_latitude = data.get("site_latitude")
-        self.site_longitude = data.get("site_longitude")
-        self.site_elevation = data.get("site_elevation")
+        self.connected = data.get("Connected")
+        self.name = data.get("Name")
+        self.display_name = data.get("DisplayName")
+        self.alignment_mode = data.get("AlignmentMode")
+        self.altitude = data.get("Altitude")
+        self.altitude_string = data.get("AltitudeString")
+        self.at_home = data.get("AtHome")
+        self.at_park = data.get("AtPark")
+        self.azimuth = data.get("Azimuth")
+        self.azimuth_string = data.get("AzimuthString")
+        self.can_find_home = data.get("CanFindHome")
+        self.can_move_primary_axis = data.get("CanMovePrimaryAxis")
+        self.can_move_secondary_axis = data.get("CanMoveSecondaryAxis")
+        self.can_park = data.get("CanPark")
+        self.can_pulse_guide = data.get("CanPulseGuide")
+        self.can_set_declination_rate = data.get("CanSetDeclinationRate")
+        self.can_set_park = data.get("CanSetPark")
+        self.can_set_pier_side = data.get("CanSetPierSide")
+        self.can_set_right_ascension_rate = data.get("CanSetRightAscensionRate")
+        self.can_set_tracking_enabled = data.get("CanSetTrackingEnabled")
+        self.can_slew = data.get("CanSlew")
+        self.coordinates = data.get("Coordinates")
+        self.declination = data.get("Declination")
+        self.declination_string = data.get("DeclinationString")
+        self.device_id = data.get("DeviceId")
+        self.equatorial_system = data.get("EquatorialSystem")
+        self.guide_rate_declination_arcsec_per_sec = data.get("GuideRateDeclinationArcsecPerSec")
+        self.guide_rate_right_ascension_arcsec_per_sec = data.get("GuideRateRightAscensionArcsecPerSec")
+        self.has_unknown_epoch = data.get("HasUnknownEpoch")
+        self.hours_to_meridian_string = data.get("HoursToMeridianString")
+        self.is_pulse_guiding = data.get("IsPulseGuiding")
+        self.primary_axis_rates = data.get("PrimaryAxisRates")
+        self.right_ascension = data.get("RightAscension")
+        self.right_ascension_string = data.get("RightAscensionString")
+        self.secondary_axis_rates = data.get("SecondaryAxisRates")
+        self.side_of_pier = data.get("SideOfPier")
+        self.sidereal_time = data.get("SiderealTime")
+        self.sidereal_time_string = data.get("SiderealTimeString")
+        self.site_elevation = data.get("SiteElevation")
+        self.site_latitude = data.get("SiteLatitude")
+        self.site_longitude = data.get("SiteLongitude")
+        self.slewing = data.get("Slewing")
+        self.supported_actions = data.get("SupportedActions")
+        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_modes = data.get("TrackingModes")
+        self.tracking_rate = data.get("TrackingRate")
+        self.utc_date = data.get("UTCDate")
 
 
 # #########################################################################

{pyninaapiio-0.0.5 → pyninaapiio-0.0.6}/pyninaapiio/models/mount_info_response.py

@@ -365,11 +365,11 @@ class MountInfoResponse:
         d = dict(src_dict)
         connected = d.pop("Connected")
 
-        name = d.pop("Name")
+        name = d.pop("Name", UNSET)
 
-        display_name = d.pop("DisplayName")
+        display_name = d.pop("DisplayName", UNSET)
 
-        device_id = d.pop("DeviceId")
+        device_id = d.pop("DeviceId", UNSET)
 
         sidereal_time = d.pop("SiderealTime", UNSET)
 

{pyninaapiio-0.0.5 → pyninaapiio-0.0.6}/pyninaapiio/nina.py

@@ -53,10 +53,12 @@ from pyninaapiio.models.mount_info import MountInfo
 from pyninaapiio.models.switch_info import SwitchInfo
 from pyninaapiio.types import Response
 
+import traceback
+
 _LOGGER = logging.getLogger(__name__)
 logging.basicConfig(
     stream=sys.stdout,
-    level=logging.INFO,
+    level=logging.DEBUG,
     format="%(asctime)s %(levelname)s (%(threadName)s) [%(funcName)s] %(message)s",
     datefmt="%Y-%m-%d %H:%M:%S",
 )
@@ -117,12 +119,12 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve camera info")
             _camera_info: Response[CameraInfo] = await get_equipment_camera_info.asyncio(client=self._client)
-            print(_camera_info.response)
             _camera_info_data = CameraDataModel(_camera_info.response.to_dict())
 
             return CameraData(data=_camera_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Camera not connected. {ke}")
 
     # #########################################################################
@@ -132,12 +134,12 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve focuser info")
             _focuser_info: Response[FocuserInfo] = await get_equipment_focuser_info.asyncio(client=self._client)
-            print(_focuser_info.response)
             _focuser_info_data = FocuserDataModel(_focuser_info.response.to_dict())
 
             return FocuserData(data=_focuser_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Focuser not connected. {ke}")
 
     # #########################################################################
@@ -147,12 +149,12 @@ class NinaAPI:
         try:
             _LOGGER.debug(f"Retrieve guider info")
             _guider_info: Response[GuiderInfo] = await get_equipment_guider_info.asyncio(client=self._client)
-            print(_guider_info.response)
             _guider_info_data = GuiderDataModel(_guider_info.response.to_dict())
 
             return GuiderData(data=_guider_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Guider not connected. {ke}")
 
     # #########################################################################
@@ -174,6 +176,7 @@ class NinaAPI:
                 image_data = base64.b64decode(image.response)
                 self._image_data = image_data
             else:
+                traceback.print_exc()
                 _LOGGER.error(f"{image.error}")
         else:
             _LOGGER.debug(f"Returning previous capture with index {self._image_index_latest}")
@@ -213,6 +216,7 @@ class NinaAPI:
             return MountData(data=_mount_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Mount not connected. {ke}")
 
     # #########################################################################
@@ -227,6 +231,7 @@ class NinaAPI:
             return SwitchData(data=_switch_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Switch not connected. {ke}")
 
     # #########################################################################
@@ -251,4 +256,5 @@ class NinaAPI:
             return NinaDevicesData(data=_nina_info_data)
 
         except KeyError as ke:
+            traceback.print_exc()
             _LOGGER.warning(f"Nina not connected. {ke}")

{pyninaapiio-0.0.5 → pyninaapiio-0.0.6}/pyninaapiio.egg-info/PKG-INFO

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

{pyninaapiio-0.0.5 → pyninaapiio-0.0.6}/setup.py

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