diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/python_not_for_dunedaq/druncschema/process_manager_pb2.py index 3a38e40..9b1be72 100644 --- a/python_not_for_dunedaq/druncschema/process_manager_pb2.py +++ b/python_not_for_dunedaq/druncschema/process_manager_pb2.py @@ -23,9 +23,11 @@ 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\"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\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) @@ -34,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=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=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=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=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 0bb7c3b..d2920ec 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 @@ -114,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 @@ -134,8 +140,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 @@ -143,11 +156,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 @@ -206,6 +222,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 @@ -213,18 +230,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 @@ -352,38 +373,53 @@ 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 + TOKEN_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 token(self) -> druncschema.token_pb2.Token: ... + @property + def process_description(self) -> global___ProcessDescription: ... + @property + def process_restriction(self) -> global___ProcessRestriction: ... def __init__( self, *, - values: collections.abc.Iterable[global___ProcessInstance] | None = ..., + token: druncschema.token_pb2.Token | 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", "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___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 36bb968..6e9c41e 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,8 @@ import grpc 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' @@ -37,42 +39,42 @@ 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', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + 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( '/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', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + 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( '/dunedaq.druncschema.ProcessManager/kill', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + 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( '/dunedaq.druncschema.ProcessManager/flush', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + 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, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + 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( '/dunedaq.druncschema.ProcessManager/logs', - request_serializer=druncschema_dot_request__response__pb2.Request.SerializeToString, - response_deserializer=druncschema_dot_request__response__pb2.Response.FromString, + request_serializer=druncschema_dot_process__manager__pb2.LogRequest.SerializeToString, + response_deserializer=druncschema_dot_process__manager__pb2.LogLines.FromString, _registered_method=True) @@ -133,42 +135,42 @@ 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, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + 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( 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, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + 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( servicer.kill, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + 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( servicer.flush, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + 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, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + 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( servicer.logs, - request_deserializer=druncschema_dot_request__response__pb2.Request.FromString, - response_serializer=druncschema_dot_request__response__pb2.Response.SerializeToString, + request_deserializer=druncschema_dot_process__manager__pb2.LogRequest.FromString, + response_serializer=druncschema_dot_process__manager__pb2.LogLines.SerializeToString, ), } generic_handler = grpc.method_handlers_generic_handler( @@ -197,7 +199,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, @@ -223,8 +225,8 @@ def boot(request, 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.BootRequest.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, @@ -251,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, @@ -277,8 +279,8 @@ def restart(request, 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.ProcessQuery.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, @@ -304,8 +306,8 @@ def kill(request, 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.ProcessQuery.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, @@ -331,8 +333,8 @@ def flush(request, 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.ProcessQuery.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, @@ -358,8 +360,8 @@ def ps(request, 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.ProcessQuery.SerializeToString, + druncschema_dot_process__manager__pb2.ProcessInstanceList.FromString, options, channel_credentials, insecure, @@ -385,8 +387,8 @@ def logs(request, 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.LogRequest.SerializeToString, + 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 b2355c4..c343233 100644 --- a/schema/druncschema/process_manager.proto +++ b/schema/druncschema/process_manager.proto @@ -3,16 +3,18 @@ syntax = "proto3"; package dunedaq.druncschema; import "druncschema/request_response.proto"; +import "druncschema/description.proto"; +import "druncschema/token.proto"; service ProcessManager { - rpc describe (Request) returns (Response) {} - rpc boot (Request) returns (Response) {} - rpc terminate (Request) returns (Response) {} - rpc restart (Request) returns (Response) {} - rpc kill (Request) returns (Response) {} - rpc flush (Request) returns (Response) {} - rpc ps (Request) returns (Response) {} - rpc logs (Request) returns (Response) {} + rpc describe (Request) returns (Description) {} + rpc boot (BootRequest) returns (ProcessInstanceList) {} + rpc terminate (Request) returns (ProcessInstanceList) {} + rpc restart (ProcessQuery) returns (ProcessInstanceList) {} + rpc kill (ProcessQuery) returns (ProcessInstanceList) {} + rpc flush (ProcessQuery) returns (ProcessInstanceList) {} + rpc ps (ProcessQuery) returns (ProcessInstanceList) {} + rpc logs (LogRequest) returns (LogLines) {} } message ProcessRestriction { @@ -30,7 +32,7 @@ message GenericNotificationMessage { } message ExceptionNotification { - message StackLine{ + message StackLine { string line_text = 1; string line_number = 2; string file = 3; @@ -40,13 +42,17 @@ message ExceptionNotification { } message LogRequest { - ProcessQuery query = 1; - int32 how_far = 2; + Token token = 1; + ProcessQuery query = 2; + int32 how_far = 3; } 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 { @@ -63,10 +69,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 { @@ -97,11 +104,15 @@ 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 { + Token token = 1; + ProcessDescription process_description = 2; + ProcessRestriction process_restriction = 3; +}