v0.16.0

version 0.16.0

Author: thusser

pyobs_alpaca/device.py

@@ -90,7 +90,7 @@ async def _check_connected(self) -> None:
         try:
             await self._get(self._alive_param)
             connected = True
-        except ValueError:
+        except ConnectionError:
             connected = False
 
         # did it change?
@@ -129,22 +129,32 @@ async def _get(self, name: str) -> Any:
 
         Returns:
             Value of variable.
+
+        Raises:
+            ConnectionError: If an error occurred.
         """
 
         # get url
         url = self._build_alpaca_url(name)
 
         # request it
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url, timeout=5) as response:
-                if response.status != 200:
-                    raise ValueError("Could not contact server.")
-                json = await response.json()
-                resp = ServerGetResponse(**json)
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.get(url, timeout=5) as response:
+                    if response.status != 200:
+                        raise ConnectionError(
+                            f"ALPACA server responded with error {response.status}: {await response.text()}."
+                        )
+                    json = await response.json()
+                    resp = ServerGetResponse(**json)
+
+        except asyncio.TimeoutError:
+            # raise a ConnectionError instead
+            raise ConnectionError("Connection to ALPACA server timed out.")
 
         # check error
         if resp.ErrorNumber != 0:
-            raise ValueError("Server error: %s" % resp.ErrorMessage)
+            raise ConnectionError("Server error: %s" % resp.ErrorMessage)
 
         # return value
         return resp.Value
@@ -157,11 +167,14 @@ async def get(self, name: str) -> Any:
 
         Returns:
             Value of variable.
+
+        Raises:
+            ConnectionError: If an error occurred.
         """
 
         # only do it, if connected
         if not self._connected:
-            raise ValueError("Not connected to ASCOM.")
+            raise ConnectionError("Not connected to ASCOM.")
         return await self._get(name)
 
     async def put(self, name: str, timeout: float = 5, **values: Any) -> None:
@@ -171,26 +184,36 @@ async def put(self, name: str, timeout: float = 5, **values: Any) -> None:
             name: Name of variable.
             timeout: Time in sec for request.
             values: Values to set.
+
+        Raises:
+            ConnectionError: If an error occurred.
         """
 
         # only do it, if connected
         if not self._connected:
-            raise ValueError("Not connected to ASCOM.")
+            raise ConnectionError("Not connected to ASCOM.")
 
         # get url
         url = self._build_alpaca_url(name)
 
         # request it
-        async with aiohttp.ClientSession() as session:
-            async with session.put(url, data=values, timeout=timeout) as response:
-                if response.status != 200:
-                    raise ValueError("Could not contact server.")
-                json = await response.json()
-                resp = ServerPutResponse(**json)
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.put(url, data=values, timeout=timeout) as response:
+                    if response.status != 200:
+                        raise ConnectionError(
+                            f"ALPACA server responded with error {response.status}: {await response.text()}."
+                        )
+                    json = await response.json()
+                    resp = ServerPutResponse(**json)
+
+        except asyncio.TimeoutError:
+            # raise a ConnectionError instead
+            raise ConnectionError("Connection to ALPACA server timed out.")
 
         # check error
         if resp.ErrorNumber != 0:
-            raise ValueError("Server error: %s" % resp.ErrorMessage)
+            raise ConnectionError("Server error: %s" % resp.ErrorMessage)
 
 
 __all__ = ["AlpacaDevice"]

pyobs_alpaca/dome.py

@@ -10,6 +10,7 @@
 from pyobs.utils.enums import MotionStatus
 from pyobs.utils.parallel import event_wait
 from pyobs.utils.threads import LockWithAbort
+from pyobs.utils import exceptions as exc
 from .device import AlpacaDevice
 
 log = logging.getLogger("pyobs")
@@ -67,7 +68,7 @@ async def init(self, **kwargs: Any) -> None:
         """Open dome.
 
         Raises:
