From 8fc7f800dec81d96483efde006bad5469fdd00f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:53:08 +0000 Subject: [PATCH 1/2] Update Node.js to v20 --- frontend/camera_sender/Dockerfile | 2 +- frontend/site/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/camera_sender/Dockerfile b/frontend/camera_sender/Dockerfile index 27ba7408..871f31e0 100644 --- a/frontend/camera_sender/Dockerfile +++ b/frontend/camera_sender/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.12-buster as builder +FROM node:20.4-buster as builder ENV ESP_EYE_IP 192.168.12.199 WORKDIR /app COPY package.json package-lock.json /app/ diff --git a/frontend/site/Dockerfile b/frontend/site/Dockerfile index cd6d1b36..f193b574 100644 --- a/frontend/site/Dockerfile +++ b/frontend/site/Dockerfile @@ -1,5 +1,5 @@ # Build the source code -FROM node:16.20.0-buster-slim AS builder +FROM node:20.4.0-buster-slim AS builder WORKDIR /app COPY package.json yarn.lock ./ RUN yarn install --frozen-lockfile --immutable From eb6a96192844b9230f48454503d2b0400ce75c08 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:53:49 +0000 Subject: [PATCH 2/2] Commit from GitHub Actions (compile_PB) --- backend/auto_operation/spec/ats_pb2.py | 27 ++--- backend/auto_operation/spec/ats_pb2.pyi | 49 +++++++--- backend/auto_operation/spec/block_pb2.py | 43 ++++---- backend/auto_operation/spec/block_pb2.pyi | 69 ++++++++----- .../auto_operation/spec/speedControl_pb2.py | 27 ++--- .../auto_operation/spec/speedControl_pb2.pyi | 32 ++++-- backend/auto_operation/spec/statesync_pb2.py | 47 ++++----- backend/auto_operation/spec/statesync_pb2.pyi | 98 ++++++++++++------- 8 files changed, 237 insertions(+), 155 deletions(-) diff --git a/backend/auto_operation/spec/ats_pb2.py b/backend/auto_operation/spec/ats_pb2.py index b4091b89..b0a40d80 100644 --- a/backend/auto_operation/spec/ats_pb2.py +++ b/backend/auto_operation/spec/ats_pb2.py @@ -2,10 +2,10 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: ats.proto """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -15,20 +15,21 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\tats.proto\"\x84\x03\n\x11SendStatusRequest\x12-\n\x06sensor\x18\x01 \x01(\x0e\x32\x1d.SendStatusRequest.SensorName\"\xbf\x02\n\nSensorName\x12\x0b\n\x07unknown\x10\x00\x12\x0f\n\x0bshinjuku_d1\x10\x01\x12\x0f\n\x0bshinjuku_d2\x10\x02\x12\x12\n\x0esakurajosui_d1\x10\x0b\x12\x12\n\x0esakurajosui_d2\x10\x0c\x12\x12\n\x0esakurajosui_d3\x10\r\x12\x12\n\x0esakurajosui_d4\x10\x0e\x12\x12\n\x0esakurajosui_d5\x10\x0f\x12\x12\n\x0esakurajosui_d6\x10\x10\x12\x0c\n\x08\x63hofu_d1\x10\x15\x12\x0c\n\x08\x63hofu_d2\x10\x16\x12\x0c\n\x08\x63hofu_d3\x10\x17\x12\x0c\n\x08\x63hofu_d4\x10\x18\x12\x0c\n\x08\x63hofu_d5\x10\x19\x12\x10\n\x0chashimoto_d1\x10\x1f\x12\x10\n\x0chashimoto_d2\x10 \x12\x0f\n\x0bhachioji_d1\x10)\x12\x0f\n\x0bhachioji_d2\x10*\"v\n\x12SendStatusResponse\x12.\n\x08response\x18\x01 \x01(\x0e\x32\x1c.SendStatusResponse.Response\"0\n\x08Response\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07SUCCESS\x10\x01\x12\n\n\x06\x46\x41ILED\x10\x02\x32>\n\x03\x41ts\x12\x37\n\nSendStatus\x12\x12.SendStatusRequest\x1a\x13.SendStatusResponse\"\x00\x42\x08Z\x06./specb\x06proto3') -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ats_pb2', globals()) +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ats_pb2', _globals) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'Z\006./spec' - _SENDSTATUSREQUEST._serialized_start=14 - _SENDSTATUSREQUEST._serialized_end=402 - _SENDSTATUSREQUEST_SENSORNAME._serialized_start=83 - _SENDSTATUSREQUEST_SENSORNAME._serialized_end=402 - _SENDSTATUSRESPONSE._serialized_start=404 - _SENDSTATUSRESPONSE._serialized_end=522 - _SENDSTATUSRESPONSE_RESPONSE._serialized_start=474 - _SENDSTATUSRESPONSE_RESPONSE._serialized_end=522 - _ATS._serialized_start=524 - _ATS._serialized_end=586 + _globals['_SENDSTATUSREQUEST']._serialized_start=14 + _globals['_SENDSTATUSREQUEST']._serialized_end=402 + _globals['_SENDSTATUSREQUEST_SENSORNAME']._serialized_start=83 + _globals['_SENDSTATUSREQUEST_SENSORNAME']._serialized_end=402 + _globals['_SENDSTATUSRESPONSE']._serialized_start=404 + _globals['_SENDSTATUSRESPONSE']._serialized_end=522 + _globals['_SENDSTATUSRESPONSE_RESPONSE']._serialized_start=474 + _globals['_SENDSTATUSRESPONSE_RESPONSE']._serialized_end=522 + _globals['_ATS']._serialized_start=524 + _globals['_ATS']._serialized_end=586 # @@protoc_insertion_point(module_scope) diff --git a/backend/auto_operation/spec/ats_pb2.pyi b/backend/auto_operation/spec/ats_pb2.pyi index 9f0b34b0..da975910 100644 --- a/backend/auto_operation/spec/ats_pb2.pyi +++ b/backend/auto_operation/spec/ats_pb2.pyi @@ -9,35 +9,56 @@ class SendStatusRequest(_message.Message): __slots__ = ["sensor"] class SensorName(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = [] - SENSOR_FIELD_NUMBER: _ClassVar[int] + unknown: _ClassVar[SendStatusRequest.SensorName] + shinjuku_d1: _ClassVar[SendStatusRequest.SensorName] + shinjuku_d2: _ClassVar[SendStatusRequest.SensorName] + sakurajosui_d1: _ClassVar[SendStatusRequest.SensorName] + sakurajosui_d2: _ClassVar[SendStatusRequest.SensorName] + sakurajosui_d3: _ClassVar[SendStatusRequest.SensorName] + sakurajosui_d4: _ClassVar[SendStatusRequest.SensorName] + sakurajosui_d5: _ClassVar[SendStatusRequest.SensorName] + sakurajosui_d6: _ClassVar[SendStatusRequest.SensorName] + chofu_d1: _ClassVar[SendStatusRequest.SensorName] + chofu_d2: _ClassVar[SendStatusRequest.SensorName] + chofu_d3: _ClassVar[SendStatusRequest.SensorName] + chofu_d4: _ClassVar[SendStatusRequest.SensorName] + chofu_d5: _ClassVar[SendStatusRequest.SensorName] + hashimoto_d1: _ClassVar[SendStatusRequest.SensorName] + hashimoto_d2: _ClassVar[SendStatusRequest.SensorName] + hachioji_d1: _ClassVar[SendStatusRequest.SensorName] + hachioji_d2: _ClassVar[SendStatusRequest.SensorName] + unknown: SendStatusRequest.SensorName + shinjuku_d1: SendStatusRequest.SensorName + shinjuku_d2: SendStatusRequest.SensorName + sakurajosui_d1: SendStatusRequest.SensorName + sakurajosui_d2: SendStatusRequest.SensorName + sakurajosui_d3: SendStatusRequest.SensorName + sakurajosui_d4: SendStatusRequest.SensorName + sakurajosui_d5: SendStatusRequest.SensorName + sakurajosui_d6: SendStatusRequest.SensorName chofu_d1: SendStatusRequest.SensorName chofu_d2: SendStatusRequest.SensorName chofu_d3: SendStatusRequest.SensorName chofu_d4: SendStatusRequest.SensorName chofu_d5: SendStatusRequest.SensorName - hachioji_d1: SendStatusRequest.SensorName - hachioji_d2: SendStatusRequest.SensorName hashimoto_d1: SendStatusRequest.SensorName hashimoto_d2: SendStatusRequest.SensorName - sakurajosui_d1: SendStatusRequest.SensorName - sakurajosui_d2: SendStatusRequest.SensorName - sakurajosui_d3: SendStatusRequest.SensorName - sakurajosui_d4: SendStatusRequest.SensorName - sakurajosui_d5: SendStatusRequest.SensorName - sakurajosui_d6: SendStatusRequest.SensorName + hachioji_d1: SendStatusRequest.SensorName + hachioji_d2: SendStatusRequest.SensorName + SENSOR_FIELD_NUMBER: _ClassVar[int] sensor: SendStatusRequest.SensorName - shinjuku_d1: SendStatusRequest.SensorName - shinjuku_d2: SendStatusRequest.SensorName - unknown: SendStatusRequest.SensorName def __init__(self, sensor: _Optional[_Union[SendStatusRequest.SensorName, str]] = ...) -> None: ... class SendStatusResponse(_message.Message): __slots__ = ["response"] class Response(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = [] + UNKNOWN: _ClassVar[SendStatusResponse.Response] + SUCCESS: _ClassVar[SendStatusResponse.Response] + FAILED: _ClassVar[SendStatusResponse.Response] + UNKNOWN: SendStatusResponse.Response + SUCCESS: SendStatusResponse.Response FAILED: SendStatusResponse.Response RESPONSE_FIELD_NUMBER: _ClassVar[int] - SUCCESS: SendStatusResponse.Response - UNKNOWN: SendStatusResponse.Response response: SendStatusResponse.Response def __init__(self, response: _Optional[_Union[SendStatusResponse.Response, str]] = ...) -> None: ... diff --git a/backend/auto_operation/spec/block_pb2.py b/backend/auto_operation/spec/block_pb2.py index b7b651ef..9ae3af77 100644 --- a/backend/auto_operation/spec/block_pb2.py +++ b/backend/auto_operation/spec/block_pb2.py @@ -2,10 +2,10 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: block.proto """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -15,28 +15,29 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x62lock.proto\"J\n\rBlockAndState\x12\x19\n\x07\x62lockId\x18\x03 \x01(\x0e\x32\x08.BlockId\x12\x1e\n\x05state\x18\x02 \x01(\x0e\x32\x0f.BlockStateEnum\"8\n\x17UpdateBlockStateRequest\x12\x1d\n\x05state\x18\x01 \x01(\x0b\x32\x0e.BlockAndState\"\x1a\n\x18UpdateBlockStateResponse\"8\n\x17NotifyBlockStateRequest\x12\x1d\n\x05state\x18\x01 \x01(\x0b\x32\x0e.BlockAndState\"\x1a\n\x18NotifyBlockStateResponse*S\n\x0e\x42lockStateEnum\x12\x16\n\x12\x42LOCKSTATE_UNKNOWN\x10\x00\x12\x13\n\x0f\x42LOCKSTATE_OPEN\x10\x01\x12\x14\n\x10\x42LOCKSTATE_CLOSE\x10\x02*\xbc\x02\n\x07\x42lockId\x12\x0b\n\x07unknown\x10\x00\x12\x0f\n\x0bshinjuku_b1\x10\x01\x12\x0f\n\x0bshinjuku_b2\x10\x02\x12\x12\n\x0esakurajosui_b1\x10\x0b\x12\x12\n\x0esakurajosui_b2\x10\x0c\x12\x12\n\x0esakurajosui_b3\x10\r\x12\x12\n\x0esakurajosui_b4\x10\x0e\x12\x12\n\x0esakurajosui_b5\x10\x0f\x12\x12\n\x0esakurajosui_b6\x10\x10\x12\x0c\n\x08\x63hofu_b1\x10\x15\x12\x0c\n\x08\x63hofu_b2\x10\x16\x12\x0c\n\x08\x63hofu_b3\x10\x17\x12\x0c\n\x08\x63hofu_b4\x10\x18\x12\x0c\n\x08\x63hofu_b5\x10\x19\x12\x10\n\x0chashimoto_b1\x10\x1f\x12\x10\n\x0chashimoto_b2\x10 \x12\x0f\n\x0bhachioji_b1\x10)\x12\x0f\n\x0bhachioji_b2\x10*2^\n\x11\x42lockStateManager\x12I\n\x10UpdateBlockState\x12\x18.UpdateBlockStateRequest\x1a\x19.UpdateBlockStateResponse\"\x00\x32\x63\n\x16\x42lockStateNotification\x12I\n\x10NotifyBlockState\x12\x18.NotifyBlockStateRequest\x1a\x19.NotifyBlockStateResponse\"\x00\x42\x08Z\x06./specb\x06proto3') -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'block_pb2', globals()) +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'block_pb2', _globals) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'Z\006./spec' - _BLOCKSTATEENUM._serialized_start=263 - _BLOCKSTATEENUM._serialized_end=346 - _BLOCKID._serialized_start=349 - _BLOCKID._serialized_end=665 - _BLOCKANDSTATE._serialized_start=15 - _BLOCKANDSTATE._serialized_end=89 - _UPDATEBLOCKSTATEREQUEST._serialized_start=91 - _UPDATEBLOCKSTATEREQUEST._serialized_end=147 - _UPDATEBLOCKSTATERESPONSE._serialized_start=149 - _UPDATEBLOCKSTATERESPONSE._serialized_end=175 - _NOTIFYBLOCKSTATEREQUEST._serialized_start=177 - _NOTIFYBLOCKSTATEREQUEST._serialized_end=233 - _NOTIFYBLOCKSTATERESPONSE._serialized_start=235 - _NOTIFYBLOCKSTATERESPONSE._serialized_end=261 - _BLOCKSTATEMANAGER._serialized_start=667 - _BLOCKSTATEMANAGER._serialized_end=761 - _BLOCKSTATENOTIFICATION._serialized_start=763 - _BLOCKSTATENOTIFICATION._serialized_end=862 + _globals['_BLOCKSTATEENUM']._serialized_start=263 + _globals['_BLOCKSTATEENUM']._serialized_end=346 + _globals['_BLOCKID']._serialized_start=349 + _globals['_BLOCKID']._serialized_end=665 + _globals['_BLOCKANDSTATE']._serialized_start=15 + _globals['_BLOCKANDSTATE']._serialized_end=89 + _globals['_UPDATEBLOCKSTATEREQUEST']._serialized_start=91 + _globals['_UPDATEBLOCKSTATEREQUEST']._serialized_end=147 + _globals['_UPDATEBLOCKSTATERESPONSE']._serialized_start=149 + _globals['_UPDATEBLOCKSTATERESPONSE']._serialized_end=175 + _globals['_NOTIFYBLOCKSTATEREQUEST']._serialized_start=177 + _globals['_NOTIFYBLOCKSTATEREQUEST']._serialized_end=233 + _globals['_NOTIFYBLOCKSTATERESPONSE']._serialized_start=235 + _globals['_NOTIFYBLOCKSTATERESPONSE']._serialized_end=261 + _globals['_BLOCKSTATEMANAGER']._serialized_start=667 + _globals['_BLOCKSTATEMANAGER']._serialized_end=761 + _globals['_BLOCKSTATENOTIFICATION']._serialized_start=763 + _globals['_BLOCKSTATENOTIFICATION']._serialized_end=862 # @@protoc_insertion_point(module_scope) diff --git a/backend/auto_operation/spec/block_pb2.pyi b/backend/auto_operation/spec/block_pb2.pyi index a6117e3a..4c21a8b3 100644 --- a/backend/auto_operation/spec/block_pb2.pyi +++ b/backend/auto_operation/spec/block_pb2.pyi @@ -3,28 +3,55 @@ from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union -BLOCKSTATE_CLOSE: BlockStateEnum -BLOCKSTATE_OPEN: BlockStateEnum -BLOCKSTATE_UNKNOWN: BlockStateEnum DESCRIPTOR: _descriptor.FileDescriptor + +class BlockStateEnum(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): + __slots__ = [] + BLOCKSTATE_UNKNOWN: _ClassVar[BlockStateEnum] + BLOCKSTATE_OPEN: _ClassVar[BlockStateEnum] + BLOCKSTATE_CLOSE: _ClassVar[BlockStateEnum] + +class BlockId(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): + __slots__ = [] + unknown: _ClassVar[BlockId] + shinjuku_b1: _ClassVar[BlockId] + shinjuku_b2: _ClassVar[BlockId] + sakurajosui_b1: _ClassVar[BlockId] + sakurajosui_b2: _ClassVar[BlockId] + sakurajosui_b3: _ClassVar[BlockId] + sakurajosui_b4: _ClassVar[BlockId] + sakurajosui_b5: _ClassVar[BlockId] + sakurajosui_b6: _ClassVar[BlockId] + chofu_b1: _ClassVar[BlockId] + chofu_b2: _ClassVar[BlockId] + chofu_b3: _ClassVar[BlockId] + chofu_b4: _ClassVar[BlockId] + chofu_b5: _ClassVar[BlockId] + hashimoto_b1: _ClassVar[BlockId] + hashimoto_b2: _ClassVar[BlockId] + hachioji_b1: _ClassVar[BlockId] + hachioji_b2: _ClassVar[BlockId] +BLOCKSTATE_UNKNOWN: BlockStateEnum +BLOCKSTATE_OPEN: BlockStateEnum +BLOCKSTATE_CLOSE: BlockStateEnum +unknown: BlockId +shinjuku_b1: BlockId +shinjuku_b2: BlockId +sakurajosui_b1: BlockId +sakurajosui_b2: BlockId +sakurajosui_b3: BlockId +sakurajosui_b4: BlockId +sakurajosui_b5: BlockId +sakurajosui_b6: BlockId chofu_b1: BlockId chofu_b2: BlockId chofu_b3: BlockId chofu_b4: BlockId chofu_b5: BlockId -hachioji_b1: BlockId -hachioji_b2: BlockId hashimoto_b1: BlockId hashimoto_b2: BlockId -sakurajosui_b1: BlockId -sakurajosui_b2: BlockId -sakurajosui_b3: BlockId -sakurajosui_b4: BlockId -sakurajosui_b5: BlockId -sakurajosui_b6: BlockId -shinjuku_b1: BlockId -shinjuku_b2: BlockId -unknown: BlockId +hachioji_b1: BlockId +hachioji_b2: BlockId class BlockAndState(_message.Message): __slots__ = ["blockId", "state"] @@ -34,28 +61,22 @@ class BlockAndState(_message.Message): state: BlockStateEnum def __init__(self, blockId: _Optional[_Union[BlockId, str]] = ..., state: _Optional[_Union[BlockStateEnum, str]] = ...) -> None: ... -class NotifyBlockStateRequest(_message.Message): +class UpdateBlockStateRequest(_message.Message): __slots__ = ["state"] STATE_FIELD_NUMBER: _ClassVar[int] state: BlockAndState def __init__(self, state: _Optional[_Union[BlockAndState, _Mapping]] = ...) -> None: ... -class NotifyBlockStateResponse(_message.Message): +class UpdateBlockStateResponse(_message.Message): __slots__ = [] def __init__(self) -> None: ... -class UpdateBlockStateRequest(_message.Message): +class NotifyBlockStateRequest(_message.Message): __slots__ = ["state"] STATE_FIELD_NUMBER: _ClassVar[int] state: BlockAndState def __init__(self, state: _Optional[_Union[BlockAndState, _Mapping]] = ...) -> None: ... -class UpdateBlockStateResponse(_message.Message): +class NotifyBlockStateResponse(_message.Message): __slots__ = [] def __init__(self) -> None: ... - -class BlockStateEnum(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): - __slots__ = [] - -class BlockId(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): - __slots__ = [] diff --git a/backend/auto_operation/spec/speedControl_pb2.py b/backend/auto_operation/spec/speedControl_pb2.py index 04f10885..52c53e0b 100644 --- a/backend/auto_operation/spec/speedControl_pb2.py +++ b/backend/auto_operation/spec/speedControl_pb2.py @@ -2,10 +2,10 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: speedControl.proto """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -15,20 +15,21 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12speedControl.proto\"\xb8\x01\n\tSendSpeed\x12\r\n\x05Speed\x18\x01 \x01(\x05\x12\x1f\n\x05train\x18\x02 \x01(\x0e\x32\x10.SendSpeed.Train\"{\n\x05Train\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05TAKAO\x10\x01\x12\x0c\n\x08\x43HICHIBU\x10\x02\x12\n\n\x06HAKONE\x10\x03\x12\x0b\n\x07OKUTAMA\x10\x04\x12\t\n\x05NIKKO\x10\x05\x12\x0c\n\x08\x45NOSHIMA\x10\x06\x12\x0c\n\x08KAMAKURA\x10\x07\x12\x0c\n\x08YOKOSUKA\x10\x08\"Z\n\nStatusCode\x12\x1e\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x10.StatusCode.Code\",\n\x04\x43ode\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07SUCCESS\x10\x01\x12\n\n\x06\x46\x41ILED\x10\x02\x32\x32\n\x05Speed\x12)\n\x0c\x43ontrolSpeed\x12\n.SendSpeed\x1a\x0b.StatusCode\"\x00\x42\x08Z\x06./specb\x06proto3') -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'speedControl_pb2', globals()) +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'speedControl_pb2', _globals) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'Z\006./spec' - _SENDSPEED._serialized_start=23 - _SENDSPEED._serialized_end=207 - _SENDSPEED_TRAIN._serialized_start=84 - _SENDSPEED_TRAIN._serialized_end=207 - _STATUSCODE._serialized_start=209 - _STATUSCODE._serialized_end=299 - _STATUSCODE_CODE._serialized_start=255 - _STATUSCODE_CODE._serialized_end=299 - _SPEED._serialized_start=301 - _SPEED._serialized_end=351 + _globals['_SENDSPEED']._serialized_start=23 + _globals['_SENDSPEED']._serialized_end=207 + _globals['_SENDSPEED_TRAIN']._serialized_start=84 + _globals['_SENDSPEED_TRAIN']._serialized_end=207 + _globals['_STATUSCODE']._serialized_start=209 + _globals['_STATUSCODE']._serialized_end=299 + _globals['_STATUSCODE_CODE']._serialized_start=255 + _globals['_STATUSCODE_CODE']._serialized_end=299 + _globals['_SPEED']._serialized_start=301 + _globals['_SPEED']._serialized_end=351 # @@protoc_insertion_point(module_scope) diff --git a/backend/auto_operation/spec/speedControl_pb2.pyi b/backend/auto_operation/spec/speedControl_pb2.pyi index a1cb0c2c..c365f0aa 100644 --- a/backend/auto_operation/spec/speedControl_pb2.pyi +++ b/backend/auto_operation/spec/speedControl_pb2.pyi @@ -9,18 +9,27 @@ class SendSpeed(_message.Message): __slots__ = ["Speed", "train"] class Train(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = [] + UNKNOWN: _ClassVar[SendSpeed.Train] + TAKAO: _ClassVar[SendSpeed.Train] + CHICHIBU: _ClassVar[SendSpeed.Train] + HAKONE: _ClassVar[SendSpeed.Train] + OKUTAMA: _ClassVar[SendSpeed.Train] + NIKKO: _ClassVar[SendSpeed.Train] + ENOSHIMA: _ClassVar[SendSpeed.Train] + KAMAKURA: _ClassVar[SendSpeed.Train] + YOKOSUKA: _ClassVar[SendSpeed.Train] + UNKNOWN: SendSpeed.Train + TAKAO: SendSpeed.Train CHICHIBU: SendSpeed.Train - ENOSHIMA: SendSpeed.Train HAKONE: SendSpeed.Train - KAMAKURA: SendSpeed.Train - NIKKO: SendSpeed.Train OKUTAMA: SendSpeed.Train + NIKKO: SendSpeed.Train + ENOSHIMA: SendSpeed.Train + KAMAKURA: SendSpeed.Train + YOKOSUKA: SendSpeed.Train SPEED_FIELD_NUMBER: _ClassVar[int] - Speed: int - TAKAO: SendSpeed.Train TRAIN_FIELD_NUMBER: _ClassVar[int] - UNKNOWN: SendSpeed.Train - YOKOSUKA: SendSpeed.Train + Speed: int train: SendSpeed.Train def __init__(self, Speed: _Optional[int] = ..., train: _Optional[_Union[SendSpeed.Train, str]] = ...) -> None: ... @@ -28,9 +37,12 @@ class StatusCode(_message.Message): __slots__ = ["code"] class Code(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = [] - CODE_FIELD_NUMBER: _ClassVar[int] - FAILED: StatusCode.Code - SUCCESS: StatusCode.Code + UNKNOWN: _ClassVar[StatusCode.Code] + SUCCESS: _ClassVar[StatusCode.Code] + FAILED: _ClassVar[StatusCode.Code] UNKNOWN: StatusCode.Code + SUCCESS: StatusCode.Code + FAILED: StatusCode.Code + CODE_FIELD_NUMBER: _ClassVar[int] code: StatusCode.Code def __init__(self, code: _Optional[_Union[StatusCode.Code, str]] = ...) -> None: ... diff --git a/backend/auto_operation/spec/statesync_pb2.py b/backend/auto_operation/spec/statesync_pb2.py index 97ac2e7e..10abad50 100644 --- a/backend/auto_operation/spec/statesync_pb2.py +++ b/backend/auto_operation/spec/statesync_pb2.py @@ -2,10 +2,10 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: statesync.proto """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -15,30 +15,31 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fstatesync.proto\"(\n\x07Station\x12\x1d\n\tstationId\x18\x01 \x01(\x0e\x32\n.StationId\"J\n\rPointAndState\x12\x19\n\x07station\x18\x01 \x01(\x0b\x32\x08.Station\x12\x1e\n\x05state\x18\x02 \x01(\x0e\x32\x0f.PointStateEnum\"8\n\x17UpdatePointStateRequest\x12\x1d\n\x05state\x18\x01 \x01(\x0b\x32\x0e.PointAndState\"\x1a\n\x18UpdatePointStateResponse\"8\n\x17NotifyPointStateRequest\x12\x1d\n\x05state\x18\x01 \x01(\x0b\x32\x0e.PointAndState\"\x1a\n\x18NotifyPointStateResponse*\xfe\x02\n\tStationId\x12\x15\n\x11stationid_unknown\x10\x00\x12\x0f\n\x0bshinjuku_s1\x10\x02\x12\x0f\n\x0bshinjuku_s2\x10\x03\x12\x12\n\x0esakurajosui_p1\x10\x0b\x12\x12\n\x0esakurajosui_p2\x10\x0c\x12\x12\n\x0esakurajosui_s0\x10\r\x12\x12\n\x0esakurajosui_s1\x10\x0e\x12\x12\n\x0esakurajosui_s2\x10\x0f\x12\x12\n\x0esakurajosui_s3\x10\x10\x12\x12\n\x0esakurajosui_s4\x10\x11\x12\x12\n\x0esakurajosui_s5\x10\x12\x12\x0c\n\x08\x63hofu_p1\x10\x15\x12\x0c\n\x08\x63hofu_s0\x10\x16\x12\x0c\n\x08\x63hofu_s1\x10\x17\x12\x0c\n\x08\x63hofu_s2\x10\x18\x12\x0c\n\x08\x63hofu_s3\x10\x19\x12\x0c\n\x08\x63hofu_s4\x10\x1a\x12\x10\n\x0chashimoto_s1\x10\x1f\x12\x10\n\x0chashimoto_s2\x10 \x12\x0f\n\x0bhachioji_s1\x10)\x12\x0f\n\x0bhachioji_s2\x10**O\n\x0ePointStateEnum\x12\x16\n\x12POINTSTATE_UNKNOWN\x10\x00\x12\x11\n\rPOINTSTATE_ON\x10\x01\x12\x12\n\x0ePOINTSTATE_OFF\x10\x02\x32Y\n\x0cStateManager\x12I\n\x10UpdatePointState\x12\x18.UpdatePointStateRequest\x1a\x19.UpdatePointStateResponse\"\x00\x32\x63\n\x16PointStateNotification\x12I\n\x10NotifyPointState\x12\x18.NotifyPointStateRequest\x1a\x19.NotifyPointStateResponse\"\x00\x42\x08Z\x06./specb\x06proto3') -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'statesync_pb2', globals()) +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'statesync_pb2', _globals) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'Z\006./spec' - _STATIONID._serialized_start=310 - _STATIONID._serialized_end=692 - _POINTSTATEENUM._serialized_start=694 - _POINTSTATEENUM._serialized_end=773 - _STATION._serialized_start=19 - _STATION._serialized_end=59 - _POINTANDSTATE._serialized_start=61 - _POINTANDSTATE._serialized_end=135 - _UPDATEPOINTSTATEREQUEST._serialized_start=137 - _UPDATEPOINTSTATEREQUEST._serialized_end=193 - _UPDATEPOINTSTATERESPONSE._serialized_start=195 - _UPDATEPOINTSTATERESPONSE._serialized_end=221 - _NOTIFYPOINTSTATEREQUEST._serialized_start=223 - _NOTIFYPOINTSTATEREQUEST._serialized_end=279 - _NOTIFYPOINTSTATERESPONSE._serialized_start=281 - _NOTIFYPOINTSTATERESPONSE._serialized_end=307 - _STATEMANAGER._serialized_start=775 - _STATEMANAGER._serialized_end=864 - _POINTSTATENOTIFICATION._serialized_start=866 - _POINTSTATENOTIFICATION._serialized_end=965 + _globals['_STATIONID']._serialized_start=310 + _globals['_STATIONID']._serialized_end=692 + _globals['_POINTSTATEENUM']._serialized_start=694 + _globals['_POINTSTATEENUM']._serialized_end=773 + _globals['_STATION']._serialized_start=19 + _globals['_STATION']._serialized_end=59 + _globals['_POINTANDSTATE']._serialized_start=61 + _globals['_POINTANDSTATE']._serialized_end=135 + _globals['_UPDATEPOINTSTATEREQUEST']._serialized_start=137 + _globals['_UPDATEPOINTSTATEREQUEST']._serialized_end=193 + _globals['_UPDATEPOINTSTATERESPONSE']._serialized_start=195 + _globals['_UPDATEPOINTSTATERESPONSE']._serialized_end=221 + _globals['_NOTIFYPOINTSTATEREQUEST']._serialized_start=223 + _globals['_NOTIFYPOINTSTATEREQUEST']._serialized_end=279 + _globals['_NOTIFYPOINTSTATERESPONSE']._serialized_start=281 + _globals['_NOTIFYPOINTSTATERESPONSE']._serialized_end=307 + _globals['_STATEMANAGER']._serialized_start=775 + _globals['_STATEMANAGER']._serialized_end=864 + _globals['_POINTSTATENOTIFICATION']._serialized_start=866 + _globals['_POINTSTATENOTIFICATION']._serialized_end=965 # @@protoc_insertion_point(module_scope) diff --git a/backend/auto_operation/spec/statesync_pb2.pyi b/backend/auto_operation/spec/statesync_pb2.pyi index 9dbaae17..18784e61 100644 --- a/backend/auto_operation/spec/statesync_pb2.pyi +++ b/backend/auto_operation/spec/statesync_pb2.pyi @@ -4,19 +4,39 @@ from google.protobuf import message as _message from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor -POINTSTATE_OFF: PointStateEnum -POINTSTATE_ON: PointStateEnum -POINTSTATE_UNKNOWN: PointStateEnum -chofu_p1: StationId -chofu_s0: StationId -chofu_s1: StationId -chofu_s2: StationId -chofu_s3: StationId -chofu_s4: StationId -hachioji_s1: StationId -hachioji_s2: StationId -hashimoto_s1: StationId -hashimoto_s2: StationId + +class StationId(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): + __slots__ = [] + stationid_unknown: _ClassVar[StationId] + shinjuku_s1: _ClassVar[StationId] + shinjuku_s2: _ClassVar[StationId] + sakurajosui_p1: _ClassVar[StationId] + sakurajosui_p2: _ClassVar[StationId] + sakurajosui_s0: _ClassVar[StationId] + sakurajosui_s1: _ClassVar[StationId] + sakurajosui_s2: _ClassVar[StationId] + sakurajosui_s3: _ClassVar[StationId] + sakurajosui_s4: _ClassVar[StationId] + sakurajosui_s5: _ClassVar[StationId] + chofu_p1: _ClassVar[StationId] + chofu_s0: _ClassVar[StationId] + chofu_s1: _ClassVar[StationId] + chofu_s2: _ClassVar[StationId] + chofu_s3: _ClassVar[StationId] + chofu_s4: _ClassVar[StationId] + hashimoto_s1: _ClassVar[StationId] + hashimoto_s2: _ClassVar[StationId] + hachioji_s1: _ClassVar[StationId] + hachioji_s2: _ClassVar[StationId] + +class PointStateEnum(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): + __slots__ = [] + POINTSTATE_UNKNOWN: _ClassVar[PointStateEnum] + POINTSTATE_ON: _ClassVar[PointStateEnum] + POINTSTATE_OFF: _ClassVar[PointStateEnum] +stationid_unknown: StationId +shinjuku_s1: StationId +shinjuku_s2: StationId sakurajosui_p1: StationId sakurajosui_p2: StationId sakurajosui_s0: StationId @@ -25,27 +45,19 @@ sakurajosui_s2: StationId sakurajosui_s3: StationId sakurajosui_s4: StationId sakurajosui_s5: StationId -shinjuku_s1: StationId -shinjuku_s2: StationId -stationid_unknown: StationId - -class NotifyPointStateRequest(_message.Message): - __slots__ = ["state"] - STATE_FIELD_NUMBER: _ClassVar[int] - state: PointAndState - def __init__(self, state: _Optional[_Union[PointAndState, _Mapping]] = ...) -> None: ... - -class NotifyPointStateResponse(_message.Message): - __slots__ = [] - def __init__(self) -> None: ... - -class PointAndState(_message.Message): - __slots__ = ["state", "station"] - STATE_FIELD_NUMBER: _ClassVar[int] - STATION_FIELD_NUMBER: _ClassVar[int] - state: PointStateEnum - station: Station - def __init__(self, station: _Optional[_Union[Station, _Mapping]] = ..., state: _Optional[_Union[PointStateEnum, str]] = ...) -> None: ... +chofu_p1: StationId +chofu_s0: StationId +chofu_s1: StationId +chofu_s2: StationId +chofu_s3: StationId +chofu_s4: StationId +hashimoto_s1: StationId +hashimoto_s2: StationId +hachioji_s1: StationId +hachioji_s2: StationId +POINTSTATE_UNKNOWN: PointStateEnum +POINTSTATE_ON: PointStateEnum +POINTSTATE_OFF: PointStateEnum class Station(_message.Message): __slots__ = ["stationId"] @@ -53,6 +65,14 @@ class Station(_message.Message): stationId: StationId def __init__(self, stationId: _Optional[_Union[StationId, str]] = ...) -> None: ... +class PointAndState(_message.Message): + __slots__ = ["station", "state"] + STATION_FIELD_NUMBER: _ClassVar[int] + STATE_FIELD_NUMBER: _ClassVar[int] + station: Station + state: PointStateEnum + def __init__(self, station: _Optional[_Union[Station, _Mapping]] = ..., state: _Optional[_Union[PointStateEnum, str]] = ...) -> None: ... + class UpdatePointStateRequest(_message.Message): __slots__ = ["state"] STATE_FIELD_NUMBER: _ClassVar[int] @@ -63,8 +83,12 @@ class UpdatePointStateResponse(_message.Message): __slots__ = [] def __init__(self) -> None: ... -class StationId(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): - __slots__ = [] +class NotifyPointStateRequest(_message.Message): + __slots__ = ["state"] + STATE_FIELD_NUMBER: _ClassVar[int] + state: PointAndState + def __init__(self, state: _Optional[_Union[PointAndState, _Mapping]] = ...) -> None: ... -class PointStateEnum(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): +class NotifyPointStateResponse(_message.Message): __slots__ = [] + def __init__(self) -> None: ...