Switch to sansio websockets back-end

docs/source/quickstart/counter.py

@@ -34,4 +34,4 @@ def slowly_increase_counter(self) -> None:
     server = lt.ThingServer({"counter": TestThing})
 
     # We run the server using `uvicorn`:
-    uvicorn.run(server.app, port=5000)
+    uvicorn.run(server.app, port=5000, ws="websockets-sansio")

docs/source/tutorial/writing_a_thing.rst

@@ -35,7 +35,7 @@ Our first Thing will pretend to be a light: we can set its brightness and turn i
     if __name__ == "__main__":
         import uvicorn
         # We run the server using `uvicorn`:
-        uvicorn.run(server.app, port=5000)
+        uvicorn.run(server.app, port=5000, ws="websockets-sansio")
 
 If you visit `http://localhost:5000/light`, you will see the Thing Description. You can also interact with it using the OpenAPI documentation at `http://localhost:5000/docs`. If you visit `http://localhost:5000/light/brightness`, you can set the brightness of the light, and if you visit `http://localhost:5000/light/is_on`, you can see whether the light is on. Changing values on the server requires a ``PUT`` or ``POST`` request, which is easiest to do using the OpenAPI "Try it out" feature. Check that you can use a ``POST`` request to the ``toggle`` endpoint to turn the light on and off.
 

src/labthings_fastapi/server/cli.py

@@ -99,7 +99,7 @@
     """
     if args.config:
         if args.json:
             raise RuntimeError("Can't use both --config and --json simultaneously.")
         try:
             with open(args.config) as f:
                 return ThingServerConfig.model_validate_json(f.read())
@@ -161,7 +161,7 @@
         server = ThingServer.from_config(config, True if args.debug else False)
         if dry_run:
             return server
-        uvicorn.run(server.app, host=args.host, port=args.port)
+        uvicorn.run(server.app, host=args.host, port=args.port, ws="websockets-sansio")
     except BaseException as e:
         if args.fallback:
             print(f"Error: {e}")
@@ -174,11 +174,11 @@
                 )
             )
 
-            uvicorn.run(app, host=args.host, port=args.port)
+            uvicorn.run(app, host=args.host, port=args.port, ws="websockets-sansio")
         else:
             if isinstance(e, (ValidationError, ThingImportFailure)):
                 print(f"Error reading LabThings configuration:\n{e}")
                 sys.exit(3)
             else:
                 raise e
     return None  # This is required as we sometimes return the server

tests/test_fallback.py

@@ -170,7 +170,7 @@ def test_actual_server_fallback():
 
     # Starting the server is a SystemExit
     with pytest.raises(SystemExit, match="3") as excinfo:
-        uvicorn.run(server.app, port=5000)
+        uvicorn.run(server.app, port=5000, ws="websockets-sansio")
     server_error = excinfo.value
     assert server.startup_failure is not None
     assert server.startup_failure["thing"] == "bad_thing"

tests/test_mjpeg_stream.py

@@ -78,4 +78,4 @@ def test_mjpeg_stream(client):
     assert isinstance(telly, Telly)
     telly.framerate = 6
     telly.frame_limit = -1
-    uvicorn.run(server.app, port=5000)
+    uvicorn.run(server.app, port=5000, ws="websockets-sansio")