pyninaapiio 0.0.13__tar.gz → 0.0.14__tar.gz

{pyninaapiio-0.0.13 → pyninaapiio-0.0.14}/PKG-INFO

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

{pyninaapiio-0.0.13 → pyninaapiio-0.0.14}/pyninaapiio/dataclasses.py

@@ -96,7 +96,7 @@ class CameraDataModel(TypedDict, total=False):
     OffsetMax: int
     OffsetMin: int
     PixelSize: int
-    ReadoutMode: int
+    ReadoutMode: str
     ReadoutModeForNormalImages: int
     ReadoutModeForSnapImages: int
     ReadoutModes: str
@@ -161,9 +161,9 @@ class CameraData:
         self.offset_max = data.get("OffsetMax")
         self.offset_min = data.get("OffsetMin")
         self.pixel_size = data.get("PixelSize")
-        self.readout_mode = data.get("ReadoutMode")
-        self.readout_mode_for_normal_images = data.get("ReadoutModeForNormalImages")
-        self.readout_mode_for_snap_images = data.get("ReadoutModeForSnapImages")
+        self.readout_mode = data.get("ReadoutModes")[data.get("ReadoutMode")]
+        self.readout_mode_for_normal_images = data.get("ReadoutModes")[data.get("ReadoutModeForNormalImages")]
+        self.readout_mode_for_snap_images = data.get("ReadoutModes")[data.get("ReadoutModeForSnapImages")]
         self.readout_modes = data.get("ReadoutModes")
         self.sensor_type = data.get("SensorType")
         self.sub_sample_height = data.get("SubSampleHeight")
@@ -300,6 +300,14 @@ class GuiderData:
         self.state = data.get("State")
         self.supported_actions = data.get("SupportedActions")
 
+    @property
+    def last_guide_step_ra(self) -> float:
+        return self.last_guide_step.get("RADistanceRaw")
+
+    @property
+    def last_guide_step_dec(self) -> float:
+        return self.last_guide_step.get("DECDistanceRaw")
+
     @property
     def rms_error_ra_arcsec(self) -> float:
         return self.rms_error.get("RA").get("Arcseconds")
@@ -482,11 +490,11 @@ class MountData:
         self.name = data.get("Name")
         self.display_name = data.get("DisplayName")
         self.alignment_mode = data.get("AlignmentMode")
-        self.altitude = data.get("Altitude")
+        self.altitude = round(data.get("Altitude"), 3) if data.get("Altitude") is not None else None
         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 = round(data.get("Azimuth"), 3) if data.get("Azimuth") is not None else None
         self.azimuth_string = data.get("AzimuthString")
         self.can_find_home = data.get("CanFindHome")
         self.can_move_primary_axis = data.get("CanMovePrimaryAxis")
@@ -510,15 +518,15 @@ class MountData:
         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 = round(data.get("RightAscension"), 3) if data.get("RightAscension") is not None else None
         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.site_latitude = round(data.get("SiteLatitude"), 3) if data.get("SiteLatitude") is not None else None
+        self.site_longitude = round(data.get("SiteLongitude"), 3) if data.get("SiteLongitude") is not None else None
         self.slewing = data.get("Slewing")
         self.supported_actions = data.get("SupportedActions")
         self.time_to_meridian_flip = data.get("TimeToMeridianFlip")
@@ -530,8 +538,7 @@ class MountData:
 
     @property
     def coordinates_ra(self) -> float:
-        print(self.coordinates)
-        return self.coordinates.get("RA")
+        return round(self.coordinates.get("RA"), 3) if self.coordinates.get("RA") is not None else None
 
     @property
     def coordinates_ra_str(self) -> str:
@@ -539,7 +546,7 @@ class MountData:
 
     @property
     def coordinates_dec(self) -> float:
-        return self.coordinates.get("Dec")
+        return round(self.coordinates.get("Dec"), 3) if self.coordinates.get("Dec") is not None else None
 
     @property
     def coordinates_dec_str(self) -> str:

{pyninaapiio-0.0.13 → pyninaapiio-0.0.14}/pyninaapiio/nina.py

@@ -207,7 +207,6 @@ class NinaAPI:
                     client=self._client, index=image_index_latest
                 )
                 self._image_details_data = image_details.response[0].to_dict()
-                print(self._image_details_data)
 
                 _LOGGER.debug(f"Retrieve capture with index {image_index_latest}")
                 image: GetImageIndexResponse200 = await get_image_index.asyncio(

{pyninaapiio-0.0.13 → pyninaapiio-0.0.14}/pyninaapiio.egg-info/PKG-INFO

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

{pyninaapiio-0.0.13 → pyninaapiio-0.0.14}/setup.py

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