FastCS 0.12.0

Author: Tom-Willemsen

examples/epics_ca.py

@@ -17,7 +17,7 @@
 
     parser = argparse.ArgumentParser(description="Demo PVA ioc")
     parser.add_argument("-i", "--ip", type=str, default="127.0.0.1", help="IP to connect to")
-    parser.add_argument("-p", "--port", type=int, help="Port to connect to")
+    parser.add_argument("-p", "--port", type=int, help="Port to connect to", required=True)
     args = parser.parse_args()
 
     configure_logging(level=LogLevel.DEBUG)

pyproject.toml

@@ -27,8 +27,7 @@ classifiers = [
 ]
 
 dependencies = [
-  # Remove pin when new release made
-  "fastcs @ git+https://github.com/DiamondLightSource/FastCS",
+  "fastcs==0.12.0",
   "orjson",
 ]
 
@@ -44,7 +43,7 @@ doc = [
 ]
 lint = [
   "pyright==1.1.408",
-  "ruff==0.15.5",
+  "ruff==0.15.6",
 ]
 test = [
   "lewis",

src/fastcs_secop/_controllers.py

@@ -268,7 +268,15 @@ def __init__(self, settings: IPConnectionSettings, quirks: SecopQuirks | None =
 
     async def connect(self) -> None:
         """Connect to the SECoP node."""
-        await self._connection.connect(self._ip_settings)
+        try:
+            await self._connection.connect(self._ip_settings)
+            self._connected = True
+        except Exception as e:
+            logger.error("Failed to (re-)connect to SECoP node due to %s", e)
+            self._connected = False
+
+    async def reconnect(self) -> None:
+        await self.connect()
 
     async def deactivate(self) -> None:
         """Turn off asynchronous SECoP communication.

tests/test_against_emulator.py

@@ -31,6 +31,8 @@ def emulator():
             "stream: {bind_address: 127.0.0.1, port: 57677}",
         ],
         cwd=os.path.dirname(__file__),
+        stdout=sys.stdout,
+        stderr=sys.stderr,
     )
     try:
         yield

tests/test_controller.py

@@ -23,6 +23,18 @@ def controller():
     )
 
 
+async def test_connect_fails(controller):
+    with patch.object(controller._connection, "send_query", AsyncMock(side_effect=IOError)):
+        await controller.connect()
+        assert not controller._connected
+
+
+async def test_reconnect_fails(controller):
+    with patch.object(controller._connection, "send_query", AsyncMock(side_effect=IOError)):
+        await controller.reconnect()
+        assert not controller._connected
+
+
 async def test_ping_happy_path(controller):
     with patch.object(controller._connection, "send_query", AsyncMock(return_value="pong")):
         controller.connect = AsyncMock()