-            ValueError: If dome cannot be opened.
+            InitError: If dome cannot be opened.
         """
 
         # if already opening, ignore
@@ -81,7 +82,11 @@ async def init(self, **kwargs: Any) -> None:
             await self._change_motion_status(MotionStatus.INITIALIZING)
 
             # execute command
-            await self._device.put("OpenShutter")
+            try:
+                await self._device.put("OpenShutter")
+            except ConnectionError:
+                await self._change_motion_status(MotionStatus.UNKNOWN)
+                raise exc.InitError("Could not open dome.")
 
             # wait for it
             status = None
@@ -94,7 +99,11 @@ async def init(self, **kwargs: Any) -> None:
 
                 # wait a little and update
                 await event_wait(self._abort_shutter, 1)
-                status = await self._device.get("ShutterStatus")
+                try:
+                    status = await self._device.get("ShutterStatus")
+                except ConnectionError:
+                    await self._change_motion_status(MotionStatus.UNKNOWN)
+                    raise exc.InitError("Could not open dome.")
 
             # set new status
             log.info("Dome opened.")
@@ -106,7 +115,7 @@ async def park(self, **kwargs: Any) -> None:
         """Close dome.
 
         Raises:
-            ValueError: If dome cannot be opened.
+            ParkError: If dome cannot be opened.
         """
 
         # if already closing, ignore
@@ -121,8 +130,12 @@ async def park(self, **kwargs: Any) -> None:
             await self.comm.send_event(RoofClosingEvent())
 
             # send command for closing shutter and rotate to South
-            await self._device.put("CloseShutter")
-            await self._device.put("SlewToAzimuth", Azimuth=0)
+            try:
+                await self._device.put("CloseShutter")
+                await self._device.put("SlewToAzimuth", Azimuth=0)
+            except ConnectionError:
+                await self._change_motion_status(MotionStatus.UNKNOWN)
+                raise exc.ParkError("Could not close dome.")
 
             # wait for it
             status = None
@@ -131,11 +144,15 @@ async def park(self, **kwargs: Any) -> None:
                 if status == 4:
                     log.error("Could not close dome.")
                     await self._change_motion_status(MotionStatus.UNKNOWN)
-                    return
+                    raise exc.ParkError("Could not close dome.")
 
                 # wait a little and update
                 await event_wait(self._abort_shutter, 1)
-                status = await self._device.get("ShutterStatus")
+                try:
+                    status = await self._device.get("ShutterStatus")
+                except ConnectionError:
+                    await self._change_motion_status(MotionStatus.UNKNOWN)
+                    raise exc.ParkError("Could not close dome.")
 
             # set new status
             log.info("Dome closed.")
@@ -147,17 +164,24 @@ async def _move(self, az: float, abort: asyncio.Event) -> None:
         Args:
             az: Azimuth to move to.
             abort: Abort event.
+
+        Raises:
+            MoveError: If dome cannot be moved.
         """
 
         # execute command
-        await self._device.put("SlewToAzimuth", Azimuth=self._adjust_azimuth(az))
+        try:
+            await self._device.put("SlewToAzimuth", Azimuth=self._adjust_azimuth(az))
+        except ConnectionError:
+            await self._change_motion_status(MotionStatus.UNKNOWN)
+            raise exc.MoveError("Could not move dome.")
 
         # wait for it
         log_timer = 0
         while 180 - abs(abs(az - self._azimuth) - 180) > self._tolerance:
             # abort?
             if abort.is_set():
-                return
+                raise InterruptedError("Moving dome aborted.")
 
             # log?
             if log_timer == 0:
@@ -186,7 +210,7 @@ async def move_altaz(self, alt: float, az: float, **kwargs: Any) -> None:
             az: Az in deg to move to.
 
         Raises:
