refactor for GraphQLTransport

Author: hyperrealist

src/fastcs/transport/epics/ca/adapter.py

@@ -20,8 +20,10 @@ def __init__(self, options: EpicsCAOptions | None = None):
     def initialise(
         self,
         controller_api: ControllerAPI,
-        loop: asyncio.AbstractEventLoop,
+        loop: asyncio.AbstractEventLoop | None = None,
     ) -> None:
+        if not loop:
+            raise ValueError("EpicsCATransport expects a non-None loop")
         self._controller_api = controller_api
         self._loop = loop
         self._pv_prefix = self._options.ca_ioc.pv_prefix

src/fastcs/transport/epics/pva/adapter.py

@@ -18,8 +18,11 @@ def __init__(self, options: EpicsPVAOptions | None = None):
     def initialise(
         self,
         controller_api: ControllerAPI,
-        loop: asyncio.AbstractEventLoop,
+        loop: asyncio.AbstractEventLoop | None = None,
     ) -> None:
+        if not loop:
+            raise ValueError("EpicsPVATransport expects a non-None loop")
+
         self._controller_api = controller_api
         self._pv_prefix = self.options.pva_ioc.pv_prefix
         self._ioc = P4PIOC(self.options.pva_ioc.pv_prefix, controller_api)

src/fastcs/transport/graphql/adapter.py

@@ -1,3 +1,5 @@
+import asyncio
+
 from fastcs.controller_api import ControllerAPI
 from fastcs.transport import Transport
 
@@ -8,12 +10,14 @@
 class GraphQLTransport(Transport):
     """GraphQL transport."""
 
-    def __init__(
+    def __init__(self, options: GraphQLOptions | None = None):
+        self._options = options or GraphQLOptions()
+
+    def initialise(
         self,
         controller_api: ControllerAPI,
-        options: GraphQLOptions | None = None,
+        loop: asyncio.AbstractEventLoop | None = None,
     ):
-        self._options = options or GraphQLOptions()
         self._server = GraphQLServer(controller_api)
 
     @property

src/fastcs/transport/transport.py

@@ -34,6 +34,6 @@ def context(self) -> dict[str, Any]:
     def initialise(
         self,
         controller_api: ControllerAPI,
-        loop: asyncio.AbstractEventLoop,
+        loop: asyncio.AbstractEventLoop | None = None,
     ) -> None:
         pass

tests/transport/graphQL/test_graphql.py

@@ -66,7 +66,9 @@ def nest_response(path: list[str], value: Any) -> dict:
 
 
 def create_test_client(gql_controller_api: AssertableControllerAPI) -> TestClient:
-    return TestClient(GraphQLTransport(gql_controller_api)._server._app)
+    graphql_transport = GraphQLTransport()
+    graphql_transport.initialise(gql_controller_api)
+    return TestClient(graphql_transport._server._app)
 
 
 class TestGraphQLServer: