SessMan: dedicated gRPC message types #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

PawelPlesniak merged 6 commits into develop from jamesturner246/simpler_grpc

Jul 23, 2025

generate_protos

-Original file line number
+Diff line change
@@ -1,10 +1,18 @@
     #!/bin/bash
     for FILE in schema/druncschema/*.proto;
     do
         echo "Generating protocols for ${FILE}"
-        python -m grpc_tools.protoc -I./schema/ --python_out=python_not_for_dunedaq/ --grpc_python_out=python_not_for_dunedaq/ ${FILE}
-        FILE_NAME=$(basename -- "$FILE")
-        CLASS_NAME="${FILE_NAME%.*}"
+        python -m grpc_tools.protoc \
+            --proto_path=./schema/ \
+            --python_out=python_not_for_dunedaq/ \
+            --grpc_python_out=python_not_for_dunedaq/ \
+            --mypy_out=python_not_for_dunedaq/ \
+            ${FILE}
+        # FILE_NAME=$(basename -- "$FILE")
+        # CLASS_NAME="${FILE_NAME%.*}"
         # PY_OUT_FILE_NAME="python/druncschema/${CLASS_NAME}_pb2_grpc.py"
         # sed -i '' "/google/! s/import \(.*_pb2\)/import druncschema.\1/" ${PY_OUT_FILE_NAME}
         # PY_OUT_FILE_NAME="python/druncschema/${CLASS_NAME}_pb2.py"
@@ Expand All / @@ -14,9 +22,15 @@ done @@
     for FILE in schema/druncschema/opmon/*.proto;
     do
         echo "Generating protocols for ${FILE}"
-        python -m grpc_tools.protoc -I./schema/ --python_out=python_not_for_dunedaq/  ${FILE}
-        FILE_NAME=$(basename -- "$FILE")
-        CLASS_NAME="${FILE_NAME%.*}"
+        python -m grpc_tools.protoc \
+            --proto_path=./schema/ \
+            --python_out=python_not_for_dunedaq/ \
+            --mypy_out=python_not_for_dunedaq/ \
+            ${FILE}
+        # FILE_NAME=$(basename -- "$FILE")
+        # CLASS_NAME="${FILE_NAME%.*}"
         # PY_OUT_FILE_NAME="python/druncschema/${CLASS_NAME}_pb2_grpc.py"
         # sed -i '' "/google/! s/import \(.*_pb2\)/import druncschema.\1/" ${PY_OUT_FILE_NAME}
         # PY_OUT_FILE_NAME="python/druncschema/${CLASS_NAME}_pb2.py"
@@ Expand Down @@

python_not_for_dunedaq/druncschema/controller_pb2.pyi

-Original file line number
+Diff line change
@@ -0,0 +1,349 @@
+    """
+    @generated by mypy-protobuf.  Do not edit manually!
+    isort:skip_file
+    """
+    import builtins
+    import collections.abc
+    import google.protobuf.any_pb2
+    import google.protobuf.descriptor
+    import google.protobuf.internal.containers
+    import google.protobuf.internal.enum_type_wrapper
+    import google.protobuf.message
+    import sys
+    import typing
+    if sys.version_info >= (3, 10):
+        import typing as typing_extensions
+    else:
+        import typing_extensions
+    DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+    class _FSMResponseFlag:
+        ValueType = typing.NewType("ValueType", builtins.int)
+        V: typing_extensions.TypeAlias = ValueType
+    class _FSMResponseFlagEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_FSMResponseFlag.ValueType], builtins.type):
+        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
+        FSM_EXECUTED_SUCCESSFULLY: _FSMResponseFlag.ValueType  # 0
+        FSM_FAILED: _FSMResponseFlag.ValueType  # 1
+        FSM_INVALID_TRANSITION: _FSMResponseFlag.ValueType  # 2
+        FSM_NOT_EXECUTED_EXCLUDED: _FSMResponseFlag.ValueType  # 3
+        FSM_NOT_EXECUTED_IN_ERROR: _FSMResponseFlag.ValueType  # 4
+    class FSMResponseFlag(_FSMResponseFlag, metaclass=_FSMResponseFlagEnumTypeWrapper): ...
+    FSM_EXECUTED_SUCCESSFULLY: FSMResponseFlag.ValueType  # 0
+    FSM_FAILED: FSMResponseFlag.ValueType  # 1
+    FSM_INVALID_TRANSITION: FSMResponseFlag.ValueType  # 2
+    FSM_NOT_EXECUTED_EXCLUDED: FSMResponseFlag.ValueType  # 3
+    FSM_NOT_EXECUTED_IN_ERROR: FSMResponseFlag.ValueType  # 4
+    global___FSMResponseFlag = FSMResponseFlag
+    @typing.final
+    class AddressedCommand(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        COMMAND_NAME_FIELD_NUMBER: builtins.int
+        COMMAND_DATA_FIELD_NUMBER: builtins.int
+        TARGET_FIELD_NUMBER: builtins.int
+        EXECUTE_ALONG_PATH_FIELD_NUMBER: builtins.int
+        EXECUTE_ON_ALL_SUBSEQUENT_CHILDREN_IN_PATH_FIELD_NUMBER: builtins.int
+        command_name: builtins.str
+        target: builtins.str
+        execute_along_path: builtins.bool
+        execute_on_all_subsequent_children_in_path: builtins.bool
+        @property
+        def command_data(self) -> google.protobuf.any_pb2.Any: ...
+        def __init__(
+            self,
+            *,
+            command_name: builtins.str = ...,
+            command_data: google.protobuf.any_pb2.Any | None = ...,
+            target: builtins.str = ...,
+            execute_along_path: builtins.bool = ...,
+            execute_on_all_subsequent_children_in_path: builtins.bool = ...,
+        ) -> None: ...
+        def HasField(self, field_name: typing.Literal["_command_data", b"_command_data", "command_data", b"command_data"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing.Literal["_command_data", b"_command_data", "command_data", b"command_data", "command_name", b"command_name", "execute_along_path", b"execute_along_path", "execute_on_all_subsequent_children_in_path", b"execute_on_all_subsequent_children_in_path", "target", b"target"]) -> None: ...
+        def WhichOneof(self, oneof_group: typing.Literal["_command_data", b"_command_data"]) -> typing.Literal["command_data"] | None: ...
+    global___AddressedCommand = AddressedCommand
+    @typing.final
+    class FSMCommand(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        @typing.final
+        class ArgumentsEntry(google.protobuf.message.Message):
+            DESCRIPTOR: google.protobuf.descriptor.Descriptor
+            KEY_FIELD_NUMBER: builtins.int
+            VALUE_FIELD_NUMBER: builtins.int
+            key: builtins.str
+            @property
+            def value(self) -> google.protobuf.any_pb2.Any: ...
+            def __init__(
+                self,
+                *,
+                key: builtins.str = ...,
+                value: google.protobuf.any_pb2.Any | None = ...,
+            ) -> None: ...
+            def HasField(self, field_name: typing.Literal["value", b"value"]) -> builtins.bool: ...
+            def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ...
+        COMMAND_NAME_FIELD_NUMBER: builtins.int
+        ARGUMENTS_FIELD_NUMBER: builtins.int
+        DATA_FIELD_NUMBER: builtins.int
+        command_name: builtins.str
+        data: builtins.str
+        """unfortunately, this is just some plain old json data introduced by the fsm interfaces"""
+        @property
+        def arguments(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, google.protobuf.any_pb2.Any]: ...
+        def __init__(
+            self,
+            *,
+            command_name: builtins.str = ...,
+            arguments: collections.abc.Mapping[builtins.str, google.protobuf.any_pb2.Any] | None = ...,
+            data: builtins.str | None = ...,
+        ) -> None: ...
+        def HasField(self, field_name: typing.Literal["_data", b"_data", "data", b"data"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing.Literal["_data", b"_data", "arguments", b"arguments", "command_name", b"command_name", "data", b"data"]) -> None: ...
+        def WhichOneof(self, oneof_group: typing.Literal["_data", b"_data"]) -> typing.Literal["data"] | None: ...
+    global___FSMCommand = FSMCommand
+    @typing.final
+    class FSMCommandResponse(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        FLAG_FIELD_NUMBER: builtins.int
+        COMMAND_NAME_FIELD_NUMBER: builtins.int
+        DATA_FIELD_NUMBER: builtins.int
+        flag: global___FSMResponseFlag.ValueType
+        command_name: builtins.str
+        @property
+        def data(self) -> google.protobuf.any_pb2.Any: ...
+        def __init__(
+            self,
+            *,
+            flag: global___FSMResponseFlag.ValueType = ...,
+            command_name: builtins.str = ...,
+            data: google.protobuf.any_pb2.Any | None = ...,
+        ) -> None: ...
+        def HasField(self, field_name: typing.Literal["data", b"data"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing.Literal["command_name", b"command_name", "data", b"data", "flag", b"flag"]) -> None: ...
+    global___FSMCommandResponse = FSMCommandResponse
+    @typing.final
+    class Argument(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        class _Presence:
+            ValueType = typing.NewType("ValueType", builtins.int)
+            V: typing_extensions.TypeAlias = ValueType
+        class _PresenceEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[Argument._Presence.ValueType], builtins.type):
+            DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
+            MANDATORY: Argument._Presence.ValueType  # 0
+            OPTIONAL: Argument._Presence.ValueType  # 1
+        class Presence(_Presence, metaclass=_PresenceEnumTypeWrapper): ...
+        MANDATORY: Argument.Presence.ValueType  # 0
+        OPTIONAL: Argument.Presence.ValueType  # 1
+        class _Type:
+            ValueType = typing.NewType("ValueType", builtins.int)
+            V: typing_extensions.TypeAlias = ValueType
+        class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[Argument._Type.ValueType], builtins.type):
+            DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
+            INT: Argument._Type.ValueType  # 0
+            FLOAT: Argument._Type.ValueType  # 1
+            STRING: Argument._Type.ValueType  # 2
+            BOOL: Argument._Type.ValueType  # 3
+        class Type(_Type, metaclass=_TypeEnumTypeWrapper): ...
+        INT: Argument.Type.ValueType  # 0
+        FLOAT: Argument.Type.ValueType  # 1
+        STRING: Argument.Type.ValueType  # 2
+        BOOL: Argument.Type.ValueType  # 3
+        NAME_FIELD_NUMBER: builtins.int
+        PRESENCE_FIELD_NUMBER: builtins.int
+        TYPE_FIELD_NUMBER: builtins.int
+        DEFAULT_VALUE_FIELD_NUMBER: builtins.int
+        CHOICES_FIELD_NUMBER: builtins.int
+        HELP_FIELD_NUMBER: builtins.int
+        name: builtins.str
+        presence: global___Argument.Presence.ValueType
+        type: global___Argument.Type.ValueType
+        help: builtins.str
+        @property
+        def default_value(self) -> google.protobuf.any_pb2.Any: ...
+        @property
+        def choices(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[google.protobuf.any_pb2.Any]: ...
+        def __init__(
+            self,
+            *,
+            name: builtins.str = ...,
+            presence: global___Argument.Presence.ValueType = ...,
+            type: global___Argument.Type.ValueType = ...,
+            default_value: google.protobuf.any_pb2.Any | None = ...,
+            choices: collections.abc.Iterable[google.protobuf.any_pb2.Any] | None = ...,
+            help: builtins.str = ...,
+        ) -> None: ...
+        def HasField(self, field_name: typing.Literal["_default_value", b"_default_value", "default_value", b"default_value"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing.Literal["_default_value", b"_default_value", "choices", b"choices", "default_value", b"default_value", "help", b"help", "name", b"name", "presence", b"presence", "type", b"type"]) -> None: ...
+        def WhichOneof(self, oneof_group: typing.Literal["_default_value", b"_default_value"]) -> typing.Literal["default_value"] | None: ...
+    global___Argument = Argument
+    @typing.final
+    class FSMCommandDescription(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        NAME_FIELD_NUMBER: builtins.int
+        DATA_TYPE_FIELD_NUMBER: builtins.int
+        HELP_FIELD_NUMBER: builtins.int
+        RETURN_TYPE_FIELD_NUMBER: builtins.int
+        ARGUMENTS_FIELD_NUMBER: builtins.int
+        name: builtins.str
+        help: builtins.str
+        return_type: builtins.str
+        @property
+        def data_type(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]: ...
+        @property
+        def arguments(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___Argument]: ...
+        def __init__(
+            self,
+            *,
+            name: builtins.str = ...,
+            data_type: collections.abc.Iterable[builtins.str] | None = ...,
+            help: builtins.str = ...,
+            return_type: builtins.str = ...,
+            arguments: collections.abc.Iterable[global___Argument] | None = ...,
+        ) -> None: ...
+        def ClearField(self, field_name: typing.Literal["arguments", b"arguments", "data_type", b"data_type", "help", b"help", "name", b"name", "return_type", b"return_type"]) -> None: ...
+    global___FSMCommandDescription = FSMCommandDescription
+    @typing.final
+    class FSMSequence(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        ID_FIELD_NUMBER: builtins.int
+        COMMAND_IDS_FIELD_NUMBER: builtins.int
+        id: builtins.str
+        @property
+        def command_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]: ...
+        def __init__(
+            self,
+            *,
+            id: builtins.str = ...,
+            command_ids: collections.abc.Iterable[builtins.str] | None = ...,
+        ) -> None: ...
+        def ClearField(self, field_name: typing.Literal["command_ids", b"command_ids", "id", b"id"]) -> None: ...
+    global___FSMSequence = FSMSequence
+    @typing.final
+    class FSMCommandsDescription(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        TYPE_FIELD_NUMBER: builtins.int
+        NAME_FIELD_NUMBER: builtins.int
+        SESSION_FIELD_NUMBER: builtins.int
+        COMMANDS_FIELD_NUMBER: builtins.int
+        SEQUENCES_FIELD_NUMBER: builtins.int
+        type: builtins.str
+        name: builtins.str
+        session: builtins.str
+        @property
+        def commands(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___FSMCommandDescription]: ...
+        @property
+        def sequences(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___FSMSequence]: ...
+        def __init__(
+            self,
+            *,
+            type: builtins.str = ...,
+            name: builtins.str = ...,
+            session: builtins.str | None = ...,
+            commands: collections.abc.Iterable[global___FSMCommandDescription] | None = ...,
+            sequences: collections.abc.Iterable[global___FSMSequence] | None = ...,
+        ) -> None: ...
+        def HasField(self, field_name: typing.Literal["_session", b"_session", "session", b"session"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing.Literal["_session", b"_session", "commands", b"commands", "name", b"name", "sequences", b"sequences", "session", b"session", "type", b"type"]) -> None: ...
+        def WhichOneof(self, oneof_group: typing.Literal["_session", b"_session"]) -> typing.Literal["session"] | None: ...
+    global___FSMCommandsDescription = FSMCommandsDescription
+    @typing.final
+    class Status(google.protobuf.message.Message):
+        """Contains dynamic system descriptors"""
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        STATE_FIELD_NUMBER: builtins.int
+        SUB_STATE_FIELD_NUMBER: builtins.int
+        IN_ERROR_FIELD_NUMBER: builtins.int
+        INCLUDED_FIELD_NUMBER: builtins.int
+        RUN_INFO_FIELD_NUMBER: builtins.int
+        state: builtins.str
+        sub_state: builtins.str
+        in_error: builtins.bool
+        included: builtins.bool
+        @property
+        def run_info(self) -> global___RunInfo: ...
+        def __init__(
+            self,
+            *,
+            state: builtins.str = ...,
+            sub_state: builtins.str = ...,
+            in_error: builtins.bool = ...,
+            included: builtins.bool = ...,
+            run_info: global___RunInfo | None = ...,
+        ) -> None: ...
+        def HasField(self, field_name: typing.Literal["_run_info", b"_run_info", "run_info", b"run_info"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing.Literal["_run_info", b"_run_info", "in_error", b"in_error", "included", b"included", "run_info", b"run_info", "state", b"state", "sub_state", b"sub_state"]) -> None: ...
+        def WhichOneof(self, oneof_group: typing.Literal["_run_info", b"_run_info"]) -> typing.Literal["run_info"] | None: ...
+    global___Status = Status
+    @typing.final
+    class RunInfo(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        RUN_TYPE_FIELD_NUMBER: builtins.int
+        TRIGGER_RATE_FIELD_NUMBER: builtins.int
+        RUN_NUMBER_FIELD_NUMBER: builtins.int
+        DISABLE_DATA_STORAGE_FIELD_NUMBER: builtins.int
+        RUN_TIME_AT_START_FIELD_NUMBER: builtins.int
+        RUN_TIME_SINCE_START_FIELD_NUMBER: builtins.int
+        RUN_CONFIG_FILE_FIELD_NUMBER: builtins.int
+        RUN_CONFIG_NAME_FIELD_NUMBER: builtins.int
+        run_type: builtins.str
+        trigger_rate: builtins.float
+        run_number: builtins.int
+        disable_data_storage: builtins.bool
+        run_time_at_start: builtins.int
+        run_time_since_start: builtins.int
+        run_config_file: builtins.str
+        run_config_name: builtins.str
+        def __init__(
+            self,
+            *,
+            run_type: builtins.str = ...,
+            trigger_rate: builtins.float = ...,
+            run_number: builtins.int = ...,
+            disable_data_storage: builtins.bool = ...,
+            run_time_at_start: builtins.int = ...,
+            run_time_since_start: builtins.int = ...,
+            run_config_file: builtins.str = ...,
+            run_config_name: builtins.str = ...,
+        ) -> None: ...
+        def ClearField(self, field_name: typing.Literal["disable_data_storage", b"disable_data_storage", "run_config_file", b"run_config_file", "run_config_name", b"run_config_name", "run_number", b"run_number", "run_time_at_start", b"run_time_at_start", "run_time_since_start", b"run_time_since_start", "run_type", b"run_type", "trigger_rate", b"trigger_rate"]) -> None: ...
+    global___RunInfo = RunInfo

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SessMan: dedicated gRPC message types #58

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!