From 05bf61927a8da9ffc87ef73fd45f9f2a692ecad9 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Wed, 5 Nov 2025 17:38:15 +0000 Subject: [PATCH 1/4] include/exclude message types. --- schema/druncschema/controller.proto | 15 ++++++- src/druncschema/controller_pb2.py | 62 ++++++++++++++------------ src/druncschema/controller_pb2.pyi | 41 +++++++++++++++++ src/druncschema/controller_pb2_grpc.py | 24 +++++----- 4 files changed, 99 insertions(+), 43 deletions(-) diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index 5ce10aa..a37b0c6 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -14,8 +14,8 @@ service Controller { rpc describe_fsm (AddressedCommand) returns (DescribeFSMResponse) {} rpc execute_fsm_command (ExecuteFSMCommandRequest) returns (ExecuteFSMCommandResponse) {} rpc execute_expert_command (ExecuteExpertCommandRequest) returns (ExecuteExpertCommandResponse) {} - rpc include (Request) returns (Response) {} - rpc exclude (Request) returns (Response) {} + rpc include (IncludeExcludeRequest) returns (IncludeExcludeResponse) {} + rpc exclude (IncludeExcludeRequest) returns (IncludeExcludeResponse) {} rpc recompute_status (AddressedCommand) returns (RecomputeStatusResponse) {} rpc take_control (Request) returns (Response) {} @@ -75,6 +75,17 @@ message FSMCommand { optional string data = 4; } +message IncludeExcludeRequest { + Token token = 1; + string target = 2; + bool execute_along_path = 3; + bool execute_on_all_subsequent_children_in_path = 4; +} + +message IncludeExcludeResponse { + string text = 1; +} + message StatusResponse { Token token = 1; string name = 2; diff --git a/src/druncschema/controller_pb2.py b/src/druncschema/controller_pb2.py index f75c865..66b8503 100644 --- a/src/druncschema/controller_pb2.py +++ b/src/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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\xe2\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\"\xa2\x01\n\x15IncludeExcludeRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x03 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x04 \x01(\x08\"&\n\x16IncludeExcludeResponse\x12\x0c\n\x04text\x18\x01 \x01(\t\"\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\xc6\n\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\x00\x12z\n\x07include\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12z\n\x07\x65xclude\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\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=3923 - _globals['_FSMRESPONSEFLAG']._serialized_end=4077 + _globals['_FSMRESPONSEFLAG']._serialized_start=4128 + _globals['_FSMRESPONSEFLAG']._serialized_end=4282 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEEXPERTCOMMANDREQUEST']._serialized_start=432 @@ -53,30 +53,34 @@ _globals['_FSMCOMMAND']._serialized_end=1681 _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_start=1602 _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1672 - _globals['_STATUSRESPONSE']._serialized_start=1684 - _globals['_STATUSRESPONSE']._serialized_end=1928 - _globals['_DESCRIBERESPONSE']._serialized_start=1931 - _globals['_DESCRIBERESPONSE']._serialized_end=2178 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=2181 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=2456 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=2459 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2712 - _globals['_ARGUMENT']._serialized_start=2715 - _globals['_ARGUMENT']._serialized_end=3081 - _globals['_ARGUMENT_PRESENCE']._serialized_start=2974 - _globals['_ARGUMENT_PRESENCE']._serialized_end=3013 - _globals['_ARGUMENT_TYPE']._serialized_start=3015 - _globals['_ARGUMENT_TYPE']._serialized_end=3063 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3084 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3236 - _globals['_FSMSEQUENCE']._serialized_start=3238 - _globals['_FSMSEQUENCE']._serialized_end=3284 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3287 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3553 - _globals['_STATUS']._serialized_start=3556 - _globals['_STATUS']._serialized_end=3711 - _globals['_RUNINFO']._serialized_start=3714 - _globals['_RUNINFO']._serialized_end=3920 - _globals['_CONTROLLER']._serialized_start=4080 - _globals['_CONTROLLER']._serialized_end=5330 + _globals['_INCLUDEEXCLUDEREQUEST']._serialized_start=1684 + _globals['_INCLUDEEXCLUDEREQUEST']._serialized_end=1846 + _globals['_INCLUDEEXCLUDERESPONSE']._serialized_start=1848 + _globals['_INCLUDEEXCLUDERESPONSE']._serialized_end=1886 + _globals['_STATUSRESPONSE']._serialized_start=1889 + _globals['_STATUSRESPONSE']._serialized_end=2133 + _globals['_DESCRIBERESPONSE']._serialized_start=2136 + _globals['_DESCRIBERESPONSE']._serialized_end=2383 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=2386 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=2661 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=2664 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2917 + _globals['_ARGUMENT']._serialized_start=2920 + _globals['_ARGUMENT']._serialized_end=3286 + _globals['_ARGUMENT_PRESENCE']._serialized_start=3179 + _globals['_ARGUMENT_PRESENCE']._serialized_end=3218 + _globals['_ARGUMENT_TYPE']._serialized_start=3220 + _globals['_ARGUMENT_TYPE']._serialized_end=3268 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3289 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3441 + _globals['_FSMSEQUENCE']._serialized_start=3443 + _globals['_FSMSEQUENCE']._serialized_end=3489 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3492 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3758 + _globals['_STATUS']._serialized_start=3761 + _globals['_STATUS']._serialized_end=3916 + _globals['_RUNINFO']._serialized_start=3919 + _globals['_RUNINFO']._serialized_end=4125 + _globals['_CONTROLLER']._serialized_start=4285 + _globals['_CONTROLLER']._serialized_end=5635 # @@protoc_insertion_point(module_scope) diff --git a/src/druncschema/controller_pb2.pyi b/src/druncschema/controller_pb2.pyi index 560a0af..8d6e109 100644 --- a/src/druncschema/controller_pb2.pyi +++ b/src/druncschema/controller_pb2.pyi @@ -248,6 +248,47 @@ class FSMCommand(google.protobuf.message.Message): global___FSMCommand = FSMCommand +@typing.final +class IncludeExcludeRequest(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + TOKEN_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: ... + def __init__( + self, + *, + token: druncschema.token_pb2.Token | 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["token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["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___IncludeExcludeRequest = IncludeExcludeRequest + +@typing.final +class IncludeExcludeResponse(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + TEXT_FIELD_NUMBER: builtins.int + text: builtins.str + def __init__( + self, + *, + text: builtins.str = ..., + ) -> None: ... + def ClearField(self, field_name: typing.Literal["text", b"text"]) -> None: ... + +global___IncludeExcludeResponse = IncludeExcludeResponse + @typing.final class StatusResponse(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor diff --git a/src/druncschema/controller_pb2_grpc.py b/src/druncschema/controller_pb2_grpc.py index 45c206a..8fa38c1 100644 --- a/src/druncschema/controller_pb2_grpc.py +++ b/src/druncschema/controller_pb2_grpc.py @@ -62,13 +62,13 @@ def __init__(self, channel): _registered_method=True) self.include = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/include', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + request_serializer=druncschema_dot_controller__pb2.IncludeExcludeRequest.SerializeToString, + response_deserializer=druncschema_dot_controller__pb2.IncludeExcludeResponse.FromString, _registered_method=True) self.exclude = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/exclude', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + request_serializer=druncschema_dot_controller__pb2.IncludeExcludeRequest.SerializeToString, + response_deserializer=druncschema_dot_controller__pb2.IncludeExcludeResponse.FromString, _registered_method=True) self.recompute_status = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/recompute_status', @@ -202,13 +202,13 @@ def add_ControllerServicer_to_server(servicer, server): ), 'include': grpc.unary_unary_rpc_method_handler( servicer.include, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + request_deserializer=druncschema_dot_controller__pb2.IncludeExcludeRequest.FromString, + response_serializer=druncschema_dot_controller__pb2.IncludeExcludeResponse.SerializeToString, ), 'exclude': grpc.unary_unary_rpc_method_handler( servicer.exclude, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + request_deserializer=druncschema_dot_controller__pb2.IncludeExcludeRequest.FromString, + response_serializer=druncschema_dot_controller__pb2.IncludeExcludeResponse.SerializeToString, ), 'recompute_status': grpc.unary_unary_rpc_method_handler( servicer.recompute_status, @@ -396,8 +396,8 @@ def include(request, request, target, '/dunedaq.druncschema.controller.Controller/include', - druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_controller__pb2.IncludeExcludeRequest.SerializeToString, + druncschema_dot_controller__pb2.IncludeExcludeResponse.FromString, options, channel_credentials, insecure, @@ -423,8 +423,8 @@ def exclude(request, request, target, '/dunedaq.druncschema.controller.Controller/exclude', - druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_controller__pb2.IncludeExcludeRequest.SerializeToString, + druncschema_dot_controller__pb2.IncludeExcludeResponse.FromString, options, channel_credentials, insecure, From 3cb2692294fa4092e438a5c180038aa68a1b7285 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Thu, 6 Nov 2025 14:29:36 +0000 Subject: [PATCH 2/4] Missing fields in include/exclude message schema. --- schema/druncschema/controller.proto | 6 ++- src/druncschema/controller_pb2.py | 62 ++++++++++++++--------------- src/druncschema/controller_pb2.pyi | 17 +++++++- 3 files changed, 52 insertions(+), 33 deletions(-) diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index a37b0c6..923758d 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -83,7 +83,11 @@ message IncludeExcludeRequest { } message IncludeExcludeResponse { - string text = 1; + Token token = 1; + string name = 2; + string text = 3; + repeated IncludeExcludeRequest children = 4; + ResponseFlag flag = 5; } message StatusResponse { diff --git a/src/druncschema/controller_pb2.py b/src/druncschema/controller_pb2.py index 66b8503..ab217ab 100644 --- a/src/druncschema/controller_pb2.py +++ b/src/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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\"\xa2\x01\n\x15IncludeExcludeRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x03 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x04 \x01(\x08\"&\n\x16IncludeExcludeResponse\x12\x0c\n\x04text\x18\x01 \x01(\t\"\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\xc6\n\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\x00\x12z\n\x07include\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12z\n\x07\x65xclude\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\"\xa2\x01\n\x15IncludeExcludeRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x03 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x04 \x01(\x08\"\xd9\x01\n\x16IncludeExcludeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04text\x18\x03 \x01(\t\x12G\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\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\xc6\n\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\x00\x12z\n\x07include\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12z\n\x07\x65xclude\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\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=4128 - _globals['_FSMRESPONSEFLAG']._serialized_end=4282 + _globals['_FSMRESPONSEFLAG']._serialized_start=4308 + _globals['_FSMRESPONSEFLAG']._serialized_end=4462 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEEXPERTCOMMANDREQUEST']._serialized_start=432 @@ -55,32 +55,32 @@ _globals['_FSMCOMMAND_ARGUMENTSENTRY']._serialized_end=1672 _globals['_INCLUDEEXCLUDEREQUEST']._serialized_start=1684 _globals['_INCLUDEEXCLUDEREQUEST']._serialized_end=1846 - _globals['_INCLUDEEXCLUDERESPONSE']._serialized_start=1848 - _globals['_INCLUDEEXCLUDERESPONSE']._serialized_end=1886 - _globals['_STATUSRESPONSE']._serialized_start=1889 - _globals['_STATUSRESPONSE']._serialized_end=2133 - _globals['_DESCRIBERESPONSE']._serialized_start=2136 - _globals['_DESCRIBERESPONSE']._serialized_end=2383 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=2386 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=2661 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=2664 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=2917 - _globals['_ARGUMENT']._serialized_start=2920 - _globals['_ARGUMENT']._serialized_end=3286 - _globals['_ARGUMENT_PRESENCE']._serialized_start=3179 - _globals['_ARGUMENT_PRESENCE']._serialized_end=3218 - _globals['_ARGUMENT_TYPE']._serialized_start=3220 - _globals['_ARGUMENT_TYPE']._serialized_end=3268 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3289 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3441 - _globals['_FSMSEQUENCE']._serialized_start=3443 - _globals['_FSMSEQUENCE']._serialized_end=3489 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3492 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3758 - _globals['_STATUS']._serialized_start=3761 - _globals['_STATUS']._serialized_end=3916 - _globals['_RUNINFO']._serialized_start=3919 - _globals['_RUNINFO']._serialized_end=4125 - _globals['_CONTROLLER']._serialized_start=4285 - _globals['_CONTROLLER']._serialized_end=5635 + _globals['_INCLUDEEXCLUDERESPONSE']._serialized_start=1849 + _globals['_INCLUDEEXCLUDERESPONSE']._serialized_end=2066 + _globals['_STATUSRESPONSE']._serialized_start=2069 + _globals['_STATUSRESPONSE']._serialized_end=2313 + _globals['_DESCRIBERESPONSE']._serialized_start=2316 + _globals['_DESCRIBERESPONSE']._serialized_end=2563 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=2566 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=2841 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=2844 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=3097 + _globals['_ARGUMENT']._serialized_start=3100 + _globals['_ARGUMENT']._serialized_end=3466 + _globals['_ARGUMENT_PRESENCE']._serialized_start=3359 + _globals['_ARGUMENT_PRESENCE']._serialized_end=3398 + _globals['_ARGUMENT_TYPE']._serialized_start=3400 + _globals['_ARGUMENT_TYPE']._serialized_end=3448 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3469 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3621 + _globals['_FSMSEQUENCE']._serialized_start=3623 + _globals['_FSMSEQUENCE']._serialized_end=3669 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3672 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3938 + _globals['_STATUS']._serialized_start=3941 + _globals['_STATUS']._serialized_end=4096 + _globals['_RUNINFO']._serialized_start=4099 + _globals['_RUNINFO']._serialized_end=4305 + _globals['_CONTROLLER']._serialized_start=4465 + _globals['_CONTROLLER']._serialized_end=5815 # @@protoc_insertion_point(module_scope) diff --git a/src/druncschema/controller_pb2.pyi b/src/druncschema/controller_pb2.pyi index 8d6e109..c8309d6 100644 --- a/src/druncschema/controller_pb2.pyi +++ b/src/druncschema/controller_pb2.pyi @@ -278,14 +278,29 @@ global___IncludeExcludeRequest = IncludeExcludeRequest class IncludeExcludeResponse(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor + TOKEN_FIELD_NUMBER: builtins.int + NAME_FIELD_NUMBER: builtins.int TEXT_FIELD_NUMBER: builtins.int + CHILDREN_FIELD_NUMBER: builtins.int + FLAG_FIELD_NUMBER: builtins.int + name: builtins.str text: builtins.str + flag: druncschema.request_response_pb2.ResponseFlag.ValueType + @property + def token(self) -> druncschema.token_pb2.Token: ... + @property + def children(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___IncludeExcludeRequest]: ... def __init__( self, *, + token: druncschema.token_pb2.Token | None = ..., + name: builtins.str = ..., text: builtins.str = ..., + children: collections.abc.Iterable[global___IncludeExcludeRequest] | None = ..., + flag: druncschema.request_response_pb2.ResponseFlag.ValueType = ..., ) -> None: ... - def ClearField(self, field_name: typing.Literal["text", b"text"]) -> None: ... + def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["children", b"children", "flag", b"flag", "name", b"name", "text", b"text", "token", b"token"]) -> None: ... global___IncludeExcludeResponse = IncludeExcludeResponse From 85db7a82a6592cae29d1791e51718a7bbc64319f Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 7 Nov 2025 15:49:31 +0000 Subject: [PATCH 3/4] Correct IncludeExcludeResponse children type. --- schema/druncschema/controller.proto | 2 +- src/druncschema/controller_pb2.py | 60 ++++++++++++++--------------- src/druncschema/controller_pb2.pyi | 4 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index 923758d..c55ef7c 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -86,7 +86,7 @@ message IncludeExcludeResponse { Token token = 1; string name = 2; string text = 3; - repeated IncludeExcludeRequest children = 4; + repeated IncludeExcludeResponse children = 4; ResponseFlag flag = 5; } diff --git a/src/druncschema/controller_pb2.py b/src/druncschema/controller_pb2.py index ab217ab..a5b92f9 100644 --- a/src/druncschema/controller_pb2.py +++ b/src/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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\"\xa2\x01\n\x15IncludeExcludeRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x03 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x04 \x01(\x08\"\xd9\x01\n\x16IncludeExcludeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04text\x18\x03 \x01(\t\x12G\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\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\xc6\n\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\x00\x12z\n\x07include\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12z\n\x07\x65xclude\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\"\xa2\x01\n\x15IncludeExcludeRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x03 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x04 \x01(\x08\"\xda\x01\n\x16IncludeExcludeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04text\x18\x03 \x01(\t\x12H\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\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\xc6\n\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\x00\x12z\n\x07include\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12z\n\x07\x65xclude\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\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=4308 - _globals['_FSMRESPONSEFLAG']._serialized_end=4462 + _globals['_FSMRESPONSEFLAG']._serialized_start=4309 + _globals['_FSMRESPONSEFLAG']._serialized_end=4463 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEEXPERTCOMMANDREQUEST']._serialized_start=432 @@ -56,31 +56,31 @@ _globals['_INCLUDEEXCLUDEREQUEST']._serialized_start=1684 _globals['_INCLUDEEXCLUDEREQUEST']._serialized_end=1846 _globals['_INCLUDEEXCLUDERESPONSE']._serialized_start=1849 - _globals['_INCLUDEEXCLUDERESPONSE']._serialized_end=2066 - _globals['_STATUSRESPONSE']._serialized_start=2069 - _globals['_STATUSRESPONSE']._serialized_end=2313 - _globals['_DESCRIBERESPONSE']._serialized_start=2316 - _globals['_DESCRIBERESPONSE']._serialized_end=2563 - _globals['_DESCRIBEFSMRESPONSE']._serialized_start=2566 - _globals['_DESCRIBEFSMRESPONSE']._serialized_end=2841 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=2844 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=3097 - _globals['_ARGUMENT']._serialized_start=3100 - _globals['_ARGUMENT']._serialized_end=3466 - _globals['_ARGUMENT_PRESENCE']._serialized_start=3359 - _globals['_ARGUMENT_PRESENCE']._serialized_end=3398 - _globals['_ARGUMENT_TYPE']._serialized_start=3400 - _globals['_ARGUMENT_TYPE']._serialized_end=3448 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3469 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3621 - _globals['_FSMSEQUENCE']._serialized_start=3623 - _globals['_FSMSEQUENCE']._serialized_end=3669 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3672 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3938 - _globals['_STATUS']._serialized_start=3941 - _globals['_STATUS']._serialized_end=4096 - _globals['_RUNINFO']._serialized_start=4099 - _globals['_RUNINFO']._serialized_end=4305 - _globals['_CONTROLLER']._serialized_start=4465 - _globals['_CONTROLLER']._serialized_end=5815 + _globals['_INCLUDEEXCLUDERESPONSE']._serialized_end=2067 + _globals['_STATUSRESPONSE']._serialized_start=2070 + _globals['_STATUSRESPONSE']._serialized_end=2314 + _globals['_DESCRIBERESPONSE']._serialized_start=2317 + _globals['_DESCRIBERESPONSE']._serialized_end=2564 + _globals['_DESCRIBEFSMRESPONSE']._serialized_start=2567 + _globals['_DESCRIBEFSMRESPONSE']._serialized_end=2842 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=2845 + _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=3098 + _globals['_ARGUMENT']._serialized_start=3101 + _globals['_ARGUMENT']._serialized_end=3467 + _globals['_ARGUMENT_PRESENCE']._serialized_start=3360 + _globals['_ARGUMENT_PRESENCE']._serialized_end=3399 + _globals['_ARGUMENT_TYPE']._serialized_start=3401 + _globals['_ARGUMENT_TYPE']._serialized_end=3449 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3470 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3622 + _globals['_FSMSEQUENCE']._serialized_start=3624 + _globals['_FSMSEQUENCE']._serialized_end=3670 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3673 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3939 + _globals['_STATUS']._serialized_start=3942 + _globals['_STATUS']._serialized_end=4097 + _globals['_RUNINFO']._serialized_start=4100 + _globals['_RUNINFO']._serialized_end=4306 + _globals['_CONTROLLER']._serialized_start=4466 + _globals['_CONTROLLER']._serialized_end=5816 # @@protoc_insertion_point(module_scope) diff --git a/src/druncschema/controller_pb2.pyi b/src/druncschema/controller_pb2.pyi index c8309d6..7dc7bfe 100644 --- a/src/druncschema/controller_pb2.pyi +++ b/src/druncschema/controller_pb2.pyi @@ -289,14 +289,14 @@ class IncludeExcludeResponse(google.protobuf.message.Message): @property def token(self) -> druncschema.token_pb2.Token: ... @property - def children(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___IncludeExcludeRequest]: ... + def children(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___IncludeExcludeResponse]: ... def __init__( self, *, token: druncschema.token_pb2.Token | None = ..., name: builtins.str = ..., text: builtins.str = ..., - children: collections.abc.Iterable[global___IncludeExcludeRequest] | None = ..., + children: collections.abc.Iterable[global___IncludeExcludeResponse] | None = ..., flag: druncschema.request_response_pb2.ResponseFlag.ValueType = ..., ) -> None: ... def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ... From 0b124a53933ce29a935dd9a4e163ad1baf7a3bc5 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Mon, 10 Nov 2025 13:56:43 +0000 Subject: [PATCH 4/4] RecomputeStatusResponse -> StatusResponse. --- schema/druncschema/controller.proto | 10 +----- src/druncschema/controller_pb2.py | 44 ++++++++++++-------------- src/druncschema/controller_pb2.pyi | 31 ------------------ src/druncschema/controller_pb2_grpc.py | 6 ++-- 4 files changed, 25 insertions(+), 66 deletions(-) diff --git a/schema/druncschema/controller.proto b/schema/druncschema/controller.proto index c55ef7c..cb9ef30 100644 --- a/schema/druncschema/controller.proto +++ b/schema/druncschema/controller.proto @@ -16,7 +16,7 @@ service Controller { rpc execute_expert_command (ExecuteExpertCommandRequest) returns (ExecuteExpertCommandResponse) {} rpc include (IncludeExcludeRequest) returns (IncludeExcludeResponse) {} rpc exclude (IncludeExcludeRequest) returns (IncludeExcludeResponse) {} - rpc recompute_status (AddressedCommand) returns (RecomputeStatusResponse) {} + rpc recompute_status (AddressedCommand) returns (StatusResponse) {} rpc take_control (Request) returns (Response) {} rpc surrender_control (Request) returns (Response) {} @@ -114,14 +114,6 @@ message DescribeFSMResponse { ResponseFlag flag = 5; } -message RecomputeStatusResponse { - Token token = 1; - string name = 2; - Status status = 3; - repeated StatusResponse children = 4; - ResponseFlag flag = 5; -} - enum FSMResponseFlag { FSM_EXECUTED_SUCCESSFULLY = 0; FSM_FAILED = 1; diff --git a/src/druncschema/controller_pb2.py b/src/druncschema/controller_pb2.py index a5b92f9..7e1872f 100644 --- a/src/druncschema/controller_pb2.py +++ b/src/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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\"\xa2\x01\n\x15IncludeExcludeRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x03 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x04 \x01(\x08\"\xda\x01\n\x16IncludeExcludeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04text\x18\x03 \x01(\t\x12H\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\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\xc6\n\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\x00\x12z\n\x07include\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12z\n\x07\x65xclude\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\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\"\xbd\x01\n\x1b\x45xecuteExpertCommandRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x13\n\x0bjson_string\x18\x02 \x01(\t\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\"\xa9\x02\n\x1c\x45xecuteExpertCommandResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12N\n\x08\x63hildren\x18\x05 \x03(\x0b\x32<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\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\"\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\"\xa2\x01\n\x15IncludeExcludeRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1a\n\x12\x65xecute_along_path\x18\x03 \x01(\x08\x12\x32\n*execute_on_all_subsequent_children_in_path\x18\x04 \x01(\x08\"\xda\x01\n\x16IncludeExcludeResponse\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04text\x18\x03 \x01(\t\x12H\n\x08\x63hildren\x18\x04 \x03(\x0b\x32\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\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\"\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\xbd\n\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\x12\x95\x01\n\x16\x65xecute_expert_command\x12;.dunedaq.druncschema.controller.ExecuteExpertCommandRequest\x1a<.dunedaq.druncschema.controller.ExecuteExpertCommandResponse\"\x00\x12z\n\x07include\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12z\n\x07\x65xclude\x12\x35.dunedaq.druncschema.controller.IncludeExcludeRequest\x1a\x36.dunedaq.druncschema.controller.IncludeExcludeResponse\"\x00\x12v\n\x10recompute_status\x12\x30.dunedaq.druncschema.controller.AddressedCommand\x1a..dunedaq.druncschema.controller.StatusResponse\"\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=4309 - _globals['_FSMRESPONSEFLAG']._serialized_end=4463 + _globals['_FSMRESPONSEFLAG']._serialized_start=4053 + _globals['_FSMRESPONSEFLAG']._serialized_end=4207 _globals['_ADDRESSEDCOMMAND']._serialized_start=184 _globals['_ADDRESSEDCOMMAND']._serialized_end=429 _globals['_EXECUTEEXPERTCOMMANDREQUEST']._serialized_start=432 @@ -63,24 +63,22 @@ _globals['_DESCRIBERESPONSE']._serialized_end=2564 _globals['_DESCRIBEFSMRESPONSE']._serialized_start=2567 _globals['_DESCRIBEFSMRESPONSE']._serialized_end=2842 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_start=2845 - _globals['_RECOMPUTESTATUSRESPONSE']._serialized_end=3098 - _globals['_ARGUMENT']._serialized_start=3101 - _globals['_ARGUMENT']._serialized_end=3467 - _globals['_ARGUMENT_PRESENCE']._serialized_start=3360 - _globals['_ARGUMENT_PRESENCE']._serialized_end=3399 - _globals['_ARGUMENT_TYPE']._serialized_start=3401 - _globals['_ARGUMENT_TYPE']._serialized_end=3449 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3470 - _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3622 - _globals['_FSMSEQUENCE']._serialized_start=3624 - _globals['_FSMSEQUENCE']._serialized_end=3670 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3673 - _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3939 - _globals['_STATUS']._serialized_start=3942 - _globals['_STATUS']._serialized_end=4097 - _globals['_RUNINFO']._serialized_start=4100 - _globals['_RUNINFO']._serialized_end=4306 - _globals['_CONTROLLER']._serialized_start=4466 - _globals['_CONTROLLER']._serialized_end=5816 + _globals['_ARGUMENT']._serialized_start=2845 + _globals['_ARGUMENT']._serialized_end=3211 + _globals['_ARGUMENT_PRESENCE']._serialized_start=3104 + _globals['_ARGUMENT_PRESENCE']._serialized_end=3143 + _globals['_ARGUMENT_TYPE']._serialized_start=3145 + _globals['_ARGUMENT_TYPE']._serialized_end=3193 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_start=3214 + _globals['_FSMCOMMANDDESCRIPTION']._serialized_end=3366 + _globals['_FSMSEQUENCE']._serialized_start=3368 + _globals['_FSMSEQUENCE']._serialized_end=3414 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_start=3417 + _globals['_FSMCOMMANDSDESCRIPTION']._serialized_end=3683 + _globals['_STATUS']._serialized_start=3686 + _globals['_STATUS']._serialized_end=3841 + _globals['_RUNINFO']._serialized_start=3844 + _globals['_RUNINFO']._serialized_end=4050 + _globals['_CONTROLLER']._serialized_start=4210 + _globals['_CONTROLLER']._serialized_end=5551 # @@protoc_insertion_point(module_scope) diff --git a/src/druncschema/controller_pb2.pyi b/src/druncschema/controller_pb2.pyi index 7dc7bfe..6f2c2c8 100644 --- a/src/druncschema/controller_pb2.pyi +++ b/src/druncschema/controller_pb2.pyi @@ -397,37 +397,6 @@ class DescribeFSMResponse(google.protobuf.message.Message): global___DescribeFSMResponse = DescribeFSMResponse -@typing.final -class RecomputeStatusResponse(google.protobuf.message.Message): - DESCRIPTOR: google.protobuf.descriptor.Descriptor - - TOKEN_FIELD_NUMBER: builtins.int - NAME_FIELD_NUMBER: builtins.int - STATUS_FIELD_NUMBER: builtins.int - CHILDREN_FIELD_NUMBER: builtins.int - FLAG_FIELD_NUMBER: builtins.int - name: builtins.str - flag: druncschema.request_response_pb2.ResponseFlag.ValueType - @property - def token(self) -> druncschema.token_pb2.Token: ... - @property - def status(self) -> global___Status: ... - @property - def children(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___StatusResponse]: ... - def __init__( - self, - *, - token: druncschema.token_pb2.Token | None = ..., - name: builtins.str = ..., - status: global___Status | None = ..., - children: collections.abc.Iterable[global___StatusResponse] | None = ..., - flag: druncschema.request_response_pb2.ResponseFlag.ValueType = ..., - ) -> None: ... - def HasField(self, field_name: typing.Literal["status", b"status", "token", b"token"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["children", b"children", "flag", b"flag", "name", b"name", "status", b"status", "token", b"token"]) -> None: ... - -global___RecomputeStatusResponse = RecomputeStatusResponse - @typing.final class Argument(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor diff --git a/src/druncschema/controller_pb2_grpc.py b/src/druncschema/controller_pb2_grpc.py index 8fa38c1..8bf0bf1 100644 --- a/src/druncschema/controller_pb2_grpc.py +++ b/src/druncschema/controller_pb2_grpc.py @@ -73,7 +73,7 @@ def __init__(self, channel): self.recompute_status = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/recompute_status', request_serializer=druncschema_dot_controller__pb2.AddressedCommand.SerializeToString, - response_deserializer=druncschema_dot_controller__pb2.RecomputeStatusResponse.FromString, + response_deserializer=druncschema_dot_controller__pb2.StatusResponse.FromString, _registered_method=True) self.take_control = channel.unary_unary( '/dunedaq.druncschema.controller.Controller/take_control', @@ -213,7 +213,7 @@ def add_ControllerServicer_to_server(servicer, server): 'recompute_status': grpc.unary_unary_rpc_method_handler( servicer.recompute_status, request_deserializer=druncschema_dot_controller__pb2.AddressedCommand.FromString, - response_serializer=druncschema_dot_controller__pb2.RecomputeStatusResponse.SerializeToString, + response_serializer=druncschema_dot_controller__pb2.StatusResponse.SerializeToString, ), 'take_control': grpc.unary_unary_rpc_method_handler( servicer.take_control, @@ -451,7 +451,7 @@ def recompute_status(request, target, '/dunedaq.druncschema.controller.Controller/recompute_status', druncschema_dot_controller__pb2.AddressedCommand.SerializeToString, - druncschema_dot_controller__pb2.RecomputeStatusResponse.FromString, + druncschema_dot_controller__pb2.StatusResponse.FromString, options, channel_credentials, insecure,