From 91534cc8f90b81396e66cec497f9147009fff0e4 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Thu, 24 Jul 2025 13:17:21 +0100 Subject: [PATCH 01/11] Procman describe uses new Description msg. --- .../druncschema/process_manager_pb2.py | 79 ++++++++++--------- .../druncschema/process_manager_pb2_grpc.py | 7 +- schema/druncschema/process_manager.proto | 3 +- 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index 3a38e40..f8578ec 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -23,9 +23,10 @@ from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 +from druncschema import description_pb2 as druncschema_dot_description__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\"K\n\x13ProcessInstanceList\x12\x34\n\x06values\x18\x01 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance2\xd3\x04\n\x0eProcessManager\x12I\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12J\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x46\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x43\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\"K\n\x13ProcessInstanceList\x12\x34\n\x06values\x18\x01 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance2\xd6\x04\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12J\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x46\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x43\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -34,42 +35,42 @@ DESCRIPTOR._loaded_options = None _globals['_PROCESSDESCRIPTION_ENVENTRY']._loaded_options = None _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_options = b'8\001' - _globals['_PROCESSRESTRICTION']._serialized_start=94 - _globals['_PROCESSRESTRICTION']._serialized_end=165 - _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_start=167 - _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_end=226 - _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_start=228 - _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_end=273 - _globals['_EXCEPTIONNOTIFICATION']._serialized_start=276 - _globals['_EXCEPTIONNOTIFICATION']._serialized_end=461 - _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_start=396 - _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_end=461 - _globals['_LOGREQUEST']._serialized_start=463 - _globals['_LOGREQUEST']._serialized_end=542 - _globals['_LOGLINES']._serialized_start=544 - _globals['_LOGLINES']._serialized_end=617 - _globals['_PROCESSUUID']._serialized_start=619 - _globals['_PROCESSUUID']._serialized_end=646 - _globals['_PROCESSMETADATA']._serialized_start=649 - _globals['_PROCESSMETADATA']._serialized_end=828 - _globals['_PROCESSQUERY']._serialized_start=830 - _globals['_PROCESSQUERY']._serialized_end=939 - _globals['_PROCESSDESCRIPTION']._serialized_start=942 - _globals['_PROCESSDESCRIPTION']._serialized_end=1349 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1234 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1262 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1264 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1305 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1307 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1349 - _globals['_PROCESSINSTANCE']._serialized_start=1352 - _globals['_PROCESSINSTANCE']._serialized_end=1685 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1650 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1685 - _globals['_BOOTREQUEST']._serialized_start=1688 - _globals['_BOOTREQUEST']._serialized_end=1841 - _globals['_PROCESSINSTANCELIST']._serialized_start=1843 - _globals['_PROCESSINSTANCELIST']._serialized_end=1918 - _globals['_PROCESSMANAGER']._serialized_start=1921 - _globals['_PROCESSMANAGER']._serialized_end=2516 + _globals['_PROCESSRESTRICTION']._serialized_start=125 + _globals['_PROCESSRESTRICTION']._serialized_end=196 + _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_start=198 + _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_end=257 + _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_start=259 + _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_end=304 + _globals['_EXCEPTIONNOTIFICATION']._serialized_start=307 + _globals['_EXCEPTIONNOTIFICATION']._serialized_end=492 + _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_start=427 + _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_end=492 + _globals['_LOGREQUEST']._serialized_start=494 + _globals['_LOGREQUEST']._serialized_end=573 + _globals['_LOGLINES']._serialized_start=575 + _globals['_LOGLINES']._serialized_end=648 + _globals['_PROCESSUUID']._serialized_start=650 + _globals['_PROCESSUUID']._serialized_end=677 + _globals['_PROCESSMETADATA']._serialized_start=680 + _globals['_PROCESSMETADATA']._serialized_end=859 + _globals['_PROCESSQUERY']._serialized_start=861 + _globals['_PROCESSQUERY']._serialized_end=970 + _globals['_PROCESSDESCRIPTION']._serialized_start=973 + _globals['_PROCESSDESCRIPTION']._serialized_end=1380 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1265 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1293 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1295 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1336 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1338 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1380 + _globals['_PROCESSINSTANCE']._serialized_start=1383 + _globals['_PROCESSINSTANCE']._serialized_end=1716 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1681 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1716 + _globals['_BOOTREQUEST']._serialized_start=1719 + _globals['_BOOTREQUEST']._serialized_end=1872 + _globals['_PROCESSINSTANCELIST']._serialized_start=1874 + _globals['_PROCESSINSTANCELIST']._serialized_end=1949 + _globals['_PROCESSMANAGER']._serialized_start=1952 + _globals['_PROCESSMANAGER']._serialized_end=2550 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index 36bb968..9ffca7d 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -3,6 +3,7 @@ import grpc import warnings +from druncschema import description_pb2 as druncschema_dot_description__pb2 from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 GRPC_GENERATED_VERSION = '1.68.0' @@ -37,7 +38,7 @@ def __init__(self, channel): self.describe = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/describe', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_description__pb2.Description.FromString, _registered_method=True) self.boot = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/boot', @@ -133,7 +134,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): 'describe': grpc.unary_unary_rpc_method_handler( servicer.describe, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_description__pb2.Description.SerializeToString, ), 'boot': grpc.unary_unary_rpc_method_handler( servicer.boot, @@ -197,7 +198,7 @@ def describe(request, target, '/dunedaq.druncschema.ProcessManager/describe', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_description__pb2.Description.FromString, options, channel_credentials, insecure, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index b2355c4..bfa9a57 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -3,9 +3,10 @@ syntax = "proto3"; package dunedaq.druncschema; import "druncschema/request_response.proto"; +import "druncschema/description.proto"; service ProcessManager { - rpc describe (Request) returns (Response) {} + rpc describe (Request) returns (Description) {} rpc boot (Request) returns (Response) {} rpc terminate (Request) returns (Response) {} rpc restart (Request) returns (Response) {} From df66a2f924f0e628d8dbe20d67dea5ad84947747 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Thu, 24 Jul 2025 17:13:51 +0100 Subject: [PATCH 02/11] New terminate and kill messages. --- .../druncschema/process_manager_pb2.py | 79 ++++++++++--------- .../druncschema/process_manager_pb2.pyi | 45 +++++++---- .../druncschema/process_manager_pb2_grpc.py | 13 +-- schema/druncschema/process_manager.proto | 22 +++--- 4 files changed, 89 insertions(+), 70 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index f8578ec..f1e6955 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -24,9 +24,10 @@ from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 from druncschema import description_pb2 as druncschema_dot_description__pb2 +from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\"K\n\x13ProcessInstanceList\x12\x34\n\x06values\x18\x01 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance2\xd6\x04\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12J\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12H\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x46\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x43\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xec\x04\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12H\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x46\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x43\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -35,42 +36,42 @@ DESCRIPTOR._loaded_options = None _globals['_PROCESSDESCRIPTION_ENVENTRY']._loaded_options = None _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_options = b'8\001' - _globals['_PROCESSRESTRICTION']._serialized_start=125 - _globals['_PROCESSRESTRICTION']._serialized_end=196 - _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_start=198 - _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_end=257 - _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_start=259 - _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_end=304 - _globals['_EXCEPTIONNOTIFICATION']._serialized_start=307 - _globals['_EXCEPTIONNOTIFICATION']._serialized_end=492 - _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_start=427 - _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_end=492 - _globals['_LOGREQUEST']._serialized_start=494 - _globals['_LOGREQUEST']._serialized_end=573 - _globals['_LOGLINES']._serialized_start=575 - _globals['_LOGLINES']._serialized_end=648 - _globals['_PROCESSUUID']._serialized_start=650 - _globals['_PROCESSUUID']._serialized_end=677 - _globals['_PROCESSMETADATA']._serialized_start=680 - _globals['_PROCESSMETADATA']._serialized_end=859 - _globals['_PROCESSQUERY']._serialized_start=861 - _globals['_PROCESSQUERY']._serialized_end=970 - _globals['_PROCESSDESCRIPTION']._serialized_start=973 - _globals['_PROCESSDESCRIPTION']._serialized_end=1380 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1265 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1293 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1295 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1336 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1338 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1380 - _globals['_PROCESSINSTANCE']._serialized_start=1383 - _globals['_PROCESSINSTANCE']._serialized_end=1716 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1681 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1716 - _globals['_BOOTREQUEST']._serialized_start=1719 - _globals['_BOOTREQUEST']._serialized_end=1872 - _globals['_PROCESSINSTANCELIST']._serialized_start=1874 - _globals['_PROCESSINSTANCELIST']._serialized_end=1949 - _globals['_PROCESSMANAGER']._serialized_start=1952 - _globals['_PROCESSMANAGER']._serialized_end=2550 + _globals['_PROCESSRESTRICTION']._serialized_start=150 + _globals['_PROCESSRESTRICTION']._serialized_end=221 + _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_start=223 + _globals['_COMMANDNOTIFICATIONMESSAGE']._serialized_end=282 + _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_start=284 + _globals['_GENERICNOTIFICATIONMESSAGE']._serialized_end=329 + _globals['_EXCEPTIONNOTIFICATION']._serialized_start=332 + _globals['_EXCEPTIONNOTIFICATION']._serialized_end=517 + _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_start=452 + _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_end=517 + _globals['_LOGREQUEST']._serialized_start=519 + _globals['_LOGREQUEST']._serialized_end=598 + _globals['_LOGLINES']._serialized_start=600 + _globals['_LOGLINES']._serialized_end=673 + _globals['_PROCESSUUID']._serialized_start=675 + _globals['_PROCESSUUID']._serialized_end=702 + _globals['_PROCESSMETADATA']._serialized_start=705 + _globals['_PROCESSMETADATA']._serialized_end=884 + _globals['_PROCESSQUERY']._serialized_start=886 + _globals['_PROCESSQUERY']._serialized_end=995 + _globals['_PROCESSDESCRIPTION']._serialized_start=998 + _globals['_PROCESSDESCRIPTION']._serialized_end=1405 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1290 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1318 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1320 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1361 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1363 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1405 + _globals['_PROCESSINSTANCE']._serialized_start=1408 + _globals['_PROCESSINSTANCE']._serialized_end=1741 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1706 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1741 + _globals['_PROCESSINSTANCELIST']._serialized_start=1744 + _globals['_PROCESSINSTANCELIST']._serialized_end=1925 + _globals['_BOOTREQUEST']._serialized_start=1928 + _globals['_BOOTREQUEST']._serialized_end=2081 + _globals['_PROCESSMANAGER']._serialized_start=2084 + _globals['_PROCESSMANAGER']._serialized_end=2704 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi index 0bb7c3b..4f813d7 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi @@ -5,6 +5,8 @@ isort:skip_file import builtins import collections.abc +import druncschema.request_response_pb2 +import druncschema.token_pb2 import google.protobuf.descriptor import google.protobuf.internal.containers import google.protobuf.internal.enum_type_wrapper @@ -352,38 +354,49 @@ class ProcessInstance(google.protobuf.message.Message): global___ProcessInstance = ProcessInstance @typing.final -class BootRequest(google.protobuf.message.Message): +class ProcessInstanceList(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor - PROCESS_DESCRIPTION_FIELD_NUMBER: builtins.int - PROCESS_RESTRICTION_FIELD_NUMBER: builtins.int + NAME_FIELD_NUMBER: builtins.int + TOKEN_FIELD_NUMBER: builtins.int + VALUES_FIELD_NUMBER: builtins.int + FLAG_FIELD_NUMBER: builtins.int + name: builtins.str + flag: druncschema.request_response_pb2.ResponseFlag.ValueType @property - def process_description(self) -> global___ProcessDescription: ... + def token(self) -> druncschema.token_pb2.Token: ... @property - def process_restriction(self) -> global___ProcessRestriction: ... + def values(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___ProcessInstance]: ... def __init__( self, *, - process_description: global___ProcessDescription | None = ..., - process_restriction: global___ProcessRestriction | None = ..., + name: builtins.str = ..., + token: druncschema.token_pb2.Token | None = ..., + values: collections.abc.Iterable[global___ProcessInstance] | None = ..., + flag: druncschema.request_response_pb2.ResponseFlag.ValueType = ..., ) -> None: ... - def HasField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction"]) -> None: ... + def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["flag", b"flag", "name", b"name", "token", b"token", "values", b"values"]) -> None: ... -global___BootRequest = BootRequest +global___ProcessInstanceList = ProcessInstanceList @typing.final -class ProcessInstanceList(google.protobuf.message.Message): +class BootRequest(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor - VALUES_FIELD_NUMBER: builtins.int + PROCESS_DESCRIPTION_FIELD_NUMBER: builtins.int + PROCESS_RESTRICTION_FIELD_NUMBER: builtins.int @property - def values(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___ProcessInstance]: ... + def process_description(self) -> global___ProcessDescription: ... + @property + def process_restriction(self) -> global___ProcessRestriction: ... def __init__( self, *, - values: collections.abc.Iterable[global___ProcessInstance] | None = ..., + process_description: global___ProcessDescription | None = ..., + process_restriction: global___ProcessRestriction | None = ..., ) -> None: ... - def ClearField(self, field_name: typing.Literal["values", b"values"]) -> None: ... + def HasField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction"]) -> None: ... -global___ProcessInstanceList = ProcessInstanceList +global___BootRequest = BootRequest diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index 9ffca7d..f879cc7 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -4,6 +4,7 @@ import warnings from druncschema import description_pb2 as druncschema_dot_description__pb2 +from druncschema import process_manager_pb2 as druncschema_dot_process__manager__pb2 from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 GRPC_GENERATED_VERSION = '1.68.0' @@ -48,7 +49,7 @@ def __init__(self, channel): self.terminate = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/terminate', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.restart = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/restart', @@ -58,7 +59,7 @@ def __init__(self, channel): self.kill = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/kill', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.flush = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/flush', @@ -144,7 +145,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): 'terminate': grpc.unary_unary_rpc_method_handler( servicer.terminate, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'restart': grpc.unary_unary_rpc_method_handler( servicer.restart, @@ -154,7 +155,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): 'kill': grpc.unary_unary_rpc_method_handler( servicer.kill, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'flush': grpc.unary_unary_rpc_method_handler( servicer.flush, @@ -252,7 +253,7 @@ def terminate(request, target, '/dunedaq.druncschema.ProcessManager/terminate', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, @@ -306,7 +307,7 @@ def kill(request, target, '/dunedaq.druncschema.ProcessManager/kill', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index bfa9a57..7133c86 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -4,13 +4,14 @@ package dunedaq.druncschema; import "druncschema/request_response.proto"; import "druncschema/description.proto"; +import "druncschema/token.proto"; service ProcessManager { rpc describe (Request) returns (Description) {} rpc boot (Request) returns (Response) {} - rpc terminate (Request) returns (Response) {} + rpc terminate (Request) returns (ProcessInstanceList) {} rpc restart (Request) returns (Response) {} - rpc kill (Request) returns (Response) {} + rpc kill (Request) returns (ProcessInstanceList) {} rpc flush (Request) returns (Response) {} rpc ps (Request) returns (Response) {} rpc logs (Request) returns (Response) {} @@ -98,11 +99,14 @@ message ProcessInstance { ProcessUUID uuid = 5; } - message BootRequest { - ProcessDescription process_description = 1; - ProcessRestriction process_restriction = 2; - } +message ProcessInstanceList{ + string name = 1; + Token token = 2; + repeated ProcessInstance values = 3; + ResponseFlag flag = 4; +} - message ProcessInstanceList{ - repeated ProcessInstance values = 1; - } +message BootRequest { + ProcessDescription process_description = 1; + ProcessRestriction process_restriction = 2; +} From 9710e0f9213c07bf2eed1468673c02d63aeb4e30 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Thu, 24 Jul 2025 17:48:01 +0100 Subject: [PATCH 03/11] New restart messages. --- python_not_for_dunedaq/druncschema/process_manager_pb2.py | 4 ++-- .../druncschema/process_manager_pb2_grpc.py | 6 +++--- schema/druncschema/process_manager.proto | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index f1e6955..977aa5e 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -27,7 +27,7 @@ from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xec\x04\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12H\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x46\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x43\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xf7\x04\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x46\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x43\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -73,5 +73,5 @@ _globals['_BOOTREQUEST']._serialized_start=1928 _globals['_BOOTREQUEST']._serialized_end=2081 _globals['_PROCESSMANAGER']._serialized_start=2084 - _globals['_PROCESSMANAGER']._serialized_end=2704 + _globals['_PROCESSMANAGER']._serialized_end=2715 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index f879cc7..476ece3 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -54,7 +54,7 @@ def __init__(self, channel): self.restart = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/restart', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.kill = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/kill', @@ -150,7 +150,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): 'restart': grpc.unary_unary_rpc_method_handler( servicer.restart, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'kill': grpc.unary_unary_rpc_method_handler( servicer.kill, @@ -280,7 +280,7 @@ def restart(request, target, '/dunedaq.druncschema.ProcessManager/restart', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index 7133c86..cdba02f 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -10,7 +10,7 @@ service ProcessManager { rpc describe (Request) returns (Description) {} rpc boot (Request) returns (Response) {} rpc terminate (Request) returns (ProcessInstanceList) {} - rpc restart (Request) returns (Response) {} + rpc restart (Request) returns (ProcessInstanceList) {} rpc kill (Request) returns (ProcessInstanceList) {} rpc flush (Request) returns (Response) {} rpc ps (Request) returns (Response) {} From 69d07d76461622ff02f8013c45fcdf51906fa338 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 25 Jul 2025 14:32:43 +0100 Subject: [PATCH 04/11] Most PM commands' messages except boot and logs. --- .../druncschema/process_manager_pb2.py | 4 ++-- .../druncschema/process_manager_pb2_grpc.py | 12 ++++++------ schema/druncschema/process_manager.proto | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index 977aa5e..4404239 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -27,7 +27,7 @@ from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xf7\x04\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x46\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x43\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\x8d\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12Q\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12N\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -73,5 +73,5 @@ _globals['_BOOTREQUEST']._serialized_start=1928 _globals['_BOOTREQUEST']._serialized_end=2081 _globals['_PROCESSMANAGER']._serialized_start=2084 - _globals['_PROCESSMANAGER']._serialized_end=2715 + _globals['_PROCESSMANAGER']._serialized_end=2737 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index 476ece3..2f89756 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -64,12 +64,12 @@ def __init__(self, channel): self.flush = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/flush', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.ps = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/ps', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.logs = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/logs', @@ -160,12 +160,12 @@ def add_ProcessManagerServicer_to_server(servicer, server): 'flush': grpc.unary_unary_rpc_method_handler( servicer.flush, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'ps': grpc.unary_unary_rpc_method_handler( servicer.ps, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'logs': grpc.unary_unary_rpc_method_handler( servicer.logs, @@ -334,7 +334,7 @@ def flush(request, target, '/dunedaq.druncschema.ProcessManager/flush', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, @@ -361,7 +361,7 @@ def ps(request, target, '/dunedaq.druncschema.ProcessManager/ps', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index cdba02f..121f9c0 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -12,8 +12,8 @@ service ProcessManager { rpc terminate (Request) returns (ProcessInstanceList) {} rpc restart (Request) returns (ProcessInstanceList) {} rpc kill (Request) returns (ProcessInstanceList) {} - rpc flush (Request) returns (Response) {} - rpc ps (Request) returns (Response) {} + rpc flush (Request) returns (ProcessInstanceList) {} + rpc ps (Request) returns (ProcessInstanceList) {} rpc logs (Request) returns (Response) {} } From 840f02497c1359eb45daefcc7f224f8f16390fc0 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 25 Jul 2025 16:25:06 +0100 Subject: [PATCH 05/11] Same treatment for logs message. --- .../druncschema/process_manager_pb2.py | 54 +++++++++---------- .../druncschema/process_manager_pb2.pyi | 14 ++++- .../druncschema/process_manager_pb2_grpc.py | 6 +-- schema/druncschema/process_manager.proto | 13 +++-- 4 files changed, 50 insertions(+), 37 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index 4404239..3990ac1 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -27,7 +27,7 @@ from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"I\n\x08LogLines\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x02 \x03(\t\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\x8d\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12Q\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12N\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\x8d\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12Q\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12N\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -48,30 +48,30 @@ _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_end=517 _globals['_LOGREQUEST']._serialized_start=519 _globals['_LOGREQUEST']._serialized_end=598 - _globals['_LOGLINES']._serialized_start=600 - _globals['_LOGLINES']._serialized_end=673 - _globals['_PROCESSUUID']._serialized_start=675 - _globals['_PROCESSUUID']._serialized_end=702 - _globals['_PROCESSMETADATA']._serialized_start=705 - _globals['_PROCESSMETADATA']._serialized_end=884 - _globals['_PROCESSQUERY']._serialized_start=886 - _globals['_PROCESSQUERY']._serialized_end=995 - _globals['_PROCESSDESCRIPTION']._serialized_start=998 - _globals['_PROCESSDESCRIPTION']._serialized_end=1405 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1290 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1318 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1320 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1361 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1363 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1405 - _globals['_PROCESSINSTANCE']._serialized_start=1408 - _globals['_PROCESSINSTANCE']._serialized_end=1741 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1706 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1741 - _globals['_PROCESSINSTANCELIST']._serialized_start=1744 - _globals['_PROCESSINSTANCELIST']._serialized_end=1925 - _globals['_BOOTREQUEST']._serialized_start=1928 - _globals['_BOOTREQUEST']._serialized_end=2081 - _globals['_PROCESSMANAGER']._serialized_start=2084 - _globals['_PROCESSMANAGER']._serialized_end=2737 + _globals['_LOGLINES']._serialized_start=601 + _globals['_LOGLINES']._serialized_end=780 + _globals['_PROCESSUUID']._serialized_start=782 + _globals['_PROCESSUUID']._serialized_end=809 + _globals['_PROCESSMETADATA']._serialized_start=812 + _globals['_PROCESSMETADATA']._serialized_end=991 + _globals['_PROCESSQUERY']._serialized_start=993 + _globals['_PROCESSQUERY']._serialized_end=1102 + _globals['_PROCESSDESCRIPTION']._serialized_start=1105 + _globals['_PROCESSDESCRIPTION']._serialized_end=1512 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1397 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1425 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1427 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1468 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1470 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1512 + _globals['_PROCESSINSTANCE']._serialized_start=1515 + _globals['_PROCESSINSTANCE']._serialized_end=1848 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1813 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1848 + _globals['_PROCESSINSTANCELIST']._serialized_start=1851 + _globals['_PROCESSINSTANCELIST']._serialized_end=2032 + _globals['_BOOTREQUEST']._serialized_start=2035 + _globals['_BOOTREQUEST']._serialized_end=2188 + _globals['_PROCESSMANAGER']._serialized_start=2191 + _globals['_PROCESSMANAGER']._serialized_end=2844 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi index 4f813d7..9917f38 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi @@ -136,8 +136,15 @@ global___LogRequest = LogRequest class LogLines(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor + NAME_FIELD_NUMBER: builtins.int + TOKEN_FIELD_NUMBER: builtins.int UUID_FIELD_NUMBER: builtins.int LINES_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 uuid(self) -> global___ProcessUUID: ... @property @@ -145,11 +152,14 @@ class LogLines(google.protobuf.message.Message): def __init__( self, *, + name: builtins.str = ..., + token: druncschema.token_pb2.Token | None = ..., uuid: global___ProcessUUID | None = ..., lines: collections.abc.Iterable[builtins.str] | None = ..., + flag: druncschema.request_response_pb2.ResponseFlag.ValueType = ..., ) -> None: ... - def HasField(self, field_name: typing.Literal["uuid", b"uuid"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["lines", b"lines", "uuid", b"uuid"]) -> None: ... + def HasField(self, field_name: typing.Literal["token", b"token", "uuid", b"uuid"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["flag", b"flag", "lines", b"lines", "name", b"name", "token", b"token", "uuid", b"uuid"]) -> None: ... global___LogLines = LogLines diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index 2f89756..e289a36 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -74,7 +74,7 @@ def __init__(self, channel): self.logs = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/logs', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_process__manager__pb2.LogLines.FromString, _registered_method=True) @@ -170,7 +170,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): 'logs': grpc.unary_unary_rpc_method_handler( servicer.logs, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_process__manager__pb2.LogLines.SerializeToString, ), } generic_handler = grpc.method_handlers_generic_handler( @@ -388,7 +388,7 @@ def logs(request, target, '/dunedaq.druncschema.ProcessManager/logs', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_process__manager__pb2.LogLines.FromString, options, channel_credentials, insecure, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index 121f9c0..9e385cc 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -14,7 +14,7 @@ service ProcessManager { rpc kill (Request) returns (ProcessInstanceList) {} rpc flush (Request) returns (ProcessInstanceList) {} rpc ps (Request) returns (ProcessInstanceList) {} - rpc logs (Request) returns (Response) {} + rpc logs (Request) returns (LogLines) {} } message ProcessRestriction { @@ -32,7 +32,7 @@ message GenericNotificationMessage { } message ExceptionNotification { - message StackLine{ + message StackLine { string line_text = 1; string line_number = 2; string file = 3; @@ -47,8 +47,11 @@ message LogRequest { } message LogLines { - ProcessUUID uuid = 1; - repeated string lines = 2; + string name = 1; + Token token = 2; + ProcessUUID uuid = 3; + repeated string lines = 4; + ResponseFlag flag = 5; } message ProcessUUID { @@ -99,7 +102,7 @@ message ProcessInstance { ProcessUUID uuid = 5; } -message ProcessInstanceList{ +message ProcessInstanceList { string name = 1; Token token = 2; repeated ProcessInstance values = 3; From 64f7a69986ce6390da9327b5bdc1d98b5d98d39e Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Fri, 25 Jul 2025 17:01:45 +0100 Subject: [PATCH 06/11] New boot message. --- python_not_for_dunedaq/druncschema/process_manager_pb2.py | 4 ++-- .../druncschema/process_manager_pb2_grpc.py | 6 +++--- schema/druncschema/process_manager.proto | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index 3990ac1..b82a905 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -27,7 +27,7 @@ from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\x8d\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12\x45\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.Response\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12Q\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12N\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\x98\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12P\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12Q\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12N\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -73,5 +73,5 @@ _globals['_BOOTREQUEST']._serialized_start=2035 _globals['_BOOTREQUEST']._serialized_end=2188 _globals['_PROCESSMANAGER']._serialized_start=2191 - _globals['_PROCESSMANAGER']._serialized_end=2844 + _globals['_PROCESSMANAGER']._serialized_end=2855 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index e289a36..d1e7343 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -44,7 +44,7 @@ def __init__(self, channel): self.boot = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/boot', request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.terminate = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/terminate', @@ -140,7 +140,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): 'boot': grpc.unary_unary_rpc_method_handler( servicer.boot, request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'terminate': grpc.unary_unary_rpc_method_handler( servicer.terminate, @@ -226,7 +226,7 @@ def boot(request, target, '/dunedaq.druncschema.ProcessManager/boot', druncschema_dot_request__response__pb2.Request.SerializeToString, - druncschema_dot_request__response__pb2.Response.FromString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index 9e385cc..166af21 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -8,7 +8,7 @@ import "druncschema/token.proto"; service ProcessManager { rpc describe (Request) returns (Description) {} - rpc boot (Request) returns (Response) {} + rpc boot (Request) returns (ProcessInstanceList) {} rpc terminate (Request) returns (ProcessInstanceList) {} rpc restart (Request) returns (ProcessInstanceList) {} rpc kill (Request) returns (ProcessInstanceList) {} From 64694208362c6570800a7849a8e69171c7bd747d Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Mon, 28 Jul 2025 14:02:43 +0100 Subject: [PATCH 07/11] Simplify SM client. --- .../druncschema/session_manager_pb2.py | 23 ++++++++++--------- .../druncschema/session_manager_pb2_grpc.py | 20 ++++++++-------- schema/druncschema/session_manager.proto | 7 +++--- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/session_manager_pb2.py b/python_not_for_dunedaq/druncschema/session_manager_pb2.py index af66203..0536934 100644 --- a/python_not_for_dunedaq/druncschema/session_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/session_manager_pb2.py @@ -25,23 +25,24 @@ from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 from druncschema import description_pb2 as druncschema_dot_description__pb2 from druncschema import token_pb2 as druncschema_dot_token__pb2 +from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/session_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"-\n\tConfigKey\x12\x0c\n\x04\x66ile\x18\x01 \x01(\t\x12\x12\n\nsession_id\x18\x02 \x01(\t\"\xae\x01\n\rAllConfigKeys\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x33\n\x0b\x63onfig_keys\x18\x03 \x03(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"_\n\rActiveSession\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x32\n\nconfig_key\x18\x03 \x01(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\"\xba\x01\n\x11\x41llActiveSessions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x0f\x61\x63tive_sessions\x18\x03 \x03(\x0b\x32\".dunedaq.druncschema.ActiveSession\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag2\x93\x02\n\x0eSessionManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12[\n\x11list_all_sessions\x12\x1c.dunedaq.druncschema.Request\x1a&.dunedaq.druncschema.AllActiveSessions\"\x00\x12V\n\x10list_all_configs\x12\x1c.dunedaq.druncschema.Request\x1a\".dunedaq.druncschema.AllConfigKeys\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/session_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x1bgoogle/protobuf/empty.proto\"-\n\tConfigKey\x12\x0c\n\x04\x66ile\x18\x01 \x01(\t\x12\x12\n\nsession_id\x18\x02 \x01(\t\"\xae\x01\n\rAllConfigKeys\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x33\n\x0b\x63onfig_keys\x18\x03 \x03(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"_\n\rActiveSession\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x32\n\nconfig_key\x18\x03 \x01(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\"\xba\x01\n\x11\x41llActiveSessions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x0f\x61\x63tive_sessions\x18\x03 \x03(\x0b\x32\".dunedaq.druncschema.ActiveSession\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag2\x81\x02\n\x0eSessionManager\x12\x46\n\x08\x64\x65scribe\x12\x16.google.protobuf.Empty\x1a .dunedaq.druncschema.Description\"\x00\x12U\n\x11list_all_sessions\x12\x16.google.protobuf.Empty\x1a&.dunedaq.druncschema.AllActiveSessions\"\x00\x12P\n\x10list_all_configs\x12\x16.google.protobuf.Empty\x1a\".dunedaq.druncschema.AllConfigKeys\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'druncschema.session_manager_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: DESCRIPTOR._loaded_options = None - _globals['_CONFIGKEY']._serialized_start=150 - _globals['_CONFIGKEY']._serialized_end=195 - _globals['_ALLCONFIGKEYS']._serialized_start=198 - _globals['_ALLCONFIGKEYS']._serialized_end=372 - _globals['_ACTIVESESSION']._serialized_start=374 - _globals['_ACTIVESESSION']._serialized_end=469 - _globals['_ALLACTIVESESSIONS']._serialized_start=472 - _globals['_ALLACTIVESESSIONS']._serialized_end=658 - _globals['_SESSIONMANAGER']._serialized_start=661 - _globals['_SESSIONMANAGER']._serialized_end=936 + _globals['_CONFIGKEY']._serialized_start=179 + _globals['_CONFIGKEY']._serialized_end=224 + _globals['_ALLCONFIGKEYS']._serialized_start=227 + _globals['_ALLCONFIGKEYS']._serialized_end=401 + _globals['_ACTIVESESSION']._serialized_start=403 + _globals['_ACTIVESESSION']._serialized_end=498 + _globals['_ALLACTIVESESSIONS']._serialized_start=501 + _globals['_ALLACTIVESESSIONS']._serialized_end=687 + _globals['_SESSIONMANAGER']._serialized_start=690 + _globals['_SESSIONMANAGER']._serialized_end=947 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py index ef72979..e0c26dd 100644 --- a/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py @@ -4,8 +4,8 @@ import warnings from druncschema import description_pb2 as druncschema_dot_description__pb2 -from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 from druncschema import session_manager_pb2 as druncschema_dot_session__manager__pb2 +from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 GRPC_GENERATED_VERSION = '1.68.0' GRPC_VERSION = grpc.__version__ @@ -38,17 +38,17 @@ def __init__(self, channel): """ self.describe = channel.unary_unary( '/dunedaq.druncschema.SessionManager/describe', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=druncschema_dot_description__pb2.Description.FromString, _registered_method=True) self.list_all_sessions = channel.unary_unary( '/dunedaq.druncschema.SessionManager/list_all_sessions', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=druncschema_dot_session__manager__pb2.AllActiveSessions.FromString, _registered_method=True) self.list_all_configs = channel.unary_unary( '/dunedaq.druncschema.SessionManager/list_all_configs', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=druncschema_dot_session__manager__pb2.AllConfigKeys.FromString, _registered_method=True) @@ -79,17 +79,17 @@ def add_SessionManagerServicer_to_server(servicer, server): rpc_method_handlers = { 'describe': grpc.unary_unary_rpc_method_handler( servicer.describe, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, response_serializer=druncschema_dot_description__pb2.Description.SerializeToString, ), 'list_all_sessions': grpc.unary_unary_rpc_method_handler( servicer.list_all_sessions, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, response_serializer=druncschema_dot_session__manager__pb2.AllActiveSessions.SerializeToString, ), 'list_all_configs': grpc.unary_unary_rpc_method_handler( servicer.list_all_configs, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, response_serializer=druncschema_dot_session__manager__pb2.AllConfigKeys.SerializeToString, ), } @@ -118,7 +118,7 @@ def describe(request, request, target, '/dunedaq.druncschema.SessionManager/describe', - druncschema_dot_request__response__pb2.Request.SerializeToString, + google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, druncschema_dot_description__pb2.Description.FromString, options, channel_credentials, @@ -145,7 +145,7 @@ def list_all_sessions(request, request, target, '/dunedaq.druncschema.SessionManager/list_all_sessions', - druncschema_dot_request__response__pb2.Request.SerializeToString, + google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, druncschema_dot_session__manager__pb2.AllActiveSessions.FromString, options, channel_credentials, @@ -172,7 +172,7 @@ def list_all_configs(request, request, target, '/dunedaq.druncschema.SessionManager/list_all_configs', - druncschema_dot_request__response__pb2.Request.SerializeToString, + google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, druncschema_dot_session__manager__pb2.AllConfigKeys.FromString, options, channel_credentials, diff --git a/schema/druncschema/session_manager.proto b/schema/druncschema/session_manager.proto index d0c0848..8949d78 100644 --- a/schema/druncschema/session_manager.proto +++ b/schema/druncschema/session_manager.proto @@ -5,11 +5,12 @@ package dunedaq.druncschema; import "druncschema/request_response.proto"; import "druncschema/description.proto"; import "druncschema/token.proto"; +import "google/protobuf/empty.proto"; service SessionManager { - rpc describe (Request) returns (Description) {} - rpc list_all_sessions (Request) returns (AllActiveSessions) {} - rpc list_all_configs (Request) returns (AllConfigKeys) {} + rpc describe (google.protobuf.Empty) returns (Description) {} + rpc list_all_sessions (google.protobuf.Empty) returns (AllActiveSessions) {} + rpc list_all_configs (google.protobuf.Empty) returns (AllConfigKeys) {} } message ConfigKey { From 87a4867ea4b73ae7e181504ecc423f9ae346b192 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Mon, 28 Jul 2025 18:44:27 +0100 Subject: [PATCH 08/11] Use Request for argless commands, until we know what auth we are doing. --- .../druncschema/session_manager_pb2.py | 23 +++++++++---------- .../druncschema/session_manager_pb2_grpc.py | 20 ++++++++-------- schema/druncschema/session_manager.proto | 7 +++--- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/session_manager_pb2.py b/python_not_for_dunedaq/druncschema/session_manager_pb2.py index 0536934..af66203 100644 --- a/python_not_for_dunedaq/druncschema/session_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/session_manager_pb2.py @@ -25,24 +25,23 @@ from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 from druncschema import description_pb2 as druncschema_dot_description__pb2 from druncschema import token_pb2 as druncschema_dot_token__pb2 -from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/session_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\x1a\x1bgoogle/protobuf/empty.proto\"-\n\tConfigKey\x12\x0c\n\x04\x66ile\x18\x01 \x01(\t\x12\x12\n\nsession_id\x18\x02 \x01(\t\"\xae\x01\n\rAllConfigKeys\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x33\n\x0b\x63onfig_keys\x18\x03 \x03(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"_\n\rActiveSession\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x32\n\nconfig_key\x18\x03 \x01(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\"\xba\x01\n\x11\x41llActiveSessions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x0f\x61\x63tive_sessions\x18\x03 \x03(\x0b\x32\".dunedaq.druncschema.ActiveSession\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag2\x81\x02\n\x0eSessionManager\x12\x46\n\x08\x64\x65scribe\x12\x16.google.protobuf.Empty\x1a .dunedaq.druncschema.Description\"\x00\x12U\n\x11list_all_sessions\x12\x16.google.protobuf.Empty\x1a&.dunedaq.druncschema.AllActiveSessions\"\x00\x12P\n\x10list_all_configs\x12\x16.google.protobuf.Empty\x1a\".dunedaq.druncschema.AllConfigKeys\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/session_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"-\n\tConfigKey\x12\x0c\n\x04\x66ile\x18\x01 \x01(\t\x12\x12\n\nsession_id\x18\x02 \x01(\t\"\xae\x01\n\rAllConfigKeys\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x33\n\x0b\x63onfig_keys\x18\x03 \x03(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"_\n\rActiveSession\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x32\n\nconfig_key\x18\x03 \x01(\x0b\x32\x1e.dunedaq.druncschema.ConfigKey\"\xba\x01\n\x11\x41llActiveSessions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12;\n\x0f\x61\x63tive_sessions\x18\x03 \x03(\x0b\x32\".dunedaq.druncschema.ActiveSession\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag2\x93\x02\n\x0eSessionManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12[\n\x11list_all_sessions\x12\x1c.dunedaq.druncschema.Request\x1a&.dunedaq.druncschema.AllActiveSessions\"\x00\x12V\n\x10list_all_configs\x12\x1c.dunedaq.druncschema.Request\x1a\".dunedaq.druncschema.AllConfigKeys\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'druncschema.session_manager_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: DESCRIPTOR._loaded_options = None - _globals['_CONFIGKEY']._serialized_start=179 - _globals['_CONFIGKEY']._serialized_end=224 - _globals['_ALLCONFIGKEYS']._serialized_start=227 - _globals['_ALLCONFIGKEYS']._serialized_end=401 - _globals['_ACTIVESESSION']._serialized_start=403 - _globals['_ACTIVESESSION']._serialized_end=498 - _globals['_ALLACTIVESESSIONS']._serialized_start=501 - _globals['_ALLACTIVESESSIONS']._serialized_end=687 - _globals['_SESSIONMANAGER']._serialized_start=690 - _globals['_SESSIONMANAGER']._serialized_end=947 + _globals['_CONFIGKEY']._serialized_start=150 + _globals['_CONFIGKEY']._serialized_end=195 + _globals['_ALLCONFIGKEYS']._serialized_start=198 + _globals['_ALLCONFIGKEYS']._serialized_end=372 + _globals['_ACTIVESESSION']._serialized_start=374 + _globals['_ACTIVESESSION']._serialized_end=469 + _globals['_ALLACTIVESESSIONS']._serialized_start=472 + _globals['_ALLACTIVESESSIONS']._serialized_end=658 + _globals['_SESSIONMANAGER']._serialized_start=661 + _globals['_SESSIONMANAGER']._serialized_end=936 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py index e0c26dd..ef72979 100644 --- a/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py @@ -4,8 +4,8 @@ import warnings from druncschema import description_pb2 as druncschema_dot_description__pb2 +from druncschema import request_response_pb2 as druncschema_dot_request__response__pb2 from druncschema import session_manager_pb2 as druncschema_dot_session__manager__pb2 -from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 GRPC_GENERATED_VERSION = '1.68.0' GRPC_VERSION = grpc.__version__ @@ -38,17 +38,17 @@ def __init__(self, channel): """ self.describe = channel.unary_unary( '/dunedaq.druncschema.SessionManager/describe', - request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, + request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, response_deserializer=druncschema_dot_description__pb2.Description.FromString, _registered_method=True) self.list_all_sessions = channel.unary_unary( '/dunedaq.druncschema.SessionManager/list_all_sessions', - request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, + request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, response_deserializer=druncschema_dot_session__manager__pb2.AllActiveSessions.FromString, _registered_method=True) self.list_all_configs = channel.unary_unary( '/dunedaq.druncschema.SessionManager/list_all_configs', - request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, + request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, response_deserializer=druncschema_dot_session__manager__pb2.AllConfigKeys.FromString, _registered_method=True) @@ -79,17 +79,17 @@ def add_SessionManagerServicer_to_server(servicer, server): rpc_method_handlers = { 'describe': grpc.unary_unary_rpc_method_handler( servicer.describe, - request_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, + request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, response_serializer=druncschema_dot_description__pb2.Description.SerializeToString, ), 'list_all_sessions': grpc.unary_unary_rpc_method_handler( servicer.list_all_sessions, - request_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, + request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, response_serializer=druncschema_dot_session__manager__pb2.AllActiveSessions.SerializeToString, ), 'list_all_configs': grpc.unary_unary_rpc_method_handler( servicer.list_all_configs, - request_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, + request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, response_serializer=druncschema_dot_session__manager__pb2.AllConfigKeys.SerializeToString, ), } @@ -118,7 +118,7 @@ def describe(request, request, target, '/dunedaq.druncschema.SessionManager/describe', - google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, + druncschema_dot_request__response__pb2.Request.SerializeToString, druncschema_dot_description__pb2.Description.FromString, options, channel_credentials, @@ -145,7 +145,7 @@ def list_all_sessions(request, request, target, '/dunedaq.druncschema.SessionManager/list_all_sessions', - google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, + druncschema_dot_request__response__pb2.Request.SerializeToString, druncschema_dot_session__manager__pb2.AllActiveSessions.FromString, options, channel_credentials, @@ -172,7 +172,7 @@ def list_all_configs(request, request, target, '/dunedaq.druncschema.SessionManager/list_all_configs', - google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, + druncschema_dot_request__response__pb2.Request.SerializeToString, druncschema_dot_session__manager__pb2.AllConfigKeys.FromString, options, channel_credentials, diff --git a/schema/druncschema/session_manager.proto b/schema/druncschema/session_manager.proto index 8949d78..d0c0848 100644 --- a/schema/druncschema/session_manager.proto +++ b/schema/druncschema/session_manager.proto @@ -5,12 +5,11 @@ package dunedaq.druncschema; import "druncschema/request_response.proto"; import "druncschema/description.proto"; import "druncschema/token.proto"; -import "google/protobuf/empty.proto"; service SessionManager { - rpc describe (google.protobuf.Empty) returns (Description) {} - rpc list_all_sessions (google.protobuf.Empty) returns (AllActiveSessions) {} - rpc list_all_configs (google.protobuf.Empty) returns (AllConfigKeys) {} + rpc describe (Request) returns (Description) {} + rpc list_all_sessions (Request) returns (AllActiveSessions) {} + rpc list_all_configs (Request) returns (AllConfigKeys) {} } message ConfigKey { From 6bc28953d443a2dfbb2ddf07ec9e98b954f3c947 Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Mon, 28 Jul 2025 19:30:52 +0100 Subject: [PATCH 09/11] More PM request messages. --- .../druncschema/process_manager_pb2.py | 42 +++++++++---------- .../druncschema/process_manager_pb2.pyi | 7 +++- .../druncschema/process_manager_pb2_grpc.py | 18 ++++---- schema/druncschema/process_manager.proto | 15 +++---- 4 files changed, 44 insertions(+), 38 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index b82a905..3ca6c38 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -27,7 +27,7 @@ from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"m\n\x0cProcessQuery\x12/\n\x05uuids\x18\x01 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0f\n\x07session\x18\x04 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\x98\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12P\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x07restart\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12Q\n\x05\x66lush\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12N\n\x02ps\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"\x98\x01\n\x0cProcessQuery\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12/\n\x05uuids\x18\x02 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x03 \x03(\t\x12\x0c\n\x04user\x18\x04 \x01(\t\x12\x0f\n\x07session\x18\x05 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xa7\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12P\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12X\n\x07restart\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12V\n\x05\x66lush\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x02ps\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -54,24 +54,24 @@ _globals['_PROCESSUUID']._serialized_end=809 _globals['_PROCESSMETADATA']._serialized_start=812 _globals['_PROCESSMETADATA']._serialized_end=991 - _globals['_PROCESSQUERY']._serialized_start=993 - _globals['_PROCESSQUERY']._serialized_end=1102 - _globals['_PROCESSDESCRIPTION']._serialized_start=1105 - _globals['_PROCESSDESCRIPTION']._serialized_end=1512 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1397 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1425 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1427 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1468 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1470 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1512 - _globals['_PROCESSINSTANCE']._serialized_start=1515 - _globals['_PROCESSINSTANCE']._serialized_end=1848 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1813 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1848 - _globals['_PROCESSINSTANCELIST']._serialized_start=1851 - _globals['_PROCESSINSTANCELIST']._serialized_end=2032 - _globals['_BOOTREQUEST']._serialized_start=2035 - _globals['_BOOTREQUEST']._serialized_end=2188 - _globals['_PROCESSMANAGER']._serialized_start=2191 - _globals['_PROCESSMANAGER']._serialized_end=2855 + _globals['_PROCESSQUERY']._serialized_start=994 + _globals['_PROCESSQUERY']._serialized_end=1146 + _globals['_PROCESSDESCRIPTION']._serialized_start=1149 + _globals['_PROCESSDESCRIPTION']._serialized_end=1556 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1441 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1469 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1471 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1512 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1514 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1556 + _globals['_PROCESSINSTANCE']._serialized_start=1559 + _globals['_PROCESSINSTANCE']._serialized_end=1892 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1857 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1892 + _globals['_PROCESSINSTANCELIST']._serialized_start=1895 + _globals['_PROCESSINSTANCELIST']._serialized_end=2076 + _globals['_BOOTREQUEST']._serialized_start=2079 + _globals['_BOOTREQUEST']._serialized_end=2232 + _globals['_PROCESSMANAGER']._serialized_start=2235 + _globals['_PROCESSMANAGER']._serialized_end=2914 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi index 9917f38..cb53766 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi @@ -218,6 +218,7 @@ global___ProcessMetadata = ProcessMetadata class ProcessQuery(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor + TOKEN_FIELD_NUMBER: builtins.int UUIDS_FIELD_NUMBER: builtins.int NAMES_FIELD_NUMBER: builtins.int USER_FIELD_NUMBER: builtins.int @@ -225,18 +226,22 @@ class ProcessQuery(google.protobuf.message.Message): user: builtins.str session: builtins.str @property + def token(self) -> druncschema.token_pb2.Token: ... + @property def uuids(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___ProcessUUID]: ... @property def names(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]: ... def __init__( self, *, + token: druncschema.token_pb2.Token | None = ..., uuids: collections.abc.Iterable[global___ProcessUUID] | None = ..., names: collections.abc.Iterable[builtins.str] | None = ..., user: builtins.str = ..., session: builtins.str = ..., ) -> None: ... - def ClearField(self, field_name: typing.Literal["names", b"names", "session", b"session", "user", b"user", "uuids", b"uuids"]) -> None: ... + def HasField(self, field_name: typing.Literal["token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["names", b"names", "session", b"session", "token", b"token", "user", b"user", "uuids", b"uuids"]) -> None: ... global___ProcessQuery = ProcessQuery diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index d1e7343..75d6bec 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -53,7 +53,7 @@ def __init__(self, channel): _registered_method=True) self.restart = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/restart', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.kill = channel.unary_unary( @@ -63,12 +63,12 @@ def __init__(self, channel): _registered_method=True) self.flush = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/flush', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.ps = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/ps', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.logs = channel.unary_unary( @@ -149,7 +149,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): ), 'restart': grpc.unary_unary_rpc_method_handler( servicer.restart, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=druncschema_dot_process__manager__pb2.ProcessQuery.FromString, response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'kill': grpc.unary_unary_rpc_method_handler( @@ -159,12 +159,12 @@ def add_ProcessManagerServicer_to_server(servicer, server): ), 'flush': grpc.unary_unary_rpc_method_handler( servicer.flush, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=druncschema_dot_process__manager__pb2.ProcessQuery.FromString, response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'ps': grpc.unary_unary_rpc_method_handler( servicer.ps, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=druncschema_dot_process__manager__pb2.ProcessQuery.FromString, response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'logs': grpc.unary_unary_rpc_method_handler( @@ -279,7 +279,7 @@ def restart(request, request, target, '/dunedaq.druncschema.ProcessManager/restart', - druncschema_dot_request__response__pb2.Request.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, @@ -333,7 +333,7 @@ def flush(request, request, target, '/dunedaq.druncschema.ProcessManager/flush', - druncschema_dot_request__response__pb2.Request.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, @@ -360,7 +360,7 @@ def ps(request, request, target, '/dunedaq.druncschema.ProcessManager/ps', - druncschema_dot_request__response__pb2.Request.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index 166af21..6646cd3 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -10,10 +10,10 @@ service ProcessManager { rpc describe (Request) returns (Description) {} rpc boot (Request) returns (ProcessInstanceList) {} rpc terminate (Request) returns (ProcessInstanceList) {} - rpc restart (Request) returns (ProcessInstanceList) {} + rpc restart (ProcessQuery) returns (ProcessInstanceList) {} rpc kill (Request) returns (ProcessInstanceList) {} - rpc flush (Request) returns (ProcessInstanceList) {} - rpc ps (Request) returns (ProcessInstanceList) {} + rpc flush (ProcessQuery) returns (ProcessInstanceList) {} + rpc ps (ProcessQuery) returns (ProcessInstanceList) {} rpc logs (Request) returns (LogLines) {} } @@ -68,10 +68,11 @@ message ProcessMetadata { } message ProcessQuery { - repeated ProcessUUID uuids = 1; - repeated string names = 2; - string user = 3; - string session = 4; + Token token = 1; + repeated ProcessUUID uuids = 2; + repeated string names = 3; + string user = 4; + string session = 5; } message ProcessDescription { From f22dd63f694274f1463fe253c75671fb23e9fe2a Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Mon, 28 Jul 2025 22:46:55 +0100 Subject: [PATCH 10/11] Only boot to go. --- .../druncschema/process_manager_pb2.py | 56 +++++++++---------- .../druncschema/process_manager_pb2.pyi | 8 ++- .../druncschema/process_manager_pb2_grpc.py | 12 ++-- schema/druncschema/process_manager.proto | 9 +-- 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index 3ca6c38..c5440e4 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -27,7 +27,7 @@ from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"O\n\nLogRequest\x12\x30\n\x05query\x18\x01 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x02 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"\x98\x01\n\x0cProcessQuery\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12/\n\x05uuids\x18\x02 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x03 \x03(\t\x12\x0c\n\x04user\x18\x04 \x01(\t\x12\x0f\n\x07session\x18\x05 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xa7\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12P\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12X\n\x07restart\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12P\n\x04kill\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12V\n\x05\x66lush\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x02ps\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12\x45\n\x04logs\x12\x1c.dunedaq.druncschema.Request\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"z\n\nLogRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x30\n\x05query\x18\x02 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x03 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"\x98\x01\n\x0cProcessQuery\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12/\n\x05uuids\x18\x02 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x03 \x03(\t\x12\x0c\n\x04user\x18\x04 \x01(\t\x12\x0f\n\x07session\x18\x05 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xaf\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12P\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12X\n\x07restart\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\x04kill\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12V\n\x05\x66lush\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x02ps\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12H\n\x04logs\x12\x1f.dunedaq.druncschema.LogRequest\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -47,31 +47,31 @@ _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_start=452 _globals['_EXCEPTIONNOTIFICATION_STACKLINE']._serialized_end=517 _globals['_LOGREQUEST']._serialized_start=519 - _globals['_LOGREQUEST']._serialized_end=598 - _globals['_LOGLINES']._serialized_start=601 - _globals['_LOGLINES']._serialized_end=780 - _globals['_PROCESSUUID']._serialized_start=782 - _globals['_PROCESSUUID']._serialized_end=809 - _globals['_PROCESSMETADATA']._serialized_start=812 - _globals['_PROCESSMETADATA']._serialized_end=991 - _globals['_PROCESSQUERY']._serialized_start=994 - _globals['_PROCESSQUERY']._serialized_end=1146 - _globals['_PROCESSDESCRIPTION']._serialized_start=1149 - _globals['_PROCESSDESCRIPTION']._serialized_end=1556 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1441 - _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1469 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1471 - _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1512 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1514 - _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1556 - _globals['_PROCESSINSTANCE']._serialized_start=1559 - _globals['_PROCESSINSTANCE']._serialized_end=1892 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1857 - _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1892 - _globals['_PROCESSINSTANCELIST']._serialized_start=1895 - _globals['_PROCESSINSTANCELIST']._serialized_end=2076 - _globals['_BOOTREQUEST']._serialized_start=2079 - _globals['_BOOTREQUEST']._serialized_end=2232 - _globals['_PROCESSMANAGER']._serialized_start=2235 - _globals['_PROCESSMANAGER']._serialized_end=2914 + _globals['_LOGREQUEST']._serialized_end=641 + _globals['_LOGLINES']._serialized_start=644 + _globals['_LOGLINES']._serialized_end=823 + _globals['_PROCESSUUID']._serialized_start=825 + _globals['_PROCESSUUID']._serialized_end=852 + _globals['_PROCESSMETADATA']._serialized_start=855 + _globals['_PROCESSMETADATA']._serialized_end=1034 + _globals['_PROCESSQUERY']._serialized_start=1037 + _globals['_PROCESSQUERY']._serialized_end=1189 + _globals['_PROCESSDESCRIPTION']._serialized_start=1192 + _globals['_PROCESSDESCRIPTION']._serialized_end=1599 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_start=1484 + _globals['_PROCESSDESCRIPTION_STRINGLIST']._serialized_end=1512 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_start=1514 + _globals['_PROCESSDESCRIPTION_EXECANDARGS']._serialized_end=1555 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_start=1557 + _globals['_PROCESSDESCRIPTION_ENVENTRY']._serialized_end=1599 + _globals['_PROCESSINSTANCE']._serialized_start=1602 + _globals['_PROCESSINSTANCE']._serialized_end=1935 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_start=1900 + _globals['_PROCESSINSTANCE_STATUSCODE']._serialized_end=1935 + _globals['_PROCESSINSTANCELIST']._serialized_start=1938 + _globals['_PROCESSINSTANCELIST']._serialized_end=2119 + _globals['_BOOTREQUEST']._serialized_start=2122 + _globals['_BOOTREQUEST']._serialized_end=2275 + _globals['_PROCESSMANAGER']._serialized_start=2278 + _globals['_PROCESSMANAGER']._serialized_end=2965 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi index cb53766..18daaf6 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi @@ -116,19 +116,23 @@ global___ExceptionNotification = ExceptionNotification class LogRequest(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor + TOKEN_FIELD_NUMBER: builtins.int QUERY_FIELD_NUMBER: builtins.int HOW_FAR_FIELD_NUMBER: builtins.int how_far: builtins.int @property + def token(self) -> druncschema.token_pb2.Token: ... + @property def query(self) -> global___ProcessQuery: ... def __init__( self, *, + token: druncschema.token_pb2.Token | None = ..., query: global___ProcessQuery | None = ..., how_far: builtins.int = ..., ) -> None: ... - def HasField(self, field_name: typing.Literal["query", b"query"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["how_far", b"how_far", "query", b"query"]) -> None: ... + def HasField(self, field_name: typing.Literal["query", b"query", "token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["how_far", b"how_far", "query", b"query", "token", b"token"]) -> None: ... global___LogRequest = LogRequest diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index 75d6bec..1532857 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -58,7 +58,7 @@ def __init__(self, channel): _registered_method=True) self.kill = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/kill', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.flush = channel.unary_unary( @@ -73,7 +73,7 @@ def __init__(self, channel): _registered_method=True) self.logs = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/logs', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=druncschema_dot_process__manager__pb2.LogRequest.SerializeToString, response_deserializer=druncschema_dot_process__manager__pb2.LogLines.FromString, _registered_method=True) @@ -154,7 +154,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): ), 'kill': grpc.unary_unary_rpc_method_handler( servicer.kill, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=druncschema_dot_process__manager__pb2.ProcessQuery.FromString, response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'flush': grpc.unary_unary_rpc_method_handler( @@ -169,7 +169,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): ), 'logs': grpc.unary_unary_rpc_method_handler( servicer.logs, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=druncschema_dot_process__manager__pb2.LogRequest.FromString, response_serializer=druncschema_dot_process__manager__pb2.LogLines.SerializeToString, ), } @@ -306,7 +306,7 @@ def kill(request, request, target, '/dunedaq.druncschema.ProcessManager/kill', - druncschema_dot_request__response__pb2.Request.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessQuery.SerializeToString, druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, @@ -387,7 +387,7 @@ def logs(request, request, target, '/dunedaq.druncschema.ProcessManager/logs', - druncschema_dot_request__response__pb2.Request.SerializeToString, + druncschema_dot_process__manager__pb2.LogRequest.SerializeToString, druncschema_dot_process__manager__pb2.LogLines.FromString, options, channel_credentials, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index 6646cd3..aed679d 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -11,10 +11,10 @@ service ProcessManager { rpc boot (Request) returns (ProcessInstanceList) {} rpc terminate (Request) returns (ProcessInstanceList) {} rpc restart (ProcessQuery) returns (ProcessInstanceList) {} - rpc kill (Request) returns (ProcessInstanceList) {} + rpc kill (ProcessQuery) returns (ProcessInstanceList) {} rpc flush (ProcessQuery) returns (ProcessInstanceList) {} rpc ps (ProcessQuery) returns (ProcessInstanceList) {} - rpc logs (Request) returns (LogLines) {} + rpc logs (LogRequest) returns (LogLines) {} } message ProcessRestriction { @@ -42,8 +42,9 @@ message ExceptionNotification { } message LogRequest { - ProcessQuery query = 1; - int32 how_far = 2; + Token token = 1; + ProcessQuery query = 2; + int32 how_far = 3; } message LogLines { From 866348aa8d9f58eca518b123e1fdf00b85a75a6e Mon Sep 17 00:00:00 2001 From: James Paul Turner Date: Mon, 28 Jul 2025 23:18:41 +0100 Subject: [PATCH 11/11] Boot request message. --- python_not_for_dunedaq/druncschema/process_manager_pb2.py | 8 ++++---- .../druncschema/process_manager_pb2.pyi | 8 ++++++-- .../druncschema/process_manager_pb2_grpc.py | 6 +++--- schema/druncschema/process_manager.proto | 7 ++++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index c5440e4..9b1be72 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -27,7 +27,7 @@ from druncschema import token_pb2 as druncschema_dot_token__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"z\n\nLogRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x30\n\x05query\x18\x02 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x03 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"\x98\x01\n\x0cProcessQuery\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12/\n\x05uuids\x18\x02 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x03 \x03(\t\x12\x0c\n\x04user\x18\x04 \x01(\t\x12\x0f\n\x07session\x18\x05 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x99\x01\n\x0b\x42ootRequest\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xaf\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12P\n\x04\x62oot\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12X\n\x07restart\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\x04kill\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12V\n\x05\x66lush\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x02ps\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12H\n\x04logs\x12\x1f.dunedaq.druncschema.LogRequest\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!druncschema/process_manager.proto\x12\x13\x64unedaq.druncschema\x1a\"druncschema/request_response.proto\x1a\x1d\x64runcschema/description.proto\x1a\x17\x64runcschema/token.proto\"G\n\x12ProcessRestriction\x12\x15\n\rallowed_hosts\x18\x01 \x03(\t\x12\x1a\n\x12\x61llowed_host_types\x18\x02 \x03(\t\";\n\x1a\x43ommandNotificationMessage\x12\x0c\n\x04user\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\"-\n\x1aGenericNotificationMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\xb9\x01\n\x15\x45xceptionNotification\x12\x12\n\nerror_text\x18\x01 \x01(\t\x12I\n\x0bstack_trace\x18\x02 \x03(\x0b\x32\x34.dunedaq.druncschema.ExceptionNotification.StackLine\x1a\x41\n\tStackLine\x12\x11\n\tline_text\x18\x01 \x01(\t\x12\x13\n\x0bline_number\x18\x02 \x01(\t\x12\x0c\n\x04\x66ile\x18\x03 \x01(\t\"z\n\nLogRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x30\n\x05query\x18\x02 \x01(\x0b\x32!.dunedaq.druncschema.ProcessQuery\x12\x0f\n\x07how_far\x18\x03 \x01(\x05\"\xb3\x01\n\x08LogLines\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12.\n\x04uuid\x18\x03 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05lines\x18\x04 \x03(\t\x12/\n\x04\x66lag\x18\x05 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\x1b\n\x0bProcessUUID\x12\x0c\n\x04uuid\x18\x01 \x01(\t\"\xb3\x01\n\x0fProcessMetadata\x12.\n\x04uuid\x18\x01 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x14\n\x07session\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08hostname\x18\x05 \x01(\t\x12\x14\n\x07tree_id\x18\x06 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_sessionB\n\n\x08_tree_id\"\x98\x01\n\x0cProcessQuery\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12/\n\x05uuids\x18\x02 \x03(\x0b\x32 .dunedaq.druncschema.ProcessUUID\x12\r\n\x05names\x18\x03 \x03(\t\x12\x0c\n\x04user\x18\x04 \x01(\t\x12\x0f\n\x07session\x18\x05 \x01(\t\"\x97\x03\n\x12ProcessDescription\x12\x36\n\x08metadata\x18\x01 \x01(\x0b\x32$.dunedaq.druncschema.ProcessMetadata\x12=\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x30.dunedaq.druncschema.ProcessDescription.EnvEntry\x12U\n\x18\x65xecutable_and_arguments\x18\x03 \x03(\x0b\x32\x33.dunedaq.druncschema.ProcessDescription.ExecAndArgs\x12#\n\x1bprocess_execution_directory\x18\x04 \x01(\t\x12\x19\n\x11process_logs_path\x18\x05 \x01(\t\x1a\x1c\n\nStringList\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a)\n\x0b\x45xecAndArgs\x12\x0c\n\x04\x65xec\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xcd\x02\n\x0fProcessInstance\x12\x44\n\x13process_description\x18\x01 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction\x12\x44\n\x0bstatus_code\x18\x03 \x01(\x0e\x32/.dunedaq.druncschema.ProcessInstance.StatusCode\x12\x13\n\x0breturn_code\x18\x04 \x01(\x05\x12.\n\x04uuid\x18\x05 \x01(\x0b\x32 .dunedaq.druncschema.ProcessUUID\"#\n\nStatusCode\x12\x0b\n\x07RUNNING\x10\x00\x12\x08\n\x04\x44\x45\x41\x44\x10\x01\"\xb5\x01\n\x13ProcessInstanceList\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05token\x18\x02 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x34\n\x06values\x18\x03 \x03(\x0b\x32$.dunedaq.druncschema.ProcessInstance\x12/\n\x04\x66lag\x18\x04 \x01(\x0e\x32!.dunedaq.druncschema.ResponseFlag\"\xc4\x01\n\x0b\x42ootRequest\x12)\n\x05token\x18\x01 \x01(\x0b\x32\x1a.dunedaq.druncschema.Token\x12\x44\n\x13process_description\x18\x02 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessDescription\x12\x44\n\x13process_restriction\x18\x03 \x01(\x0b\x32\'.dunedaq.druncschema.ProcessRestriction2\xb3\x05\n\x0eProcessManager\x12L\n\x08\x64\x65scribe\x12\x1c.dunedaq.druncschema.Request\x1a .dunedaq.druncschema.Description\"\x00\x12T\n\x04\x62oot\x12 .dunedaq.druncschema.BootRequest\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\tterminate\x12\x1c.dunedaq.druncschema.Request\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12X\n\x07restart\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12U\n\x04kill\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12V\n\x05\x66lush\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12S\n\x02ps\x12!.dunedaq.druncschema.ProcessQuery\x1a(.dunedaq.druncschema.ProcessInstanceList\"\x00\x12H\n\x04logs\x12\x1f.dunedaq.druncschema.LogRequest\x1a\x1d.dunedaq.druncschema.LogLines\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -71,7 +71,7 @@ _globals['_PROCESSINSTANCELIST']._serialized_start=1938 _globals['_PROCESSINSTANCELIST']._serialized_end=2119 _globals['_BOOTREQUEST']._serialized_start=2122 - _globals['_BOOTREQUEST']._serialized_end=2275 - _globals['_PROCESSMANAGER']._serialized_start=2278 - _globals['_PROCESSMANAGER']._serialized_end=2965 + _globals['_BOOTREQUEST']._serialized_end=2318 + _globals['_PROCESSMANAGER']._serialized_start=2321 + _globals['_PROCESSMANAGER']._serialized_end=3012 # @@protoc_insertion_point(module_scope) diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi index 18daaf6..d2920ec 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi @@ -403,19 +403,23 @@ global___ProcessInstanceList = ProcessInstanceList class BootRequest(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor + TOKEN_FIELD_NUMBER: builtins.int PROCESS_DESCRIPTION_FIELD_NUMBER: builtins.int PROCESS_RESTRICTION_FIELD_NUMBER: builtins.int @property + def token(self) -> druncschema.token_pb2.Token: ... + @property def process_description(self) -> global___ProcessDescription: ... @property def process_restriction(self) -> global___ProcessRestriction: ... def __init__( self, *, + token: druncschema.token_pb2.Token | None = ..., process_description: global___ProcessDescription | None = ..., process_restriction: global___ProcessRestriction | None = ..., ) -> None: ... - def HasField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction"]) -> builtins.bool: ... - def ClearField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction"]) -> None: ... + def HasField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction", "token", b"token"]) -> builtins.bool: ... + def ClearField(self, field_name: typing.Literal["process_description", b"process_description", "process_restriction", b"process_restriction", "token", b"token"]) -> None: ... global___BootRequest = BootRequest diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py index 1532857..6e9c41e 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py @@ -43,7 +43,7 @@ def __init__(self, channel): _registered_method=True) self.boot = channel.unary_unary( '/dunedaq.druncschema.ProcessManager/boot', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, + request_serializer=druncschema_dot_process__manager__pb2.BootRequest.SerializeToString, response_deserializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, _registered_method=True) self.terminate = channel.unary_unary( @@ -139,7 +139,7 @@ def add_ProcessManagerServicer_to_server(servicer, server): ), 'boot': grpc.unary_unary_rpc_method_handler( servicer.boot, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, + request_deserializer=druncschema_dot_process__manager__pb2.BootRequest.FromString, response_serializer=druncschema_dot_process__manager__pb2.ProcessInstanceList.SerializeToString, ), 'terminate': grpc.unary_unary_rpc_method_handler( @@ -225,7 +225,7 @@ def boot(request, request, target, '/dunedaq.druncschema.ProcessManager/boot', - druncschema_dot_request__response__pb2.Request.SerializeToString, + druncschema_dot_process__manager__pb2.BootRequest.SerializeToString, druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, diff --git a/schema/druncschema/process_manager.proto b/schema/druncschema/process_manager.proto index aed679d..c343233 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -8,7 +8,7 @@ import "druncschema/token.proto"; service ProcessManager { rpc describe (Request) returns (Description) {} - rpc boot (Request) returns (ProcessInstanceList) {} + rpc boot (BootRequest) returns (ProcessInstanceList) {} rpc terminate (Request) returns (ProcessInstanceList) {} rpc restart (ProcessQuery) returns (ProcessInstanceList) {} rpc kill (ProcessQuery) returns (ProcessInstanceList) {} @@ -112,6 +112,7 @@ message ProcessInstanceList { } message BootRequest { - ProcessDescription process_description = 1; - ProcessRestriction process_restriction = 2; + Token token = 1; + ProcessDescription process_description = 2; + ProcessRestriction process_restriction = 3; }