Merge pull request #2 from pyobs/develop

v0.14

Author: thusser

pyobs_alpaca/device.py

@@ -25,8 +25,8 @@ class ServerGetResponse(NamedTuple):
 
 
 class AlpacaDevice(Object):
-    def __init__(self, server: str = None, port: int = None, type: str = None, device: int = None, version: str = 'v1',
-                 alive_parameter: str = 'Connected', *args, **kwargs):
+    def __init__(self, server: str, port: int, type: str, device: int, version: str = 'v1',
+                 alive_parameter: str = 'Connected', **kwargs: Any):
         """Initializes a new ASCOM Alpaca device.
 
         Args:
@@ -37,7 +37,7 @@ def __init__(self, server: str = None, port: int = None, type: str = None, devic
             version: Alpaca version.
             alive_parameter: Name of parameter to request in alive ping.
         """
-        Object.__init__(self, *args, **kwargs)
+        Object.__init__(self, **kwargs)
 
         # variables
         self._server = server
@@ -61,10 +61,10 @@ def __init__(self, server: str = None, port: int = None, type: str = None, devic
         self._session = requests.session()
 
     @property
-    def connected(self):
+    def connected(self) -> bool:
         return self._connected
 
-    def open(self):
+    def open(self) -> None:
         """Open device."""
         Object.open(self)
 
@@ -73,13 +73,13 @@ def open(self):
         if not self._connected:
             log.warning('Could not connect to ASCOM server.')
 
-    def _check_connected_thread(self):
+    def _check_connected_thread(self) -> None:
         """Periodically check, whether we're connected to ASCOM."""
         while not self.closing.is_set():
             self._check_connected()
             self.closing.wait(5)
 
-    def _check_connected(self):
+    def _check_connected(self) -> None:
         """Check, whether we're connected to ASCOM"""
 
         # get new status
@@ -156,7 +156,7 @@ def get(self, name: str) -> Any:
             raise ValueError('Not connected to ASCOM.')
         return self._get(name)
 
-    def put(self, name: str, timeout: float = 5, **values):
+    def put(self, name: str, timeout: float = 5, **values: Any) -> None:
         """Calls PUT on Alpaca server with given variable, which might set a variable or call a method.
 
         Args:

pyobs_alpaca/dome.py

@@ -1,11 +1,11 @@
 import logging
 import threading
-from typing import Tuple
+from typing import Tuple, Optional, Any
 
 from pyobs.events import RoofOpenedEvent, RoofClosingEvent
 from pyobs.mixins import FollowMixin
 
-from pyobs.interfaces import IMotion, IAltAz
+from pyobs.interfaces import IPointingAltAz
 from pyobs.modules import timeout
 from pyobs.modules.roof import BaseDome
 from pyobs.utils.enums import MotionStatus
@@ -18,19 +18,18 @@
 class AlpacaDome(FollowMixin, BaseDome):
     __module__ = 'pyobs_alpaca'
 
-    def __init__(self, tolerance: float = 3, park_az: float = 180, follow: str = None,
-                 *args, **kwargs):
+    def __init__(self, tolerance: float = 3, park_az: float = 180, follow: Optional[str] = None, **kwargs: Any):
         """Initializes a new ASCOM Alpaca telescope.
 
         Args:
             tolerance: Tolerance for azimuth.
             park_az: Azimuth for park position.
             follow: Name of other device (e.g. telescope) to follow.
         """
-        BaseDome.__init__(self, *args, **kwargs, motion_status_interfaces=['IDome'])
+        BaseDome.__init__(self, **kwargs, motion_status_interfaces=['IDome'])
 
         # device
-        self._device = AlpacaDevice(*args, **kwargs)
+        self._device = AlpacaDevice(**kwargs)
         self.add_child_object(self._device)
 
         # store
@@ -45,32 +44,36 @@ def __init__(self, tolerance: float = 3, park_az: float = 180, follow: str = Non
 
         # status
         self._shutter = None
-        self._altitude = 0
-        self._azimuth = 0
-        self._set_az = 0
+        self._altitude = 0.
+        self._azimuth = 0.
+        self._set_az = 0.
 
         # start thread
         self.add_thread_func(self._update_status)
 
         # mixins
-        FollowMixin.__init__(self, device=follow, interval=10, tolerance=tolerance, mode=IAltAz,
+        FollowMixin.__init__(self, device=follow, interval=10, tolerance=tolerance, mode=IPointingAltAz,
                              only_follow_when_ready=False)
 
-    def open(self):
+    def open(self) -> None:
         """Open module."""
         BaseDome.open(self)
 
         # init status to IDLE
         self._change_motion_status(MotionStatus.IDLE)
 
     @timeout(1200000)
-    def init(self, *args, **kwargs):
+    def init(self, **kwargs: Any) -> None:
         """Open dome.
 
         Raises:
             ValueError: If dome cannot be opened.
         """
 
+        # if already opening, ignore
+        if self.get_motion_status() == MotionStatus.INITIALIZING:
+            return
+
         # acquire lock
         with LockWithAbort(self._lock_shutter, self._abort_shutter):
             # log
@@ -99,7 +102,7 @@ def init(self, *args, **kwargs):
             self.comm.send_event(RoofOpenedEvent())
 
     @timeout(1200000)
-    def park(self, *args, **kwargs):
+    def park(self, **kwargs: Any) -> None:
         """Close dome.
 
         Raises:
@@ -138,7 +141,7 @@ def park(self, *args, **kwargs):
             log.info('Dome closed.')
             self._change_motion_status(MotionStatus.PARKED)
 
-    def _move(self, az: float, abort: threading.Event):
+    def _move(self, az: float, abort: threading.Event) -> None:
         """Move the roof and wait for it.
 
         Args:
@@ -171,7 +174,7 @@ def _move(self, az: float, abort: threading.Event):
         log.info('Moved to az=%.2f.', az)
 
     @timeout(1200000)
-    def move_altaz(self, alt: float, az: float, *args, **kwargs):
+    def move_altaz(self, alt: float, az: float, **kwargs: Any) -> None:
         """Moves to given coordinates.
 
         Args:
@@ -182,6 +185,10 @@ def move_altaz(self, alt: float, az: float, *args, **kwargs):
             ValueError: If device could not move.
         """
 
+        # do nothing, if not ready
+        if not self.is_ready():
+            return
+
         # destination az already set?
         if az == self._set_az:
             return
@@ -207,15 +214,15 @@ def move_altaz(self, alt: float, az: float, *args, **kwargs):
             # change status to TRACKING or POSITIONED, depending on whether we're tracking
             self._change_motion_status(MotionStatus.TRACKING if self.is_following else MotionStatus.POSITIONED)
 
-    def get_altaz(self, *args, **kwargs) -> Tuple[float, float]:
+    def get_altaz(self, **kwargs: Any) -> Tuple[float, float]:
         """Returns current Alt and Az.
 
         Returns:
             Tuple of current Alt and Az in degrees.
         """
         return self._altitude, self._azimuth
 
-    def stop_motion(self, device: str = None, *args, **kwargs):
+    def stop_motion(self, device: Optional[str] = None, **kwargs: Any) -> None:
         """Stop the motion.
 
         Args:
@@ -225,7 +232,7 @@ def stop_motion(self, device: str = None, *args, **kwargs):
         # not supported, but don't want to raise an exception
         pass
 
-    def is_ready(self, *args, **kwargs) -> bool:
+    def is_ready(self, **kwargs: Any) -> bool:
         """Returns the device is "ready", whatever that means for the specific device.
 
         Returns:
@@ -237,7 +244,7 @@ def is_ready(self, *args, **kwargs) -> bool:
                self.get_motion_status() not in [MotionStatus.PARKED, MotionStatus.INITIALIZING,
                                                 MotionStatus.PARKING, MotionStatus.ERROR, MotionStatus.UNKNOWN]
 
-    def _update_status(self):
+    def _update_status(self) -> None:
         """Update status from dome."""
 
         # loop forever

pyobs_alpaca/focuser.py

@@ -1,10 +1,10 @@
 import logging
 import threading
 import time
-from typing import List, Dict, Tuple, Any
+from typing import List, Dict, Tuple, Any, Optional
 
 from pyobs.modules import Module
-from pyobs.interfaces import IFocuser, IFitsHeaderProvider, IMotion
+from pyobs.interfaces import IFocuser, IFitsHeaderBefore
 from pyobs.mixins import MotionStatusMixin
 from pyobs.modules import timeout
 from pyobs.utils.enums import MotionStatus
@@ -14,18 +14,18 @@
 log = logging.getLogger(__name__)
 
 
-class AlpacaFocuser(MotionStatusMixin, IFocuser, IFitsHeaderProvider, Module):
+class AlpacaFocuser(MotionStatusMixin, IFocuser, IFitsHeaderBefore, Module):
     __module__ = 'pyobs_alpaca'
 
-    def __init__(self, *args, **kwargs):
-        Module.__init__(self, *args, **kwargs)
+    def __init__(self, **kwargs: Any):
+        Module.__init__(self, **kwargs)
 
         # device
-        self._device = AlpacaDevice(*args, **kwargs)
+        self._device = AlpacaDevice(**kwargs)
         self.add_child_object(self._device)
 
         # variables
-        self._focus_offset = 0
+        self._focus_offset = 0.
 
         # allow to abort motion
         self._lock_motion = threading.Lock()
@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
         # init mixins
         MotionStatusMixin.__init__(self, motion_status_interfaces=['IFocuser'])
 
-    def open(self):
+    def open(self) -> None:
         """Open module."""
         Module.open(self)
 
@@ -44,23 +44,23 @@ def open(self):
         # init status
         self._change_motion_status(MotionStatus.IDLE, interface='IFocuser')
 
-    def init(self, *args, **kwargs):
+    def init(self, **kwargs: Any) -> None:
         """Initialize device.
 
         Raises:
             ValueError: If device could not be initialized.
         """
         pass
 
-    def park(self, *args, **kwargs):
+    def park(self, **kwargs: Any) -> None:
         """Park device.
 
         Raises:
             ValueError: If device could not be parked.
         """
         pass
 
-    def get_fits_headers(self, namespaces: List[str] = None, *args, **kwargs) -> Dict[str, Tuple[Any, str]]:
+    def get_fits_header_before(self, namespaces: Optional[List[str]] = None, **kwargs: Any) -> Dict[str, Tuple[Any, str]]:
         """Returns FITS header for the current status of this module.
 
         Args:
@@ -86,7 +86,7 @@ def get_fits_headers(self, namespaces: List[str] = None, *args, **kwargs) -> Dic
             return {}
 
     @timeout(60000)
-    def set_focus(self, focus: float, *args, **kwargs):
+    def set_focus(self, focus: float, **kwargs: Any) -> None:
         """Sets new focus.
 
         Args:
@@ -96,7 +96,7 @@ def set_focus(self, focus: float, *args, **kwargs):
         # set focus + offset
         self._set_focus(focus + self._focus_offset)
 
-    def set_focus_offset(self, offset: float, *args, **kwargs):
+    def set_focus_offset(self, offset: float, **kwargs: Any) -> None:
         """Sets focus offset.
 
         Args:
@@ -107,15 +107,15 @@ def set_focus_offset(self, offset: float, *args, **kwargs):
         """
 
         # get current focus (without offset)
-        focus = self._device.get_focus()
+        focus = self.get_focus()
 
         # set offset
         self._focus_offset = offset
 
         # go to focus
         self._set_focus(focus + self._focus_offset)
 
-    def _set_focus(self, focus):
+    def _set_focus(self, focus: float) -> None:
         """Actually sets new focus.
 
         Args:
@@ -147,7 +147,7 @@ def _set_focus(self, focus):
             log.info('Reached new focus of %.2fmm.', self._device.get('Position') / step / 1000.)
             self._change_motion_status(MotionStatus.POSITIONED, interface='IFocuser')
 
-    def get_focus(self, *args, **kwargs) -> float:
+    def get_focus(self, **kwargs: Any) -> float:
         """Return current focus.
 
         Returns:
@@ -156,21 +156,21 @@ def get_focus(self, *args, **kwargs) -> float:
 
         # get pos and step size
         # StepSize is in microns, so multiply with 1000
-        pos = self._device.get('Position')
-        step = self._device.get('StepSize') * 1000.
+        pos = float(self._device.get('Position'))
+        step = float(self._device.get('StepSize')) * 1000.
 
         # return current focus - offset
         return pos / step - self._focus_offset
 
-    def get_focus_offset(self, *args, **kwargs) -> float:
+    def get_focus_offset(self, **kwargs: Any) -> float:
         """Return current focus offset.
 
         Returns:
             Current focus offset.
         """
         return self._focus_offset
 
-    def stop_motion(self, device: str = None, *args, **kwargs):
+    def stop_motion(self, device: Optional[str] = None, **kwargs: Any) -> None:
         """Stop the motion.
 
         Args:
@@ -180,7 +180,7 @@ def stop_motion(self, device: str = None, *args, **kwargs):
         # stop motion
         self._device.put('Halt')
 
-    def is_ready(self, *args, **kwargs) -> bool:
+    def is_ready(self, **kwargs: Any) -> bool:
         """Returns the device is "ready", whatever that means for the specific device.
 
         Returns: