Add exception handling, debug config (#5)

DiamondLightSource · Oct 7, 2024 · b955ab1 · b955ab1
1 parent 502bbd9
commit b955ab1
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 22 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -18,6 +18,26 @@
                 // Enable break on exception when debugging tests (see: tests/conftest.py)
                 "PYTEST_RAISE": "1",
             },
+        },
+        {
+            "name": "Debug With Device",
+            "type": "debugpy",
+            "request": "launch",
+            "justMyCode": false,
+            "module": "thorlabs_mff_fastcs",
+            "purpose": [
+                "debug-test"
+            ],
+            "console": "integratedTerminal",
+            "args": [
+                "ioc",
+                "BL01C-EA-FLIP-01",
+                "/dev/serial/by-id/usb-Thorlabs_APT_Filter_Flipper_37007189-if00-port0",
+                "--baud",
+                "115200",
+                "--output-path",
+                "."
+            ],
         }
     ]
-}
+}
diff --git a/src/thorlabs_mff_fastcs/controllers.py b/src/thorlabs_mff_fastcs/controllers.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
 
 import asyncio
+import os
+import signal
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from datetime import datetime
@@ -113,11 +115,15 @@ async def put(
         attr: AttrW,
         value: Any,
     ) -> None:
-        if attr.dtype is bool:
-            value = int(value)
-        await controller.conn.send_command(
-            self.cmd(value),
-        )
+        try:
+            if attr.dtype is bool:
+                value = int(value)
+            await controller.conn.send_command(
+                self.cmd(value),
+            )
+        except Exception as e:
+            print(f"An error occurred: {e}")
+            os.kill(os.getpid(), signal.SIGTERM)
 
 
 @dataclass
@@ -133,25 +139,29 @@ async def update(
         controller: ThorlabsMFF,
         attr: AttrR,
     ) -> None:
-        if self.cache is not None:
-            response = await self.cache.get_response(
-                self.update_period,
-                controller.conn.send_query(
+        try:
+            if self.cache is not None:
+                response = await self.cache.get_response(
+                    self.update_period,
+                    controller.conn.send_query(
+                        self.cmd(),
+                        self.response_size,
+                    ),
+                )
+            else:
+                response = await controller.conn.send_query(
                     self.cmd(),
                     self.response_size,
-                ),
-            )
-        else:
-            response = await controller.conn.send_query(
-                self.cmd(),
-                self.response_size,
-            )
+                )
 
-        response = self.response_handler(response)
-        if attr.dtype is bool:
-            await attr.set(int(response))
-        else:
-            await attr.set(response)
+            response = self.response_handler(response)
+            if attr.dtype is bool:
+                await attr.set(int(response))
+            else:
+                await attr.set(response)
+        except Exception as e:
+            print(f"An error occurred: {e}")
+            os.kill(os.getpid(), signal.SIGTERM)
 
 
 class ThorlabsMFF(Controller):