From 6f408b195490820008eaea2112aa714bbae4f62a Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 24 Oct 2025 16:28:42 +0100 Subject: [PATCH 1/7] ExecuteFSMCommandRequest message. --- .../druncschema/controller_pb2.py | 72 ++++++++++--------- .../druncschema/controller_pb2.pyi | 30 ++++++++ .../druncschema/controller_pb2_grpc.py | 6 +- schema/druncschema/controller.proto | 10 ++- 4 files changed, 79 insertions(+), 39 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/python_not_for_dunedaq/druncschema/controller_pb2.py index e0b5ae2..b45af53 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2.py @@ -28,7 +28,7 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\x8d\x01\n\x12\x46SMCommandResponse\x12=\n\x04\x66lag\x18\x01 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xea\x08\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12T\n\x13\x65xecute_fsm_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\x8d\x01\n\x12\x46SMCommandResponse\x12=\n\x04\x66lag\x18\x01 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\x86\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12p\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,40 +37,42 @@ DESCRIPTOR._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001' - _globals['_FSMRESPONSEFLAG']._serialized_start=3030 - _globals['_FSMRESPONSEFLAG']._serialized_end=3184 + _globals['_FSMRESPONSEFLAG']._serialized_start=3259 + _globals['_FSMRESPONSEFLAG']._serialized_end=3413 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 - _globals['_STATUSRESPONSE']._serialized_start=432 - _globals['_STATUSRESPONSE']._serialized_end=676 - _globals['_DESCRIBERESPONSE']._serialized_start=679 - _globals['_DESCRIBERESPONSE']._serialized_end=926 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=929 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1204 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1207 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=1460 - _globals['_FSMCOMMAND']._serialized_start=1463 - _globals['_FSMCOMMAND']._serialized_end=1675 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1596 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1666 - _globals['_FSMCOMMANDRESPONSE']._serialized_start=1678 - _globals['_FSMCOMMANDRESPONSE']._serialized_end=1819 - _globals['_ARGUMENT']._serialized_start=1822 - _globals['_ARGUMENT']._serialized_end=2188 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2081 - _globals['_ARGUMENT_PRESENCE']._serialized_end=2120 - _globals['_ARGUMENT_TYPE']._serialized_start=2122 - _globals['_ARGUMENT_TYPE']._serialized_end=2170 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2191 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2343 - _globals['_FSMSEQUENCE']._serialized_start=2345 - _globals['_FSMSEQUENCE']._serialized_end=2391 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2394 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2660 - _globals['_STATUS']._serialized_start=2663 - _globals['_STATUS']._serialized_end=2818 - _globals['_RUNINFO']._serialized_start=2821 - _globals['_RUNINFO']._serialized_end=3027 - _globals['_CONTROLLER']._serialized_start=3187 - _globals['_CONTROLLER']._serialized_end=4317 + _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432 + _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_end=658 + _globals['_STATUSRESPONSE']._serialized_start=661 + _globals['_STATUSRESPONSE']._serialized_end=905 + _globals['_DESCRIBERESPONSE']._serialized_start=908 + _globals['_DESCRIBERESPONSE']._serialized_end=1155 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1158 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1433 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1436 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=1689 + _globals['_FSMCOMMAND']._serialized_start=1692 + _globals['_FSMCOMMAND']._serialized_end=1904 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1825 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1895 + _globals['_FSMCOMMANDRESPONSE']._serialized_start=1907 + _globals['_FSMCOMMANDRESPONSE']._serialized_end=2048 + _globals['_ARGUMENT']._serialized_start=2051 + _globals['_ARGUMENT']._serialized_end=2417 + _globals['_ARGUMENT_PRESENCE']._serialized_start=2310 + _globals['_ARGUMENT_PRESENCE']._serialized_end=2349 + _globals['_ARGUMENT_TYPE']._serialized_start=2351 + _globals['_ARGUMENT_TYPE']._serialized_end=2399 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2420 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2572 + _globals['_FSMSEQUENCE']._serialized_start=2574 + _globals['_FSMSEQUENCE']._serialized_end=2620 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2623 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2889 + _globals['_STATUS']._serialized_start=2892 + _globals['_STATUS']._serialized_end=3047 + _globals['_RUNINFO']._serialized_start=3050 + _globals['_RUNINFO']._serialized_end=3256 + _globals['_CONTROLLER']._serialized_start=3416 + _globals['_CONTROLLER']._serialized_end=4574 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/python_not_for_dunedaq/druncschema/controller_pb2.pyi index 947d608..0912f06 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/controller_pb2.pyi @@ -78,6 +78,36 @@ class AddressedCommand(google.protobuf.message.Message): global___AddressedCommand = AddressedCommand +@typing.final +class ExecuteFSMCommandRequest(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + TOKEN_FIELD_NUMBER: builtins.int + COMMAND_FIELD_NUMBER: builtins.int + TARGET_FIELD_NUMBER: builtins.int + EXECUTE_ALONG_PATH_FIELD_NUMBER: builtins.int + EXECUTE_ON_ALL_SUBSEQUENT_CHILDREN_IN_PATH_FIELD_NUMBER: builtins.int + target: builtins.str + execute_along_path: builtins.bool + execute_on_all_subsequent_children_in_path: builtins.bool + @property + def token(self) -> druncschema.token_pb2.Token: ... + @property + def command(self) -> global___FSMCommand: ... + def __init__( + self, + *, + token: druncschema.token_pb2.Token | None = ..., + command: global___FSMCommand | None = ..., + target: builtins.str = ..., + execute_along_path: builtins.bool = ..., + execute_on_all_subsequent_children_in_path: builtins.bool = ..., + ) -> None: ... + def HasField(self, field_name: typing.Literal["command", b"command", "token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["command", b"command", "execute_along_path", b"execute_along_path", "execute_on_all_subsequent_children_in_path", b"execute_on_all_subsequent_children_in_path", "target", b"target", "token", b"token"]) -> None: ... + +global___ExecuteFSMCommandRequest = ExecuteFSMCommandRequest + @typing.final class StatusResponse(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor diff --git a/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py b/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py index 502bf4c..894c5c6 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py @@ -52,7 +52,7 @@ def __init__(self, channel): _registered_method=True) self.execute_fsm_command = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/execute_fsm_command', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.SerializeToString, response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, _registered_method=True) self.execute_expert_command = channel.unary_unary( @@ -192,7 +192,7 @@ def add_ControllerServicer_to_server(servicer, server): ), 'execute_fsm_command': grpc.unary_unary_rpc_method_handler( servicer.execute_fsm_command, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.FromString, response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, ), 'execute_expert_command': grpc.unary_unary_rpc_method_handler( @@ -342,7 +342,7 @@ def execute_fsm_command(request, request, target, '/dunedaq.druncschema.controller.Controller/execute_fsm_command', - druncschema_dot_request__response__pb2.Request.SerializeToString, + druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.SerializeToString, druncschema_dot_request__response__pb2.Response.FromString, options, channel_credentials, diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index cac4bea..0a24d85 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -12,7 +12,7 @@ service Controller { rpc status (AddressedCommand) returns (StatusResponse) {} rpc describe_fsm (AddressedCommand) returns (DescribeFSMResponse) {} - rpc execute_fsm_command (Request) returns (Response) {} + rpc execute_fsm_command (ExecuteFSMCommandRequest) returns (Response) {} rpc execute_expert_command (Request) returns (Response) {} rpc include (Request) returns (Response) {} rpc exclude (Request) returns (Response) {} @@ -34,6 +34,14 @@ message AddressedCommand { bool execute_on_all_subsequent_children_in_path = 6; } +message ExecuteFSMCommandRequest { + Token token = 1; + FSMCommand command = 2; + string target = 3; + bool execute_along_path = 4; + bool execute_on_all_subsequent_children_in_path = 5; +} + message StatusResponse { Token token = 1; string name = 2; From c3ad975e60f5c6a2dba8a6059d03c4b3f4ffc414 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 24 Oct 2025 17:27:33 +0100 Subject: [PATCH 2/7] FSMCommandResponse -> ExecuteFSMCommandResponse. --- .../druncschema/controller_pb2.py | 70 +++++----- .../druncschema/controller_pb2.pyi | 132 +++++++++--------- .../druncschema/controller_pb2_grpc.py | 6 +- schema/druncschema/controller.proto | 26 ++-- 4 files changed, 117 insertions(+), 117 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/python_not_for_dunedaq/druncschema/controller_pb2.py index b45af53..790a2eb 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2.py @@ -28,7 +28,7 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\x8d\x01\n\x12\x46SMCommandResponse\x12=\n\x04\x66lag\x18\x01 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\x86\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12p\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\x94\x01\n\x19\x45xecuteFSMCommandResponse\x12=\n\x04\x66lag\x18\x01 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,42 +37,42 @@ DESCRIPTOR._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001' - _globals['_FSMRESPONSEFLAG']._serialized_start=3259 - _globals['_FSMRESPONSEFLAG']._serialized_end=3413 + _globals['_FSMRESPONSEFLAG']._serialized_start=3266 + _globals['_FSMRESPONSEFLAG']._serialized_end=3420 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_end=658 - _globals['_STATUSRESPONSE']._serialized_start=661 - _globals['_STATUSRESPONSE']._serialized_end=905 - _globals['_DESCRIBERESPONSE']._serialized_start=908 - _globals['_DESCRIBERESPONSE']._serialized_end=1155 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1158 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1433 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1436 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=1689 - _globals['_FSMCOMMAND']._serialized_start=1692 - _globals['_FSMCOMMAND']._serialized_end=1904 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1825 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1895 - _globals['_FSMCOMMANDRESPONSE']._serialized_start=1907 - _globals['_FSMCOMMANDRESPONSE']._serialized_end=2048 - _globals['_ARGUMENT']._serialized_start=2051 - _globals['_ARGUMENT']._serialized_end=2417 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2310 - _globals['_ARGUMENT_PRESENCE']._serialized_end=2349 - _globals['_ARGUMENT_TYPE']._serialized_start=2351 - _globals['_ARGUMENT_TYPE']._serialized_end=2399 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2420 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2572 - _globals['_FSMSEQUENCE']._serialized_start=2574 - _globals['_FSMSEQUENCE']._serialized_end=2620 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2623 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2889 - _globals['_STATUS']._serialized_start=2892 - _globals['_STATUS']._serialized_end=3047 - _globals['_RUNINFO']._serialized_start=3050 - _globals['_RUNINFO']._serialized_end=3256 - _globals['_CONTROLLER']._serialized_start=3416 - _globals['_CONTROLLER']._serialized_end=4574 + _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_start=661 + _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=809 + _globals['_FSMCOMMAND']._serialized_start=812 + _globals['_FSMCOMMAND']._serialized_end=1024 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=945 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1015 + _globals['_STATUSRESPONSE']._serialized_start=1027 + _globals['_STATUSRESPONSE']._serialized_end=1271 + _globals['_DESCRIBERESPONSE']._serialized_start=1274 + _globals['_DESCRIBERESPONSE']._serialized_end=1521 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1524 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1799 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1802 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2055 + _globals['_ARGUMENT']._serialized_start=2058 + _globals['_ARGUMENT']._serialized_end=2424 + _globals['_ARGUMENT_PRESENCE']._serialized_start=2317 + _globals['_ARGUMENT_PRESENCE']._serialized_end=2356 + _globals['_ARGUMENT_TYPE']._serialized_start=2358 + _globals['_ARGUMENT_TYPE']._serialized_end=2406 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2427 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2579 + _globals['_FSMSEQUENCE']._serialized_start=2581 + _globals['_FSMSEQUENCE']._serialized_end=2627 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2630 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2896 + _globals['_STATUS']._serialized_start=2899 + _globals['_STATUS']._serialized_end=3054 + _globals['_RUNINFO']._serialized_start=3057 + _globals['_RUNINFO']._serialized_end=3263 + _globals['_CONTROLLER']._serialized_start=3423 + _globals['_CONTROLLER']._serialized_end=4610 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/python_not_for_dunedaq/druncschema/controller_pb2.pyi index 0912f06..cf54cda 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/controller_pb2.pyi @@ -108,6 +108,72 @@ class ExecuteFSMCommandRequest(google.protobuf.message.Message): global___ExecuteFSMCommandRequest = ExecuteFSMCommandRequest +@typing.final +class ExecuteFSMCommandResponse(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + FLAG_FIELD_NUMBER: builtins.int + COMMAND_NAME_FIELD_NUMBER: builtins.int + DATA_FIELD_NUMBER: builtins.int + flag: global___FSMResponseFlag.ValueType + command_name: builtins.str + @property + def data(self) -> google.protobuf.any_pb2.Any: ... + def __init__( + self, + *, + flag: global___FSMResponseFlag.ValueType = ..., + command_name: builtins.str = ..., + data: google.protobuf.any_pb2.Any | None = ..., + ) -> None: ... + def HasField(self, field_name: typing.Literal["data", b"data"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["command_name", b"command_name", "data", b"data", "flag", b"flag"]) -> None: ... + +global___ExecuteFSMCommandResponse = ExecuteFSMCommandResponse + +@typing.final +class FSMCommand(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + @typing.final + class ArgumentsEntry(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + KEY_FIELD_NUMBER: builtins.int + VALUE_FIELD_NUMBER: builtins.int + key: builtins.str + @property + def value(self) -> google.protobuf.any_pb2.Any: ... + def __init__( + self, + *, + key: builtins.str = ..., + value: google.protobuf.any_pb2.Any | None = ..., + ) -> None: ... + def HasField(self, field_name: typing.Literal["value", b"value"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ... + + COMMAND_NAME_FIELD_NUMBER: builtins.int + ARGUMENTS_FIELD_NUMBER: builtins.int + DATA_FIELD_NUMBER: builtins.int + command_name: builtins.str + data: builtins.str + """unfortunately, this is just some plain old json data introduced by the fsm interfaces""" + @property + def arguments(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, google.protobuf.any_pb2.Any]: ... + def __init__( + self, + *, + command_name: builtins.str = ..., + arguments: collections.abc.Mapping[builtins.str, google.protobuf.any_pb2.Any] | None = ..., + data: builtins.str | None = ..., + ) -> None: ... + def HasField(self, field_name: typing.Literal["_data", b"_data", "data", b"data"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "command_name", b"command_name", "data", b"data"]) -> None: ... + def WhichOneof(self, oneof_group: typing.Literal["_data", b"_data"]) -> typing.Literal["data"] | None: ... + +global___FSMCommand = FSMCommand + @typing.final class StatusResponse(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor @@ -232,72 +298,6 @@ class RecomputeStatusResponse(google.protobuf.message.Message): global___RecomputeStatusResponse = RecomputeStatusResponse -@typing.final -class FSMCommand(google.protobuf.message.Message): - DESCRIPTOR: google.protobuf.descriptor.Descriptor - - @typing.final - class ArgumentsEntry(google.protobuf.message.Message): - DESCRIPTOR: google.protobuf.descriptor.Descriptor - - KEY_FIELD_NUMBER: builtins.int - VALUE_FIELD_NUMBER: builtins.int - key: builtins.str - @property - def value(self) -> google.protobuf.any_pb2.Any: ... - def __init__( - self, - *, - key: builtins.str = ..., - value: google.protobuf.any_pb2.Any | None = ..., - ) -> None: ... - def HasField(self, field_name: typing.Literal["value", b"value"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ... - - COMMAND_NAME_FIELD_NUMBER: builtins.int - ARGUMENTS_FIELD_NUMBER: builtins.int - DATA_FIELD_NUMBER: builtins.int - command_name: builtins.str - data: builtins.str - """unfortunately, this is just some plain old json data introduced by the fsm interfaces""" - @property - def arguments(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, google.protobuf.any_pb2.Any]: ... - def __init__( - self, - *, - command_name: builtins.str = ..., - arguments: collections.abc.Mapping[builtins.str, google.protobuf.any_pb2.Any] | None = ..., - data: builtins.str | None = ..., - ) -> None: ... - def HasField(self, field_name: typing.Literal["_data", b"_data", "data", b"data"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "command_name", b"command_name", "data", b"data"]) -> None: ... - def WhichOneof(self, oneof_group: typing.Literal["_data", b"_data"]) -> typing.Literal["data"] | None: ... - -global___FSMCommand = FSMCommand - -@typing.final -class FSMCommandResponse(google.protobuf.message.Message): - DESCRIPTOR: google.protobuf.descriptor.Descriptor - - FLAG_FIELD_NUMBER: builtins.int - COMMAND_NAME_FIELD_NUMBER: builtins.int - DATA_FIELD_NUMBER: builtins.int - flag: global___FSMResponseFlag.ValueType - command_name: builtins.str - @property - def data(self) -> google.protobuf.any_pb2.Any: ... - def __init__( - self, - *, - flag: global___FSMResponseFlag.ValueType = ..., - command_name: builtins.str = ..., - data: google.protobuf.any_pb2.Any | None = ..., - ) -> None: ... - def HasField(self, field_name: typing.Literal["data", b"data"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["command_name", b"command_name", "data", b"data", "flag", b"flag"]) -> None: ... - -global___FSMCommandResponse = FSMCommandResponse - @typing.final class Argument(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor diff --git a/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py b/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py index 894c5c6..f6f9ca5 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py @@ -53,7 +53,7 @@ def __init__(self, channel): self.execute_fsm_command = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/execute_fsm_command', request_serializer=druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_controller__pb2.ExecuteFSMCommandResponse.FromString, _registered_method=True) self.execute_expert_command = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/execute_expert_command', @@ -193,7 +193,7 @@ def add_ControllerServicer_to_server(servicer, server): 'execute_fsm_command': grpc.unary_unary_rpc_method_handler( servicer.execute_fsm_command, request_deserializer=druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_controller__pb2.ExecuteFSMCommandResponse.SerializeToString, ), 'execute_expert_command': grpc.unary_unary_rpc_method_handler( servicer.execute_expert_command, @@ -343,7 +343,7 @@ def execute_fsm_command(request, target, '/dunedaq.druncschema.controller.Controller/execute_fsm_command', druncschema_dot_controller__pb2.ExecuteFSMCommandRequest.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_controller__pb2.ExecuteFSMCommandResponse.FromString, options, channel_credentials, insecure, diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index 0a24d85..0c43459 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -12,7 +12,7 @@ service Controller { rpc status (AddressedCommand) returns (StatusResponse) {} rpc describe_fsm (AddressedCommand) returns (DescribeFSMResponse) {} - rpc execute_fsm_command (ExecuteFSMCommandRequest) returns (Response) {} + rpc execute_fsm_command (ExecuteFSMCommandRequest) returns (ExecuteFSMCommandResponse) {} rpc execute_expert_command (Request) returns (Response) {} rpc include (Request) returns (Response) {} rpc exclude (Request) returns (Response) {} @@ -42,6 +42,18 @@ message ExecuteFSMCommandRequest { bool execute_on_all_subsequent_children_in_path = 5; } +message ExecuteFSMCommandResponse{ + FSMResponseFlag flag = 1; + string command_name = 2; + google.protobuf.Any data = 3; +} + +message FSMCommand { + string command_name = 1; + map arguments = 2; + optional string data = 4; // unfortunately, this is just some plain old json data introduced by the fsm interfaces +} + message StatusResponse { Token token = 1; string name = 2; @@ -74,12 +86,6 @@ message RecomputeStatusResponse { ResponseFlag flag = 5; } -message FSMCommand { - string command_name = 1; - map arguments = 2; - optional string data = 4; // unfortunately, this is just some plain old json data introduced by the fsm interfaces -} - enum FSMResponseFlag { FSM_EXECUTED_SUCCESSFULLY = 0; FSM_FAILED = 1; @@ -88,12 +94,6 @@ enum FSMResponseFlag { FSM_NOT_EXECUTED_IN_ERROR = 4; } -message FSMCommandResponse{ - FSMResponseFlag flag = 1; - string command_name = 2; - google.protobuf.Any data = 3; -} - message Argument { enum Presence{ MANDATORY = 0; From 8b3f3a09018502707a432a2a6c4e9f500cbf5ec0 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 24 Oct 2025 17:51:47 +0100 Subject: [PATCH 3/7] Add missing fields to FSMCommandResponse. --- .../druncschema/controller_pb2.py | 68 +++++++++---------- .../druncschema/controller_pb2.pyi | 23 ++++--- schema/druncschema/controller.proto | 8 ++- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/python_not_for_dunedaq/druncschema/controller_pb2.py index 790a2eb..5bee0b1 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2.py @@ -28,7 +28,7 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\x94\x01\n\x19\x45xecuteFSMCommandResponse\x12=\n\x04\x66lag\x18\x01 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xf6\x01\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12K\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12=\n\x04\x66lag\x18\x05 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,42 +37,42 @@ DESCRIPTOR._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001' - _globals['_FSMRESPONSEFLAG']._serialized_start=3266 - _globals['_FSMRESPONSEFLAG']._serialized_end=3420 + _globals['_FSMRESPONSEFLAG']._serialized_start=3364 + _globals['_FSMRESPONSEFLAG']._serialized_end=3518 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_end=658 _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_start=661 - _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=809 - _globals['_FSMCOMMAND']._serialized_start=812 - _globals['_FSMCOMMAND']._serialized_end=1024 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=945 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1015 - _globals['_STATUSRESPONSE']._serialized_start=1027 - _globals['_STATUSRESPONSE']._serialized_end=1271 - _globals['_DESCRIBERESPONSE']._serialized_start=1274 - _globals['_DESCRIBERESPONSE']._serialized_end=1521 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1524 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1799 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1802 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2055 - _globals['_ARGUMENT']._serialized_start=2058 - _globals['_ARGUMENT']._serialized_end=2424 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2317 - _globals['_ARGUMENT_PRESENCE']._serialized_end=2356 - _globals['_ARGUMENT_TYPE']._serialized_start=2358 - _globals['_ARGUMENT_TYPE']._serialized_end=2406 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2427 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2579 - _globals['_FSMSEQUENCE']._serialized_start=2581 - _globals['_FSMSEQUENCE']._serialized_end=2627 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2630 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2896 - _globals['_STATUS']._serialized_start=2899 - _globals['_STATUS']._serialized_end=3054 - _globals['_RUNINFO']._serialized_start=3057 - _globals['_RUNINFO']._serialized_end=3263 - _globals['_CONTROLLER']._serialized_start=3423 - _globals['_CONTROLLER']._serialized_end=4610 + _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=907 + _globals['_FSMCOMMAND']._serialized_start=910 + _globals['_FSMCOMMAND']._serialized_end=1122 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1043 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1113 + _globals['_STATUSRESPONSE']._serialized_start=1125 + _globals['_STATUSRESPONSE']._serialized_end=1369 + _globals['_DESCRIBERESPONSE']._serialized_start=1372 + _globals['_DESCRIBERESPONSE']._serialized_end=1619 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1622 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1897 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1900 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2153 + _globals['_ARGUMENT']._serialized_start=2156 + _globals['_ARGUMENT']._serialized_end=2522 + _globals['_ARGUMENT_PRESENCE']._serialized_start=2415 + _globals['_ARGUMENT_PRESENCE']._serialized_end=2454 + _globals['_ARGUMENT_TYPE']._serialized_start=2456 + _globals['_ARGUMENT_TYPE']._serialized_end=2504 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2525 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2677 + _globals['_FSMSEQUENCE']._serialized_start=2679 + _globals['_FSMSEQUENCE']._serialized_end=2725 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2728 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2994 + _globals['_STATUS']._serialized_start=2997 + _globals['_STATUS']._serialized_end=3152 + _globals['_RUNINFO']._serialized_start=3155 + _globals['_RUNINFO']._serialized_end=3361 + _globals['_CONTROLLER']._serialized_start=3521 + _globals['_CONTROLLER']._serialized_end=4708 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/python_not_for_dunedaq/druncschema/controller_pb2.pyi index cf54cda..c065bff 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/controller_pb2.pyi @@ -112,22 +112,29 @@ global___ExecuteFSMCommandRequest = ExecuteFSMCommandRequest class ExecuteFSMCommandResponse(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor - FLAG_FIELD_NUMBER: builtins.int + TOKEN_FIELD_NUMBER: builtins.int + NAME_FIELD_NUMBER: builtins.int COMMAND_NAME_FIELD_NUMBER: builtins.int - DATA_FIELD_NUMBER: builtins.int - flag: global___FSMResponseFlag.ValueType + CHILDREN_FIELD_NUMBER: builtins.int + FLAG_FIELD_NUMBER: builtins.int + name: builtins.str command_name: builtins.str + flag: global___FSMResponseFlag.ValueType + @property + def token(self) -> druncschema.token_pb2.Token: ... @property - def data(self) -> google.protobuf.any_pb2.Any: ... + def children(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___ExecuteFSMCommandResponse]: ... def __init__( self, *, - flag: global___FSMResponseFlag.ValueType = ..., + token: druncschema.token_pb2.Token | None = ..., + name: builtins.str = ..., command_name: builtins.str = ..., - data: google.protobuf.any_pb2.Any | None = ..., + children: collections.abc.Iterable[global___ExecuteFSMCommandResponse] | None = ..., + flag: global___FSMResponseFlag.ValueType = ..., ) -> None: ... - def HasField(self, field_name: typing.Literal["data", b"data"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["command_name", b"command_name", "data", b"data", "flag", b"flag"]) -> None: ... + def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["children", b"children", "command_name", b"command_name", "flag", b"flag", "name", b"name", "token", b"token"]) -> None: ... global___ExecuteFSMCommandResponse = ExecuteFSMCommandResponse diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index 0c43459..8990ca7 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -43,9 +43,11 @@ message ExecuteFSMCommandRequest { } message ExecuteFSMCommandResponse{ - FSMResponseFlag flag = 1; - string command_name = 2; - google.protobuf.Any data = 3; + Token token = 1; + string name = 2; + string command_name = 3; + repeated ExecuteFSMCommandResponse children = 4; + FSMResponseFlag flag = 5; } message FSMCommand { From fef5e7a955ca4814c6332e07ac96e8f549b34808 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 24 Oct 2025 18:19:15 +0100 Subject: [PATCH 4/7] Still need data, but can make it a string. --- .../druncschema/controller_pb2.py | 68 +++++++++---------- .../druncschema/controller_pb2.pyi | 5 +- schema/druncschema/controller.proto | 5 +- 3 files changed, 41 insertions(+), 37 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/python_not_for_dunedaq/druncschema/controller_pb2.py index 5bee0b1..8560680 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2.py @@ -28,7 +28,7 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xf6\x01\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12K\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12=\n\x04\x66lag\x18\x05 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\x84\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12=\n\x04\x66lag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,42 +37,42 @@ DESCRIPTOR._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001' - _globals['_FSMRESPONSEFLAG']._serialized_start=3364 - _globals['_FSMRESPONSEFLAG']._serialized_end=3518 + _globals['_FSMRESPONSEFLAG']._serialized_start=3378 + _globals['_FSMRESPONSEFLAG']._serialized_end=3532 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_end=658 _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_start=661 - _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=907 - _globals['_FSMCOMMAND']._serialized_start=910 - _globals['_FSMCOMMAND']._serialized_end=1122 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1043 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1113 - _globals['_STATUSRESPONSE']._serialized_start=1125 - _globals['_STATUSRESPONSE']._serialized_end=1369 - _globals['_DESCRIBERESPONSE']._serialized_start=1372 - _globals['_DESCRIBERESPONSE']._serialized_end=1619 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1622 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1897 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1900 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2153 - _globals['_ARGUMENT']._serialized_start=2156 - _globals['_ARGUMENT']._serialized_end=2522 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2415 - _globals['_ARGUMENT_PRESENCE']._serialized_end=2454 - _globals['_ARGUMENT_TYPE']._serialized_start=2456 - _globals['_ARGUMENT_TYPE']._serialized_end=2504 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2525 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2677 - _globals['_FSMSEQUENCE']._serialized_start=2679 - _globals['_FSMSEQUENCE']._serialized_end=2725 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2728 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=2994 - _globals['_STATUS']._serialized_start=2997 - _globals['_STATUS']._serialized_end=3152 - _globals['_RUNINFO']._serialized_start=3155 - _globals['_RUNINFO']._serialized_end=3361 - _globals['_CONTROLLER']._serialized_start=3521 - _globals['_CONTROLLER']._serialized_end=4708 + _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=921 + _globals['_FSMCOMMAND']._serialized_start=924 + _globals['_FSMCOMMAND']._serialized_end=1136 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1057 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1127 + _globals['_STATUSRESPONSE']._serialized_start=1139 + _globals['_STATUSRESPONSE']._serialized_end=1383 + _globals['_DESCRIBERESPONSE']._serialized_start=1386 + _globals['_DESCRIBERESPONSE']._serialized_end=1633 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1636 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1911 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1914 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2167 + _globals['_ARGUMENT']._serialized_start=2170 + _globals['_ARGUMENT']._serialized_end=2536 + _globals['_ARGUMENT_PRESENCE']._serialized_start=2429 + _globals['_ARGUMENT_PRESENCE']._serialized_end=2468 + _globals['_ARGUMENT_TYPE']._serialized_start=2470 + _globals['_ARGUMENT_TYPE']._serialized_end=2518 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2539 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2691 + _globals['_FSMSEQUENCE']._serialized_start=2693 + _globals['_FSMSEQUENCE']._serialized_end=2739 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2742 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3008 + _globals['_STATUS']._serialized_start=3011 + _globals['_STATUS']._serialized_end=3166 + _globals['_RUNINFO']._serialized_start=3169 + _globals['_RUNINFO']._serialized_end=3375 + _globals['_CONTROLLER']._serialized_start=3535 + _globals['_CONTROLLER']._serialized_end=4722 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/python_not_for_dunedaq/druncschema/controller_pb2.pyi index c065bff..ecea7c3 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/controller_pb2.pyi @@ -115,10 +115,12 @@ class ExecuteFSMCommandResponse(google.protobuf.message.Message): TOKEN_FIELD_NUMBER: builtins.int NAME_FIELD_NUMBER: builtins.int COMMAND_NAME_FIELD_NUMBER: builtins.int + DATA_FIELD_NUMBER: builtins.int CHILDREN_FIELD_NUMBER: builtins.int FLAG_FIELD_NUMBER: builtins.int name: builtins.str command_name: builtins.str + data: builtins.str flag: global___FSMResponseFlag.ValueType @property def token(self) -> druncschema.token_pb2.Token: ... @@ -130,11 +132,12 @@ class ExecuteFSMCommandResponse(google.protobuf.message.Message): token: druncschema.token_pb2.Token | None = ..., name: builtins.str = ..., command_name: builtins.str = ..., + data: builtins.str = ..., children: collections.abc.Iterable[global___ExecuteFSMCommandResponse] | None = ..., flag: global___FSMResponseFlag.ValueType = ..., ) -> None: ... def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["children", b"children", "command_name", b"command_name", "flag", b"flag", "name", b"name", "token", b"token"]) -> None: ... + def ClearField(self, field_name: typing.Literal["children", b"children", "command_name", b"command_name", "data", b"data", "flag", b"flag", "name", b"name", "token", b"token"]) -> None: ... global___ExecuteFSMCommandResponse = ExecuteFSMCommandResponse diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index 8990ca7..a134291 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -46,8 +46,9 @@ message ExecuteFSMCommandResponse{ Token token = 1; string name = 2; string command_name = 3; - repeated ExecuteFSMCommandResponse children = 4; - FSMResponseFlag flag = 5; + string data = 4; + repeated ExecuteFSMCommandResponse children = 5; + FSMResponseFlag flag = 6; } message FSMCommand { From f354d82916c6bd9a29e8d63c4bb6b32cac3710e1 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 24 Oct 2025 22:28:18 +0100 Subject: [PATCH 5/7] Separate flag field for FSM flags. --- .../druncschema/controller_pb2.py | 68 +++++++++---------- .../druncschema/controller_pb2.pyi | 9 ++- schema/druncschema/controller.proto | 3 +- 3 files changed, 42 insertions(+), 38 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/python_not_for_dunedaq/druncschema/controller_pb2.py index 8560680..46ad8b3 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2.py @@ -28,7 +28,7 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\x84\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12=\n\x04\x66lag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xb9\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12\x41\n\x08\x66sm_flag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12/\n\x04\x66lag\x18\x07 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,42 +37,42 @@ DESCRIPTOR._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001' - _globals['_FSMRESPONSEFLAG']._serialized_start=3378 - _globals['_FSMRESPONSEFLAG']._serialized_end=3532 + _globals['_FSMRESPONSEFLAG']._serialized_start=3431 + _globals['_FSMRESPONSEFLAG']._serialized_end=3585 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_end=658 _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_start=661 - _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=921 - _globals['_FSMCOMMAND']._serialized_start=924 - _globals['_FSMCOMMAND']._serialized_end=1136 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1057 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1127 - _globals['_STATUSRESPONSE']._serialized_start=1139 - _globals['_STATUSRESPONSE']._serialized_end=1383 - _globals['_DESCRIBERESPONSE']._serialized_start=1386 - _globals['_DESCRIBERESPONSE']._serialized_end=1633 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1636 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1911 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1914 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2167 - _globals['_ARGUMENT']._serialized_start=2170 - _globals['_ARGUMENT']._serialized_end=2536 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2429 - _globals['_ARGUMENT_PRESENCE']._serialized_end=2468 - _globals['_ARGUMENT_TYPE']._serialized_start=2470 - _globals['_ARGUMENT_TYPE']._serialized_end=2518 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2539 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2691 - _globals['_FSMSEQUENCE']._serialized_start=2693 - _globals['_FSMSEQUENCE']._serialized_end=2739 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2742 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3008 - _globals['_STATUS']._serialized_start=3011 - _globals['_STATUS']._serialized_end=3166 - _globals['_RUNINFO']._serialized_start=3169 - _globals['_RUNINFO']._serialized_end=3375 - _globals['_CONTROLLER']._serialized_start=3535 - _globals['_CONTROLLER']._serialized_end=4722 + _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=974 + _globals['_FSMCOMMAND']._serialized_start=977 + _globals['_FSMCOMMAND']._serialized_end=1189 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1110 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1180 + _globals['_STATUSRESPONSE']._serialized_start=1192 + _globals['_STATUSRESPONSE']._serialized_end=1436 + _globals['_DESCRIBERESPONSE']._serialized_start=1439 + _globals['_DESCRIBERESPONSE']._serialized_end=1686 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1689 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1964 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1967 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2220 + _globals['_ARGUMENT']._serialized_start=2223 + _globals['_ARGUMENT']._serialized_end=2589 + _globals['_ARGUMENT_PRESENCE']._serialized_start=2482 + _globals['_ARGUMENT_PRESENCE']._serialized_end=2521 + _globals['_ARGUMENT_TYPE']._serialized_start=2523 + _globals['_ARGUMENT_TYPE']._serialized_end=2571 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2592 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2744 + _globals['_FSMSEQUENCE']._serialized_start=2746 + _globals['_FSMSEQUENCE']._serialized_end=2792 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2795 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3061 + _globals['_STATUS']._serialized_start=3064 + _globals['_STATUS']._serialized_end=3219 + _globals['_RUNINFO']._serialized_start=3222 + _globals['_RUNINFO']._serialized_end=3428 + _globals['_CONTROLLER']._serialized_start=3588 + _globals['_CONTROLLER']._serialized_end=4775 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/python_not_for_dunedaq/druncschema/controller_pb2.pyi index ecea7c3..04a47a0 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/controller_pb2.pyi @@ -117,11 +117,13 @@ class ExecuteFSMCommandResponse(google.protobuf.message.Message): COMMAND_NAME_FIELD_NUMBER: builtins.int DATA_FIELD_NUMBER: builtins.int CHILDREN_FIELD_NUMBER: builtins.int + FSM_FLAG_FIELD_NUMBER: builtins.int FLAG_FIELD_NUMBER: builtins.int name: builtins.str command_name: builtins.str data: builtins.str - flag: global___FSMResponseFlag.ValueType + fsm_flag: global___FSMResponseFlag.ValueType + flag: druncschema.request_response_pb2.ResponseFlag.ValueType @property def token(self) -> druncschema.token_pb2.Token: ... @property @@ -134,10 +136,11 @@ class ExecuteFSMCommandResponse(google.protobuf.message.Message): command_name: builtins.str = ..., data: builtins.str = ..., children: collections.abc.Iterable[global___ExecuteFSMCommandResponse] | None = ..., - flag: global___FSMResponseFlag.ValueType = ..., + fsm_flag: global___FSMResponseFlag.ValueType = ..., + flag: druncschema.request_response_pb2.ResponseFlag.ValueType = ..., ) -> None: ... def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["children", b"children", "command_name", b"command_name", "data", b"data", "flag", b"flag", "name", b"name", "token", b"token"]) -> None: ... + def ClearField(self, field_name: typing.Literal["children", b"children", "command_name", b"command_name", "data", b"data", "flag", b"flag", "fsm_flag", b"fsm_flag", "name", b"name", "token", b"token"]) -> None: ... global___ExecuteFSMCommandResponse = ExecuteFSMCommandResponse diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index a134291..bfd91fc 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -48,7 +48,8 @@ message ExecuteFSMCommandResponse{ string command_name = 3; string data = 4; repeated ExecuteFSMCommandResponse children = 5; - FSMResponseFlag flag = 6; + FSMResponseFlag fsm_flag = 6; + ResponseFlag flag = 7; } message FSMCommand { From a1d9d6a6f9c3d150f4aea36939c59c5cfbc74cd8 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Mon, 27 Oct 2025 14:14:48 +0000 Subject: [PATCH 6/7] FSMCommand: Small tidy. --- .../druncschema/controller_pb2.py | 64 +++++++++---------- .../druncschema/controller_pb2.pyi | 9 ++- schema/druncschema/controller.proto | 6 +- 3 files changed, 39 insertions(+), 40 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/python_not_for_dunedaq/druncschema/controller_pb2.py index 46ad8b3..2df625c 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2.py @@ -28,7 +28,7 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xb9\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12\x41\n\x08\x66sm_flag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12/\n\x04\x66lag\x18\x07 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xb9\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12\x41\n\x08\x66sm_flag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12/\n\x04\x66lag\x18\x07 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xcc\x01\n\nFSMCommand\x12\x0c\n\x04name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,8 +37,8 @@ DESCRIPTOR._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001' - _globals['_FSMRESPONSEFLAG']._serialized_start=3431 - _globals['_FSMRESPONSEFLAG']._serialized_end=3585 + _globals['_FSMRESPONSEFLAG']._serialized_start=3423 + _globals['_FSMRESPONSEFLAG']._serialized_end=3577 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432 @@ -46,33 +46,33 @@ _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_start=661 _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=974 _globals['_FSMCOMMAND']._serialized_start=977 - _globals['_FSMCOMMAND']._serialized_end=1189 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1110 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1180 - _globals['_STATUSRESPONSE']._serialized_start=1192 - _globals['_STATUSRESPONSE']._serialized_end=1436 - _globals['_DESCRIBERESPONSE']._serialized_start=1439 - _globals['_DESCRIBERESPONSE']._serialized_end=1686 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1689 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1964 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1967 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2220 - _globals['_ARGUMENT']._serialized_start=2223 - _globals['_ARGUMENT']._serialized_end=2589 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2482 - _globals['_ARGUMENT_PRESENCE']._serialized_end=2521 - _globals['_ARGUMENT_TYPE']._serialized_start=2523 - _globals['_ARGUMENT_TYPE']._serialized_end=2571 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2592 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2744 - _globals['_FSMSEQUENCE']._serialized_start=2746 - _globals['_FSMSEQUENCE']._serialized_end=2792 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2795 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3061 - _globals['_STATUS']._serialized_start=3064 - _globals['_STATUS']._serialized_end=3219 - _globals['_RUNINFO']._serialized_start=3222 - _globals['_RUNINFO']._serialized_end=3428 - _globals['_CONTROLLER']._serialized_start=3588 - _globals['_CONTROLLER']._serialized_end=4775 + _globals['_FSMCOMMAND']._serialized_end=1181 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1102 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1172 + _globals['_STATUSRESPONSE']._serialized_start=1184 + _globals['_STATUSRESPONSE']._serialized_end=1428 + _globals['_DESCRIBERESPONSE']._serialized_start=1431 + _globals['_DESCRIBERESPONSE']._serialized_end=1678 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1681 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1956 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1959 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2212 + _globals['_ARGUMENT']._serialized_start=2215 + _globals['_ARGUMENT']._serialized_end=2581 + _globals['_ARGUMENT_PRESENCE']._serialized_start=2474 + _globals['_ARGUMENT_PRESENCE']._serialized_end=2513 + _globals['_ARGUMENT_TYPE']._serialized_start=2515 + _globals['_ARGUMENT_TYPE']._serialized_end=2563 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2584 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2736 + _globals['_FSMSEQUENCE']._serialized_start=2738 + _globals['_FSMSEQUENCE']._serialized_end=2784 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2787 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3053 + _globals['_STATUS']._serialized_start=3056 + _globals['_STATUS']._serialized_end=3211 + _globals['_RUNINFO']._serialized_start=3214 + _globals['_RUNINFO']._serialized_end=3420 + _globals['_CONTROLLER']._serialized_start=3580 + _globals['_CONTROLLER']._serialized_end=4767 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/python_not_for_dunedaq/druncschema/controller_pb2.pyi index 04a47a0..6f3385b 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/controller_pb2.pyi @@ -166,23 +166,22 @@ class FSMCommand(google.protobuf.message.Message): def HasField(self, field_name: typing.Literal["value", b"value"]) -> builtins.bool: ... def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ... - COMMAND_NAME_FIELD_NUMBER: builtins.int + NAME_FIELD_NUMBER: builtins.int ARGUMENTS_FIELD_NUMBER: builtins.int DATA_FIELD_NUMBER: builtins.int - command_name: builtins.str + name: builtins.str data: builtins.str - """unfortunately, this is just some plain old json data introduced by the fsm interfaces""" @property def arguments(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, google.protobuf.any_pb2.Any]: ... def __init__( self, *, - command_name: builtins.str = ..., + name: builtins.str = ..., arguments: collections.abc.Mapping[builtins.str, google.protobuf.any_pb2.Any] | None = ..., data: builtins.str | None = ..., ) -> None: ... def HasField(self, field_name: typing.Literal["_data", b"_data", "data", b"data"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "command_name", b"command_name", "data", b"data"]) -> None: ... + def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "data", b"data", "name", b"name"]) -> None: ... def WhichOneof(self, oneof_group: typing.Literal["_data", b"_data"]) -> typing.Literal["data"] | None: ... global___FSMCommand = FSMCommand diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index bfd91fc..cd01b05 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -42,7 +42,7 @@ message ExecuteFSMCommandRequest { bool execute_on_all_subsequent_children_in_path = 5; } -message ExecuteFSMCommandResponse{ +message ExecuteFSMCommandResponse { Token token = 1; string name = 2; string command_name = 3; @@ -53,9 +53,9 @@ message ExecuteFSMCommandResponse{ } message FSMCommand { - string command_name = 1; + string name = 1; map arguments = 2; - optional string data = 4; // unfortunately, this is just some plain old json data introduced by the fsm interfaces + optional string data = 4; } message StatusResponse { From 67a47b7ccd51242305f939ae48cc2c6b7ff7187d Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Wed, 29 Oct 2025 15:44:27 +0000 Subject: [PATCH 7/7] FSMCommand.command_name as before. --- .../druncschema/controller_pb2.py | 64 +++++++++---------- .../druncschema/controller_pb2.pyi | 8 +-- schema/druncschema/controller.proto | 2 +- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/python_not_for_dunedaq/druncschema/controller_pb2.py index 2df625c..46ad8b3 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.py +++ b/python_not_for_dunedaq/druncschema/controller_pb2.py @@ -28,7 +28,7 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xb9\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12\x41\n\x08\x66sm_flag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12/\n\x04\x66lag\x18\x07 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xcc\x01\n\nFSMCommand\x12\x0c\n\x04name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64runcschema/controller.proto\x12\x1e\x64unedaq.druncschema.controller\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x19google/protobuf/any.proto\"\xf5\x01\n\x10\x41\x64\x64ressedCommand\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x14\n\x0c\x63ommand_name\x18\x02 \x01(\t\x12/\n\x0c\x63ommand_data\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12\x0e\n\x06target\x18\x04 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x05 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x06 \x01(\x08\x42\x0f\n\r_command_data\"\xe2\x01\n\x18\x45xecuteFSMCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x07\x63ommand\x18\x02 \x01(\x0b\x32*.dunedaq.druncschema.controller.FSMCommand\x12\x0e\n\x06target\x18\x03 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x04 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x05 \x01(\x08\"\xb9\x02\n\x19\x45xecuteFSMCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_name\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12K\n\x08\x63hildren\x18\x05 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\x12\x41\n\x08\x66sm_flag\x18\x06 \x01(\x0e\x32/.dunedaq.druncschema.controller.FSMResponseFlag\x12/\n\x04\x66lag\x18\x07 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xd4\x01\n\nFSMCommand\x12\x14\n\x0c\x63ommand_name\x18\x01 \x01(\t\x12L\n\targuments\x18\x02 \x03(\x0b\x32\x39.dunedaq.druncschema.controller.FSMCommand.ArgumentsEntry\x12\x11\n\x04\x64\x61ta\x18\x04 \x01(\tH\x00\x88\x01\x01\x1a\x46\n\x0e\x41rgumentsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any:\x02\x38\x01\x42\x07\n\x05_data\"\xf4\x01\n\x0eStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xf7\x01\n\x10\x44\x65scribeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x35\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.Description\x12\x42\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x30.dunedaq.druncschema.controller.DescribeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x93\x02\n\x13\x44\x65scribeFSMResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12K\n\x0b\x64\x65scription\x18\x03 \x01(\x0b\x32\x36.dunedaq.druncschema.controller.FSMCommandsDescription\x12\x45\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x33.dunedaq.druncschema.controller.DescribeFSMResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xfd\x01\n\x17RecomputeStatusResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x36\n\x06status\x18\x03 \x01(\x0b\x32&.dunedaq.druncschema.controller.Status\x12@\n\x08\x63hildren\x18\x04 \x03(\x0b\x32..dunedaq.druncschema.controller.StatusResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xee\x02\n\x08\x41rgument\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x43\n\x08presence\x18\x02 \x01(\x0e\x32\x31.dunedaq.druncschema.controller.Argument.Presence\x12;\n\x04type\x18\x03 \x01(\x0e\x32-.dunedaq.druncschema.controller.Argument.Type\x12\x30\n\rdefault_value\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x88\x01\x01\x12%\n\x07\x63hoices\x18\x05 \x03(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04help\x18\x06 \x01(\t\"\'\n\x08Presence\x12\r\n\tMANDATORY\x10\x00\x12\x0c\n\x08OPTIONAL\x10\x01\"0\n\x04Type\x12\x07\n\x03INT\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x42\x10\n\x0e_default_value\"\x98\x01\n\x15\x46SMCommandDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tdata_type\x18\x02 \x03(\t\x12\x0c\n\x04help\x18\x03 \x01(\t\x12\x13\n\x0breturn_type\x18\x04 \x01(\t\x12;\n\targuments\x18\x05 \x03(\x0b\x32(.dunedaq.druncschema.controller.Argument\".\n\x0b\x46SMSequence\x12\n\n\x02id\x18\x01 \x01(\t\x12\x13\n\x0b\x63ommand_ids\x18\x02 \x03(\t\"\x8a\x02\n\x16\x46SMCommandsDescription\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x07session\x18\x04 \x01(\tH\x00\x88\x01\x01\x12G\n\x08\x63ommands\x18\x05 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.FSMCommandDescription\x12>\n\tsequences\x18\x06 \x03(\x0b\x32+.dunedaq.druncschema.controller.FSMSequenceB\n\n\x08_session\"\x9b\x01\n\x06Status\x12\r\n\x05state\x18\x02 \x01(\t\x12\x11\n\tsub_state\x18\x03 \x01(\t\x12\x10\n\x08in_error\x18\x04 \x01(\x08\x12\x10\n\x08included\x18\x05 \x01(\x08\x12>\n\x08run_info\x18\x06 \x01(\x0b\x32\'.dunedaq.druncschema.controller.RunInfoH\x00\x88\x01\x01\x42\x0b\n\t_run_info\"\xce\x01\n\x07RunInfo\x12\x10\n\x08run_type\x18\x01 \x01(\t\x12\x14\n\x0ctrigger_rate\x18\x02 \x01(\x01\x12\x12\n\nrun_number\x18\x03 \x01(\x04\x12\x1c\n\x14\x64isable_data_storage\x18\x04 \x01(\x08\x12\x19\n\x11run_time_at_start\x18\x05 \x01(\r\x12\x1c\n\x14run_time_since_start\x18\x06 \x01(\r\x12\x17\n\x0frun_config_file\x18\x07 \x01(\t\x12\x17\n\x0frun_config_name\x18\x08 \x01(\t*\x9a\x01\n\x0f\x46SMResponseFlag\x12\x1d\n\x19\x46SM_EXECUTED_SUCCESSFULLY\x10\x00\x12\x0e\n\nFSM_FAILED\x10\x01\x12\x1a\n\x16\x46SM_INVALID_TRANSITION\x10\x02\x12\x1d\n\x19\x46SM_NOT_EXECUTED_EXCLUDED\x10\x03\x12\x1d\n\x19\x46SM_NOT_EXECUTED_IN_ERROR\x10\x04\x32\xa3\t\n\nController\x12p\n\x08\x64\x65scribe\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x30.dunedaq.druncschema.controller.DescribeResponse\"\x00\x12l\n\x06status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\x00\x12w\n\x0c\x64\x65scribe_fsm\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x33.dunedaq.druncschema.controller.DescribeFSMResponse\"\x00\x12\x8c\x01\n\x13\x65xecute_fsm_command\x12\x38.dunedaq.druncschema.controller.ExecuteFSMCommandRequest\x1a\x39.dunedaq.druncschema.controller.ExecuteFSMCommandResponse\"\x00\x12W\n\x16\x65xecute_expert_command\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07include\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07\x65xclude\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x7f\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a\x37.dunedaq.druncschema.controller.RecomputeStatusResponse\"\x00\x12M\n\x0ctake_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12R\n\x11surrender_control\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12Q\n\x10who_is_in_charge\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12I\n\x08to_error\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,8 +37,8 @@ DESCRIPTOR._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._loaded_options = None _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_options = b'8\001' - _globals['_FSMRESPONSEFLAG']._serialized_start=3423 - _globals['_FSMRESPONSEFLAG']._serialized_end=3577 + _globals['_FSMRESPONSEFLAG']._serialized_start=3431 + _globals['_FSMRESPONSEFLAG']._serialized_end=3585 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEFSMCOMMANDREQUEST']._serialized_start=432 @@ -46,33 +46,33 @@ _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_start=661 _globals['_EXECUTEFSMCOMMANDRESPONSE']._serialized_end=974 _globals['_FSMCOMMAND']._serialized_start=977 - _globals['_FSMCOMMAND']._serialized_end=1181 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1102 - _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1172 - _globals['_STATUSRESPONSE']._serialized_start=1184 - _globals['_STATUSRESPONSE']._serialized_end=1428 - _globals['_DESCRIBERESPONSE']._serialized_start=1431 - _globals['_DESCRIBERESPONSE']._serialized_end=1678 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1681 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1956 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1959 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2212 - _globals['_ARGUMENT']._serialized_start=2215 - _globals['_ARGUMENT']._serialized_end=2581 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2474 - _globals['_ARGUMENT_PRESENCE']._serialized_end=2513 - _globals['_ARGUMENT_TYPE']._serialized_start=2515 - _globals['_ARGUMENT_TYPE']._serialized_end=2563 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2584 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2736 - _globals['_FSMSEQUENCE']._serialized_start=2738 - _globals['_FSMSEQUENCE']._serialized_end=2784 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2787 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3053 - _globals['_STATUS']._serialized_start=3056 - _globals['_STATUS']._serialized_end=3211 - _globals['_RUNINFO']._serialized_start=3214 - _globals['_RUNINFO']._serialized_end=3420 - _globals['_CONTROLLER']._serialized_start=3580 - _globals['_CONTROLLER']._serialized_end=4767 + _globals['_FSMCOMMAND']._serialized_end=1189 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1110 + _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1180 + _globals['_STATUSRESPONSE']._serialized_start=1192 + _globals['_STATUSRESPONSE']._serialized_end=1436 + _globals['_DESCRIBERESPONSE']._serialized_start=1439 + _globals['_DESCRIBERESPONSE']._serialized_end=1686 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=1689 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=1964 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=1967 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2220 + _globals['_ARGUMENT']._serialized_start=2223 + _globals['_ARGUMENT']._serialized_end=2589 + _globals['_ARGUMENT_PRESENCE']._serialized_start=2482 + _globals['_ARGUMENT_PRESENCE']._serialized_end=2521 + _globals['_ARGUMENT_TYPE']._serialized_start=2523 + _globals['_ARGUMENT_TYPE']._serialized_end=2571 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=2592 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=2744 + _globals['_FSMSEQUENCE']._serialized_start=2746 + _globals['_FSMSEQUENCE']._serialized_end=2792 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=2795 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3061 + _globals['_STATUS']._serialized_start=3064 + _globals['_STATUS']._serialized_end=3219 + _globals['_RUNINFO']._serialized_start=3222 + _globals['_RUNINFO']._serialized_end=3428 + _globals['_CONTROLLER']._serialized_start=3588 + _globals['_CONTROLLER']._serialized_end=4775 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/python_not_for_dunedaq/druncschema/controller_pb2.pyi index 6f3385b..af5ee94 100644 --- a/python_not_for_dunedaq/druncschema/controller_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/controller_pb2.pyi @@ -166,22 +166,22 @@ class FSMCommand(google.protobuf.message.Message): def HasField(self, field_name: typing.Literal["value", b"value"]) -> builtins.bool: ... def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ... - NAME_FIELD_NUMBER: builtins.int + COMMAND_NAME_FIELD_NUMBER: builtins.int ARGUMENTS_FIELD_NUMBER: builtins.int DATA_FIELD_NUMBER: builtins.int - name: builtins.str + command_name: builtins.str data: builtins.str @property def arguments(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, google.protobuf.any_pb2.Any]: ... def __init__( self, *, - name: builtins.str = ..., + command_name: builtins.str = ..., arguments: collections.abc.Mapping[builtins.str, google.protobuf.any_pb2.Any] | None = ..., data: builtins.str | None = ..., ) -> None: ... def HasField(self, field_name: typing.Literal["_data", b"_data", "data", b"data"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "data", b"data", "name", b"name"]) -> None: ... + def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "command_name", b"command_name", "data", b"data"]) -> None: ... def WhichOneof(self, oneof_group: typing.Literal["_data", b"_data"]) -> typing.Literal["data"] | None: ... global___FSMCommand = FSMCommand diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index cd01b05..1431fde 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -53,7 +53,7 @@ message ExecuteFSMCommandResponse { } message FSMCommand { - string name = 1; + string command_name = 1; map arguments = 2; optional string data = 4; }