-            ValueError: If device could not move.
+            MoveError: If device could not be moved.
         """
 
         # do nothing, if not ready
@@ -261,7 +285,7 @@ async def _update_status(self) -> None:
             # get azimuth
             try:
                 self._azimuth = self._adjust_azimuth(await self._device.get("Azimuth"))
-            except ValueError:
+            except ConnectionError:
                 # ignore it
                 pass
 

pyobs_alpaca/focuser.py

@@ -8,6 +8,7 @@
 from pyobs.modules import timeout
 from pyobs.utils.enums import MotionStatus
 from pyobs.utils.threads import LockWithAbort
+from pyobs.utils import exceptions as exc
 from .device import AlpacaDevice
 
 log = logging.getLogger(__name__)
@@ -32,6 +33,9 @@ def __init__(self, **kwargs: Any):
         # init mixins
         MotionStatusMixin.__init__(self, motion_status_interfaces=["IFocuser"])
 
+        # register exception
+        exc.register_exception(exc.MotionError, 3, timespan=600, callback=self._default_remote_error_callback)
+
     async def open(self) -> None:
         """Open module."""
         await Module.open(self)
@@ -46,15 +50,15 @@ async def init(self, **kwargs: Any) -> None:
         """Initialize device.
 
         Raises:
-            ValueError: If device could not be initialized.
+            InitError: If device could not be initialized.
         """
         pass
 
     async def park(self, **kwargs: Any) -> None:
         """Park device.
 
         Raises:
-            ValueError: If device could not be parked.
+            ParkError: If device could not be parked.
         """
         pass
 
@@ -79,19 +83,20 @@ async def get_fits_header_before(
             # return header
             return {"TEL-FOCU": (pos / step, "Focus of telescope [mm]")}
 
-        except ValueError as e:
+        except ConnectionError as e:
             log.warning("Could not determine focus position: %s", e)
             return {}
 
     @timeout(60000)
     async def set_focus(self, focus: float, **kwargs: Any) -> None:
         """Sets new focus.
 
-        Args:
-            focus: New focus value.
+        Raises:
+            MoveError: If telescope cannot be moved.
         """
 
         # set focus + offset
+
         await self._set_focus(focus + self._focus_offset)
 
     async def set_focus_offset(self, offset: float, **kwargs: Any) -> None:
@@ -122,28 +127,34 @@ async def _set_focus(self, focus: float) -> None:
 
         # acquire lock
         async with LockWithAbort(self._lock_motion, self._abort_motion):
-            # get step size
-            step = await self._device.get("StepSize")
-
-            # calculating new focus and move it
-            log.info("Moving focus to %.2fmm...", focus)
-            await self._change_motion_status(MotionStatus.SLEWING, interface="IFocuser")
-            foc = int(focus * step * 1000.0)
-            await self._device.put("Move", Position=foc)
-
-            # wait for it
-            while abs(await self._device.get("Position") - foc) > 10:
-                # abort?
-                if self._abort_motion.is_set():
-                    log.warning("Setting focus aborted.")
-                    return
-
-                # sleep a little
-                await asyncio.sleep(0.1)
-
-            # finished
-            log.info("Reached new focus of %.2fmm.", await self._device.get("Position") / step / 1000.0)
-            await self._change_motion_status(MotionStatus.POSITIONED, interface="IFocuser")
+            try:
+                # get step size
+                step = await self._device.get("StepSize")
+
+                # calculating new focus and move it
+                log.info("Moving focus to %.2fmm...", focus)
+                await self._change_motion_status(MotionStatus.SLEWING, interface="IFocuser")
+                foc = int(focus * step * 1000.0)
+                await self._device.put("Move", Position=foc)
+
+                # wait for it
+                while abs(await self._device.get("Position") - foc) > 10:
+                    # abort?
+                    if self._abort_motion.is_set():
+                        await self._device.put("Halt")
+                        await self._change_motion_status(MotionStatus.POSITIONED, interface="IFocuser")
+                        raise InterruptedError("Setting focus aborted.")
+
+                    # sleep a little
+                    await asyncio.sleep(0.1)
+
+                # finished
+                log.info("Reached new focus of %.2fmm.", await self._device.get("Position") / step / 1000.0)
+                await self._change_motion_status(MotionStatus.POSITIONED, interface="IFocuser")
+
+            except ConnectionError:
+                await self._change_motion_status(MotionStatus.ERROR, interface="IFocuser")
+                raise exc.MoveError("Could not move focus.")
 
     async def get_focus(self, **kwargs: Any) -> float:
         """Return current focus.