From 32d41181493b372fef655b25947ff748ba4a9087 Mon Sep 17 00:00:00 2001 From: Blaise Thompson Date: Thu, 22 Sep 2022 15:50:07 -0500 Subject: [PATCH 1/3] add happi support --- bluesky_queueserver_api/_happi.py | 28 ++++++++++++++++++++++++++++ requirements.txt | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 bluesky_queueserver_api/_happi.py diff --git a/bluesky_queueserver_api/_happi.py b/bluesky_queueserver_api/_happi.py new file mode 100644 index 0000000..2c5ad18 --- /dev/null +++ b/bluesky_queueserver_api/_happi.py @@ -0,0 +1,28 @@ +"""Support for happi - +pcdshub.github.io/happi +""" + + +import re +import copy + +from happi.item import HappiItem, EntryInfo # type: ignore + + +class REManagerAPIZMQItem(HappiItem): + zmq_control_addr = EntryInfo("ZMQ control address.", enforce=str, optional=False) + zmq_info_addr = EntryInfo("ZMQ info address.", enforce=str, optional=False) + kwargs = copy.copy(HappiItem.kwargs) + kwargs.default = {"zmq_control_addr": "{{zmq_control_addr}}", + "zmq_info_addr": "{{zmq_info_addr}}"} + device_class = EntryInfo(default="bluesky_queueserver_api.zmq.REManagerAPI") + + +class REManagerAPIHTTPItem(HappiItem): + http_server_uri = EntryInfo("HTTP server URI.", enforce=str, optional=False) + http_auth_provider = EntryInfo("HTTP auth provider.", enforce=str, optional=False) + kwargs = copy.copy(HappiItem.kwargs) + kwargs.default = {"http_server_uri": "{{http_server_uri}}", + "http_auth_provider": "{{http_auth_provider}}"} + device_class = EntryInfo(default="bluesky_queueserver_api.http.REManagerAPI") + diff --git a/requirements.txt b/requirements.txt index 86f1c52..07d4c3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ # List required packages in this file, one per line. bluesky-queueserver -httpx \ No newline at end of file +httpx +happi From 29e9c2ff1c2210efce8ea404f8223e739d8a541c Mon Sep 17 00:00:00 2001 From: Blaise Thompson Date: Thu, 22 Sep 2022 15:55:26 -0500 Subject: [PATCH 2/3] black --- bluesky_queueserver_api/_happi.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bluesky_queueserver_api/_happi.py b/bluesky_queueserver_api/_happi.py index 2c5ad18..15c3a31 100644 --- a/bluesky_queueserver_api/_happi.py +++ b/bluesky_queueserver_api/_happi.py @@ -13,8 +13,7 @@ class REManagerAPIZMQItem(HappiItem): zmq_control_addr = EntryInfo("ZMQ control address.", enforce=str, optional=False) zmq_info_addr = EntryInfo("ZMQ info address.", enforce=str, optional=False) kwargs = copy.copy(HappiItem.kwargs) - kwargs.default = {"zmq_control_addr": "{{zmq_control_addr}}", - "zmq_info_addr": "{{zmq_info_addr}}"} + kwargs.default = {"zmq_control_addr": "{{zmq_control_addr}}", "zmq_info_addr": "{{zmq_info_addr}}"} device_class = EntryInfo(default="bluesky_queueserver_api.zmq.REManagerAPI") @@ -22,7 +21,5 @@ class REManagerAPIHTTPItem(HappiItem): http_server_uri = EntryInfo("HTTP server URI.", enforce=str, optional=False) http_auth_provider = EntryInfo("HTTP auth provider.", enforce=str, optional=False) kwargs = copy.copy(HappiItem.kwargs) - kwargs.default = {"http_server_uri": "{{http_server_uri}}", - "http_auth_provider": "{{http_auth_provider}}"} + kwargs.default = {"http_server_uri": "{{http_server_uri}}", "http_auth_provider": "{{http_auth_provider}}"} device_class = EntryInfo(default="bluesky_queueserver_api.http.REManagerAPI") - From cc74b8e3e9396f0bbf4c9d03a13d0435608651f2 Mon Sep 17 00:00:00 2001 From: Blaise Thompson Date: Thu, 22 Sep 2022 15:57:25 -0500 Subject: [PATCH 3/3] flake8 --- bluesky_queueserver_api/_happi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bluesky_queueserver_api/_happi.py b/bluesky_queueserver_api/_happi.py index 15c3a31..6c65a98 100644 --- a/bluesky_queueserver_api/_happi.py +++ b/bluesky_queueserver_api/_happi.py @@ -3,7 +3,6 @@ """ -import re import copy from happi.item import HappiItem, EntryInfo # type: ignore