init

DiamondLightSource · Oct 3, 2023 · 7f1278b · 7f1278b
1 parent 340d0f3
commit 7f1278b
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 119 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,4 +14,22 @@
     },
     "esbonio.server.enabled": true,
     "esbonio.sphinx.confDir": "",
+    "cloudcode.kubeconfigs": [
+        {
+            "name": "/home/rose/.kube/config_k8s-p38",
+            "configPath": "/home/rose/.kube/config_k8s-p38"
+        },
+    ],
+    "cloudcode.active-kubeconfig": "/home/rose/.kube/config_k8s-p38",
+    "cloudcode.apigee.dockerOptions": {
+        "environmentVariables": {
+            "XTERM": "xterm-256color"
+        },
+        "dns": "8.8.8.8",
+        "detached": true,
+        "privileged": true,
+        "labels": {},
+        "volumes": {},
+        "additionalArguments": ""
+    },
 }
diff --git a/src/blueapi/core/bluesky_types.py b/src/blueapi/core/bluesky_types.py
@@ -132,8 +132,3 @@ def watch(self, __func: Callable) -> None:
         """
 
         ...
-
-
-@runtime_checkable
-class HasComponents(Protocol):
-    component_names: List[str]
diff --git a/src/blueapi/core/device_walk.py b/src/blueapi/core/device_walk.py
diff --git a/src/blueapi/plugins/data_writing_server.py b/src/blueapi/plugins/data_writing_server.py
diff --git a/src/blueapi/preprocessors/bundle_stage.py b/src/blueapi/preprocessors/bundle_stage.py
diff --git a/tests/plugins/test_data_writing.py b/tests/plugins/test_data_writing.py
@@ -14,7 +14,7 @@
 
 from blueapi.core import DataEvent, MsgGenerator
 from blueapi.plugins.data_writing import (
-    DATA_COLLECTION_NUMBER,
+    DATA_SESSION,
     DataCollectionProvider,
     InMemoryDataCollectionProvider,
     data_writing_wrapper,
@@ -79,15 +79,15 @@ def stageless_count() -> MsgGenerator:
         return (yield from bps.one_shot(detectors))
 
     def inner_plan() -> MsgGenerator:
-        yield from run_wrapper(stageless_count(), md={DATA_COLLECTION_NUMBER: 1})
-        yield from run_wrapper(stageless_count(), md={DATA_COLLECTION_NUMBER: 1})
-        yield from run_wrapper(stageless_count(), md={DATA_COLLECTION_NUMBER: 2})
-        yield from run_wrapper(stageless_count(), md={DATA_COLLECTION_NUMBER: 2})
+        yield from run_wrapper(stageless_count(), md={DATA_SESSION: 1})
+        yield from run_wrapper(stageless_count(), md={DATA_SESSION: 1})
+        yield from run_wrapper(stageless_count(), md={DATA_SESSION: 2})
+        yield from run_wrapper(stageless_count(), md={DATA_SESSION: 2})
 
     yield from stage_wrapper(inner_plan(), detectors)
 
 
-@run_decorator(md={DATA_COLLECTION_NUMBER: 12345})
+@run_decorator(md={DATA_SESSION: 12345})
 @set_run_key_decorator("outer")
 def nested_run_with_metadata(detectors: List[FakeFileWritingDetector]) -> MsgGenerator:
     yield from set_run_key_wrapper(bp.count(detectors), "inner")
@@ -114,7 +114,7 @@ def test_simple_run_gets_scan_number(
         provider,
     )
     assert docs[0].name == "start"
-    assert docs[0].doc[DATA_COLLECTION_NUMBER] == 0
+    assert docs[0].doc[DATA_SESSION] == 0
     assert_all_detectors_used_collection_numbers(docs, detectors, [0])
 
 
@@ -132,8 +132,8 @@ def test_multi_run_gets_scan_numbers(
     )
     start_docs = find_start_docs(docs)
     assert len(start_docs) == 2
-    assert start_docs[0].doc[DATA_COLLECTION_NUMBER] == 0
-    assert start_docs[1].doc[DATA_COLLECTION_NUMBER] == 1
+    assert start_docs[0].doc[DATA_SESSION] == 0
+    assert start_docs[1].doc[DATA_SESSION] == 1
     assert_all_detectors_used_collection_numbers(docs, detectors, [0, 1])
 
 
@@ -149,8 +149,8 @@ def test_multi_run_single_stage(
     )
     start_docs = find_start_docs(docs)
     assert len(start_docs) == 2
-    assert start_docs[0].doc[DATA_COLLECTION_NUMBER] == 0
-    assert start_docs[1].doc[DATA_COLLECTION_NUMBER] == 0
+    assert start_docs[0].doc[DATA_SESSION] == 0
+    assert start_docs[1].doc[DATA_SESSION] == 0
     assert_all_detectors_used_collection_numbers(docs, detectors, [0, 0])
 
 
@@ -166,10 +166,10 @@ def test_multi_run_single_stage_multi_group(
     )
     start_docs = find_start_docs(docs)
     assert len(start_docs) == 4
-    assert start_docs[0].doc[DATA_COLLECTION_NUMBER] == 0
-    assert start_docs[1].doc[DATA_COLLECTION_NUMBER] == 0
-    assert start_docs[2].doc[DATA_COLLECTION_NUMBER] == 0
-    assert start_docs[3].doc[DATA_COLLECTION_NUMBER] == 0
+    assert start_docs[0].doc[DATA_SESSION] == 0
+    assert start_docs[1].doc[DATA_SESSION] == 0
+    assert start_docs[2].doc[DATA_SESSION] == 0
+    assert start_docs[3].doc[DATA_SESSION] == 0
     assert_all_detectors_used_collection_numbers(docs, detectors, [0, 0, 0, 0])
 
 
@@ -185,9 +185,9 @@ def test_nested_run_with_metadata(
     )
     start_docs = find_start_docs(docs)
     assert len(start_docs) == 3
-    assert start_docs[0].doc[DATA_COLLECTION_NUMBER] == 0
-    assert start_docs[1].doc[DATA_COLLECTION_NUMBER] == 1
-    assert start_docs[2].doc[DATA_COLLECTION_NUMBER] == 2
+    assert start_docs[0].doc[DATA_SESSION] == 0
+    assert start_docs[1].doc[DATA_SESSION] == 1
+    assert start_docs[2].doc[DATA_SESSION] == 2
     assert_all_detectors_used_collection_numbers(docs, detectors, [1, 2])
 
 
@@ -203,9 +203,9 @@ def test_nested_run_without_metadata(
     )
     start_docs = find_start_docs(docs)
     assert len(start_docs) == 3
-    assert start_docs[0].doc[DATA_COLLECTION_NUMBER] == 0
-    assert start_docs[1].doc[DATA_COLLECTION_NUMBER] == 1
-    assert start_docs[2].doc[DATA_COLLECTION_NUMBER] == 2
+    assert start_docs[0].doc[DATA_SESSION] == 0
+    assert start_docs[1].doc[DATA_SESSION] == 1
+    assert start_docs[2].doc[DATA_SESSION] == 2
     assert_all_detectors_used_collection_numbers(docs, detectors, [1, 2])