Remove a load more /names/

tests/test_camera.py

@@ -21,7 +21,7 @@ def camera_server(camera: SimulatedCamera) -> lt.ThingClient:
     """
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(camera, "/camera/")
+        server.add_thing(camera, "camera")
         with TestClient(server.app):
             yield server
 

tests/test_dummy_server.py

@@ -35,12 +35,12 @@ def thing_server():
         SimulatedCamera(
             shape=(240, 320, 3), canvas_shape=(1000, 1500, 3), frame_interval=0.01
         ),
-        "/camera/",
+        "camera",
     )
-    server.add_thing(DummyStage(step_time=0.000001), "/stage/")
-    server.add_thing(AutofocusThing(), "/autofocus/")
-    server.add_thing(CameraStageMapper(), "/camera_stage_mapping/")
-    assert os.path.exists(os.path.join(temp_folder.name, "camera/"))
+    server.add_thing(DummyStage(step_time=0.000001), "stage")
+    server.add_thing(AutofocusThing(), "autofocus")
+    server.add_thing(CameraStageMapper(), "camera_stage_mapping")
+    assert os.path.exists(os.path.join(temp_folder.name, "camera"))
     # Note: yield is important. If return is used the temp folder gets deleted
     # before the test runs. Silence PT022 as ruff doesn't think yield is needed.
     yield server  # noqa: PT022
@@ -60,7 +60,7 @@ def slower_client(thing_server):
     The step time for the stage is 100 microseconds rather than
     1 microsecond.
     """
-    thing_server.things["/stage/"].step_time = 0.0001
+    thing_server.things["stage"].step_time = 0.0001
     with TestClient(thing_server.app) as client:
         yield client
 
@@ -68,31 +68,31 @@ def slower_client(thing_server):
 def test_autofocus(slower_client):
     """Test Fast Autofocus can run doesn't raise an exception."""
     client = slower_client
-    autofocus = lt.ThingClient.from_url("/autofocus/", client)
+    autofocus = lt.ThingClient.from_url("autofocus", client)
     _ = autofocus.fast_autofocus()
 
 
 def test_grab_jpeg(client):
     """Check that grab_jpeg returns a blob that can be opened."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     blob = camera.grab_jpeg()
     _image = Image.open(blob.open())
 
 
 def test_capture_jpeg_metadata(client):
     """Check that the position is encoded into the image metadata."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     blob = camera.capture_jpeg()
     image = Image.open(blob.open())
     exif_dict = piexif.load(image.info["exif"])
     encoded_metadata = exif_dict["Exif"][piexif.ExifIFD.UserComment]
     metadata = json.loads(encoded_metadata)
-    assert "position" in metadata["/stage/"]
+    assert "position" in metadata["stage"]
 
 
 def test_stage(client):
     """Test moving th stage forwards and backwards."""
-    stage = lt.ThingClient.from_url("/stage/", client)
+    stage = lt.ThingClient.from_url("stage", client)
     start = stage.position
     move = {"x": 1, "y": 2, "z": 3}
     stage.move_relative(**move)
@@ -107,14 +107,14 @@ def test_stage(client):
 
 def test_capture_array(client):
     """Capture array from simulation and check the size is as expected."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     array = np.asarray(camera.capture_array())
     assert array.shape == (240, 320, 3)
 
 
 def test_camera_stage_mapping_calibration(client):
     """Check that camera stage mapping can run without an exception."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     camera.settling_time = 0
-    camera_stage_mapping = lt.ThingClient.from_url("/camera_stage_mapping/", client)
+    camera_stage_mapping = lt.ThingClient.from_url("camera_stage_mapping", client)
     camera_stage_mapping.calibrate_xy()

tests/test_legacy_api.py

@@ -12,8 +12,8 @@ def test_v2_endpoints(mocker):
     """Check that the expected v2 endpoints are added."""
     mock_server = mocker.Mock()
     # Mock the camera thing to mocke the lores_mjpeg stream get_frame()
-    mock_server.things = {"/camera/": mocker.Mock()}
-    mock_server.things["/camera/"].lores_mjpeg_stream.grab_frame = mocker.AsyncMock(
+    mock_server.things = {"camera": mocker.Mock()}
+    mock_server.things["camera"].lores_mjpeg_stream.grab_frame = mocker.AsyncMock(
         return_value="Mock Frame"
     )
     mock_app = mock_server.app

tests/test_server_config.py

@@ -102,7 +102,7 @@ def test_get_scans_dir_no_smart_scan():
     with open(FULL_CONFIG, "r", encoding="utf-8") as f_obj:
         config_dict = json.load(f_obj)
     # Delete smart scan
-    del config_dict["things"]["/smart_scan/"]
+    del config_dict["things"]["smart_scan"]
     # No SmartScanThing, should return None
     assert ofm_server._get_scans_dir(config_dict) is None
 
@@ -116,14 +116,14 @@ def test_get_scans_dir_bad_smart_scan_config():
     # Copy the dictionary
     broken_config = deepcopy(config_dict)
     # Delete all the smart scan kwargs
-    del broken_config["things"]["/smart_scan/"]["kwargs"]
+    del broken_config["things"]["smart_scan"]["kwargs"]
     # Creates an Error
     with pytest.raises(RuntimeError):
         ofm_server._get_scans_dir(broken_config)
 
     # Same thing should happen if just the scans_folder key is deleted
     broken_config = deepcopy(config_dict)
-    del broken_config["things"]["/smart_scan/"]["kwargs"]
+    del broken_config["things"]["smart_scan"]["kwargs"]
     # Creates an Error
     with pytest.raises(RuntimeError):
         ofm_server._get_scans_dir(broken_config)

tests/test_stack.py

@@ -270,7 +270,7 @@ def autofocus_thing():
     autofocus_thing = AutofocusThing()
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(autofocus_thing, "/autofocus/")
+        server.add_thing(autofocus_thing, "autofocus")
         with TestClient(server.app):
             yield autofocus_thing
 

tests/test_stage.py

@@ -41,7 +41,7 @@ def thing_server(dummy_stage):
     """Yield a server with a very basic configuration."""
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(dummy_stage, "/stage/")
+        server.add_thing(dummy_stage, "stage")
         yield server
 
 
@@ -49,7 +49,7 @@ def thing_server(dummy_stage):
 def stage_client(thing_server):
     """Yield a labthings ThingClient for the stage."""
     with TestClient(thing_server.app) as test_client:
-        yield lt.ThingClient.from_url("/stage/", client=test_client)
+        yield lt.ThingClient.from_url("stage", client=test_client)
 
 
 def test_override_base_movement():

tests/test_stage_measure.py

@@ -158,7 +158,7 @@ def rom_thing(example_rom_data) -> stage_measure.RangeofMotionThing:
 
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(rom_thing, "/rom_thing/")
+        server.add_thing(rom_thing, "rom_thing")
         with TestClient(server.app):
             yield rom_thing