From a72df5979ca687ffa948782427493a318a7e586b Mon Sep 17 00:00:00 2001 From: Mark Wolfman Date: Thu, 23 Jan 2025 14:11:52 -0600 Subject: [PATCH] Linting: black, isort, flake8. --- src/haven/plans/__init__.py | 2 +- src/queueserver/databroker_consumer.py | 59 +------------------------- 2 files changed, 2 insertions(+), 59 deletions(-) diff --git a/src/haven/plans/__init__.py b/src/haven/plans/__init__.py index 4074ed88..706cbfd7 100644 --- a/src/haven/plans/__init__.py +++ b/src/haven/plans/__init__.py @@ -43,7 +43,7 @@ def decorator(f): all_decorators = chain( # shutter_suspend_decorator(), open_shutters_decorator(), - baseline_decorator() + baseline_decorator(), ) # Apply decorators to Haven plans diff --git a/src/queueserver/databroker_consumer.py b/src/queueserver/databroker_consumer.py index ab37a941..13532c77 100755 --- a/src/queueserver/databroker_consumer.py +++ b/src/queueserver/databroker_consumer.py @@ -2,9 +2,8 @@ import sys from typing import Mapping, Sequence -import msgpack import databroker -from bluesky.callbacks.tiled_writer import TiledWriter +import msgpack from bluesky_kafka import BlueskyConsumer import haven @@ -112,59 +111,3 @@ def main(): if __name__ == "__main__": sys.exit(main()) - - -# import os -# import sys -# import logging -# from functools import partial - -# # This environmental variable needs to be set before importing haven -# # os.environ["HAVEN_CONFIG_FILES"] = f"{os.environ['BLUESKY_DIR']}/iconfig.toml" - -# import databroker -# import msgpack -# import msgpack_numpy as mpn -# from bluesky_kafka import MongoConsumer - -# import haven - - -# log = logging.getLogger() - - -# def main(): -# """Launch the mongo consumer.""" -# logging.basicConfig(level=logging.INFO) - -# bootstrap_servers = "localhost:9092" -# mongo_uri = haven.load_config()['mongo_consumer']['mongo_uri'] - -# kafka_deserializer = partial(msgpack.loads, object_hook=mpn.decode) -# auto_offset_reset = "latest" - -# topic_database_map = { -# "bluesky.documents.haven": "25idc-bluesky", -# } -# topics = list(topic_database_map.keys()) - -# # Create a MongoConsumer that will automatically listen to new beamline topics. -# # The parameter metadata.max.age.ms determines how often the consumer will check for -# # new topics. The default value is 5000ms. -# mongo_consumer = MongoConsumer( -# mongo_uri, -# topic_database_map, -# tls=False, -# topics=topics, -# bootstrap_servers=bootstrap_servers, -# group_id="mongodb", -# consumer_config={"auto.offset.reset": auto_offset_reset}, -# polling_duration=1.0, -# deserializer=kafka_deserializer, -# ) -# log.info("Starting mongo consumer") -# mongo_consumer.start() - - -# if __name__ == "__main__": -# sys.exit(main())