From 803bdac5994b9ec23984da2e0eb43f1bc1bf2609 Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 16:49:51 +0100 Subject: [PATCH 1/9] Updated `.gitignore` --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ac9c34d4..09a75c26 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ build/ .pytest_cache/ .tox/ mavsdk/bin/mavsdk_server +mavsdk/bin/mavsdk_server.exe From 934ada327743dfa600f09edace04dec2738f783c Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 16:50:06 +0100 Subject: [PATCH 2/9] Upgraded dependencies --- requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index a5feaa1f..07f6f990 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -protobuf -aiogrpc>=1.8 -grpcio>=1.50.0 +protobuf>=5.27.1 +grpcio>=1.64.1 From a175cd3d1abaddd16e6e76d2e97d570a9149841b Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 16:50:49 +0100 Subject: [PATCH 3/9] Cleaned up `run_protoc` bash script --- other/tools/run_protoc.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/other/tools/run_protoc.sh b/other/tools/run_protoc.sh index ee65152a..ab0561b7 100755 --- a/other/tools/run_protoc.sh +++ b/other/tools/run_protoc.sh @@ -3,7 +3,7 @@ set -e SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -WORK_DIR="${SCRIPT_DIR}/../../" +WORK_DIR="${SCRIPT_DIR%/*/*}" PROTO_DIR="${WORK_DIR}/proto" GENERATED_DIR="${WORK_DIR}/mavsdk" TEMPLATE_PATH="${WORK_DIR}/other/templates/py" @@ -11,7 +11,7 @@ TEMPLATE_PATH="${WORK_DIR}/other/templates/py" TEMPLATE_PATH_RST="${WORK_DIR}/other/templates/rst" GENERATED_DIR_RST="${WORK_DIR}/mavsdk/source/plugins" -PLUGIN_LIST=$(cd ${WORK_DIR}/proto/protos && ls -d */ | sed 's:/*$::') +PLUGIN_LIST=$(cd "${WORK_DIR}/proto/protos" && ls -d */ | sed 's:/*$::') command -v protoc-gen-mavsdk > /dev/null || { echo "-------------------------------" @@ -54,7 +54,6 @@ function generate { mv "${GENERATED_DIR}/${plugin}/${plugin}_pb2.py" "${GENERATED_DIR}/${plugin}_pb2.py" mv "${GENERATED_DIR}/${plugin}/${plugin}_pb2_grpc.py" "${GENERATED_DIR}/${plugin}_pb2_grpc.py" - echo " -> [+] Generated protobuf and gRPC bindings for ${plugin}" # Generate plugin @@ -67,6 +66,8 @@ function generate { # protoc-gen-mavsdk capitalizes filenames, and we don't want that with python mv ${GENERATED_DIR}/${plugin}/$(snake_case_to_camel_case ${plugin}).py ${GENERATED_DIR}/${plugin}.py + echo " -> [+] Generated plugin for ${plugin}" + # Generate plugin doc entry python3 -m grpc_tools.protoc -I${PROTO_DIR}/protos \ --proto_path=${PROTO_DIR}/protos/${plugin} \ From 595cbc1a5518c9e4295f58e2ce7190fb171f427b Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 16:51:16 +0100 Subject: [PATCH 4/9] Removed `aiogrpc` + utilized `grpcio` native `aio` sub-module --- mavsdk/async_plugin_manager.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mavsdk/async_plugin_manager.py b/mavsdk/async_plugin_manager.py index 3a33bb99..6cfa3f18 100644 --- a/mavsdk/async_plugin_manager.py +++ b/mavsdk/async_plugin_manager.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import logging -import aiogrpc +from grpc import aio class AsyncPluginManager: @@ -26,16 +26,15 @@ async def _connect_backend(self): """ #: gRPC channel - self._channel = aiogrpc.insecure_channel( - "{}:{}".format(self.host, self.port), - standalone_pool_for_streaming=True + self._channel = aio.insecure_channel( + "{}:{}".format(self.host, self.port) ) logger = logging.getLogger(__name__) logger.addHandler(logging.NullHandler()) # Avoid errors when user has not configured logging logger.debug("Waiting for mavsdk_server to be ready...") - await aiogrpc.channel_ready_future(self._channel) + await self._channel.channel_ready() logger.debug("Connected to mavsdk_server!") @property From d392f73783f1e5786e2d011efee2d740292207b5 Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 17:06:19 +0100 Subject: [PATCH 5/9] Re-generated `mavsdk` files --- mavsdk/action_pb2.py | 12 +----------- mavsdk/action_pb2_grpc.py | 10 +++++++--- mavsdk/action_server_pb2.py | 12 +----------- mavsdk/action_server_pb2_grpc.py | 10 +++++++--- mavsdk/arm_authorizer_server_pb2.py | 12 +----------- mavsdk/arm_authorizer_server_pb2_grpc.py | 10 +++++++--- mavsdk/calibration_pb2.py | 12 +----------- mavsdk/calibration_pb2_grpc.py | 10 +++++++--- mavsdk/camera_pb2.py | 12 +----------- mavsdk/camera_pb2_grpc.py | 10 +++++++--- mavsdk/camera_server_pb2.py | 12 +----------- mavsdk/camera_server_pb2_grpc.py | 10 +++++++--- mavsdk/component_metadata_pb2.py | 12 +----------- mavsdk/component_metadata_pb2_grpc.py | 10 +++++++--- mavsdk/component_metadata_server_pb2.py | 12 +----------- mavsdk/component_metadata_server_pb2_grpc.py | 10 +++++++--- mavsdk/core_pb2.py | 12 +----------- mavsdk/core_pb2_grpc.py | 10 +++++++--- mavsdk/events_pb2.py | 12 +----------- mavsdk/events_pb2_grpc.py | 10 +++++++--- mavsdk/failure_pb2.py | 12 +----------- mavsdk/failure_pb2_grpc.py | 10 +++++++--- mavsdk/follow_me_pb2.py | 12 +----------- mavsdk/follow_me_pb2_grpc.py | 10 +++++++--- mavsdk/ftp_pb2.py | 12 +----------- mavsdk/ftp_pb2_grpc.py | 10 +++++++--- mavsdk/ftp_server_pb2.py | 12 +----------- mavsdk/ftp_server_pb2_grpc.py | 10 +++++++--- mavsdk/geofence_pb2.py | 12 +----------- mavsdk/geofence_pb2_grpc.py | 10 +++++++--- mavsdk/gimbal_pb2.py | 12 +----------- mavsdk/gimbal_pb2_grpc.py | 10 +++++++--- mavsdk/gripper_pb2.py | 12 +----------- mavsdk/gripper_pb2_grpc.py | 10 +++++++--- mavsdk/info_pb2.py | 12 +----------- mavsdk/info_pb2_grpc.py | 10 +++++++--- mavsdk/log_files_pb2.py | 12 +----------- mavsdk/log_files_pb2_grpc.py | 10 +++++++--- mavsdk/log_streaming_pb2.py | 12 +----------- mavsdk/log_streaming_pb2_grpc.py | 10 +++++++--- mavsdk/manual_control_pb2.py | 12 +----------- mavsdk/manual_control_pb2_grpc.py | 10 +++++++--- mavsdk/mavsdk_options_pb2.py | 12 +----------- mavsdk/mavsdk_options_pb2_grpc.py | 9 +++++++-- mavsdk/mission_pb2.py | 12 +----------- mavsdk/mission_pb2_grpc.py | 10 +++++++--- mavsdk/mission_raw_pb2.py | 12 +----------- mavsdk/mission_raw_pb2_grpc.py | 10 +++++++--- mavsdk/mission_raw_server_pb2.py | 12 +----------- mavsdk/mission_raw_server_pb2_grpc.py | 10 +++++++--- mavsdk/mocap_pb2.py | 12 +----------- mavsdk/mocap_pb2_grpc.py | 10 +++++++--- mavsdk/offboard_pb2.py | 12 +----------- mavsdk/offboard_pb2_grpc.py | 10 +++++++--- mavsdk/param_pb2.py | 12 +----------- mavsdk/param_pb2_grpc.py | 10 +++++++--- mavsdk/param_server_pb2.py | 12 +----------- mavsdk/param_server_pb2_grpc.py | 10 +++++++--- mavsdk/rtk_pb2.py | 12 +----------- mavsdk/rtk_pb2_grpc.py | 10 +++++++--- mavsdk/server_utility_pb2.py | 12 +----------- mavsdk/server_utility_pb2_grpc.py | 10 +++++++--- mavsdk/shell_pb2.py | 12 +----------- mavsdk/shell_pb2_grpc.py | 10 +++++++--- mavsdk/telemetry_pb2.py | 12 +----------- mavsdk/telemetry_pb2_grpc.py | 10 +++++++--- mavsdk/telemetry_server_pb2.py | 12 +----------- mavsdk/telemetry_server_pb2_grpc.py | 10 +++++++--- mavsdk/transponder_pb2.py | 12 +----------- mavsdk/transponder_pb2_grpc.py | 10 +++++++--- mavsdk/tune_pb2.py | 12 +----------- mavsdk/tune_pb2_grpc.py | 10 +++++++--- mavsdk/winch_pb2.py | 12 +----------- mavsdk/winch_pb2_grpc.py | 10 +++++++--- 74 files changed, 296 insertions(+), 517 deletions(-) diff --git a/mavsdk/action_pb2.py b/mavsdk/action_pb2.py index d8ca2e70..ab50d79c 100644 --- a/mavsdk/action_pb2.py +++ b/mavsdk/action_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: action/action.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'action/action.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/action_pb2_grpc.py b/mavsdk/action_pb2_grpc.py index 777445f8..50e80194 100644 --- a/mavsdk/action_pb2_grpc.py +++ b/mavsdk/action_pb2_grpc.py @@ -5,8 +5,10 @@ from . import action_pb2 as action_dot_action__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in action/action_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -485,7 +490,6 @@ def add_ActionServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.action.ActionService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.action.ActionService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/action_server_pb2.py b/mavsdk/action_server_pb2.py index 072b6f10..8a6b4c60 100644 --- a/mavsdk/action_server_pb2.py +++ b/mavsdk/action_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: action_server/action_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'action_server/action_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/action_server_pb2_grpc.py b/mavsdk/action_server_pb2_grpc.py index aaacd56f..988dd802 100644 --- a/mavsdk/action_server_pb2_grpc.py +++ b/mavsdk/action_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import action_server_pb2 as action__server_dot_action__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in action_server/action_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -252,7 +257,6 @@ def add_ActionServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.action_server.ActionServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.action_server.ActionServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/arm_authorizer_server_pb2.py b/mavsdk/arm_authorizer_server_pb2.py index 191eccc9..71306d96 100644 --- a/mavsdk/arm_authorizer_server_pb2.py +++ b/mavsdk/arm_authorizer_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: arm_authorizer_server/arm_authorizer_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'arm_authorizer_server/arm_authorizer_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/arm_authorizer_server_pb2_grpc.py b/mavsdk/arm_authorizer_server_pb2_grpc.py index 2532e5a8..e208c14a 100644 --- a/mavsdk/arm_authorizer_server_pb2_grpc.py +++ b/mavsdk/arm_authorizer_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import arm_authorizer_server_pb2 as arm__authorizer__server_dot_arm__authorizer__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in arm_authorizer_server/arm_authorizer_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -97,7 +102,6 @@ def add_ArmAuthorizerServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.arm_authorizer_server.ArmAuthorizerServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.arm_authorizer_server.ArmAuthorizerServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/calibration_pb2.py b/mavsdk/calibration_pb2.py index 239de8ee..7029c3af 100644 --- a/mavsdk/calibration_pb2.py +++ b/mavsdk/calibration_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: calibration/calibration.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'calibration/calibration.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/calibration_pb2_grpc.py b/mavsdk/calibration_pb2_grpc.py index c579211e..ef25fa1c 100644 --- a/mavsdk/calibration_pb2_grpc.py +++ b/mavsdk/calibration_pb2_grpc.py @@ -5,8 +5,10 @@ from . import calibration_pb2 as calibration_dot_calibration__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in calibration/calibration_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -150,7 +155,6 @@ def add_CalibrationServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.calibration.CalibrationService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.calibration.CalibrationService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/camera_pb2.py b/mavsdk/camera_pb2.py index dee0a5d2..ba989aa8 100644 --- a/mavsdk/camera_pb2.py +++ b/mavsdk/camera_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: camera/camera.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'camera/camera.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/camera_pb2_grpc.py b/mavsdk/camera_pb2_grpc.py index 806e2466..2e4bfc0b 100644 --- a/mavsdk/camera_pb2_grpc.py +++ b/mavsdk/camera_pb2_grpc.py @@ -5,8 +5,10 @@ from . import camera_pb2 as camera_dot_camera__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in camera/camera_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -725,7 +730,6 @@ def add_CameraServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.camera.CameraService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.camera.CameraService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/camera_server_pb2.py b/mavsdk/camera_server_pb2.py index 1fa0e587..a962b581 100644 --- a/mavsdk/camera_server_pb2.py +++ b/mavsdk/camera_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: camera_server/camera_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'camera_server/camera_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/camera_server_pb2_grpc.py b/mavsdk/camera_server_pb2_grpc.py index 1fcc8459..88c54f04 100644 --- a/mavsdk/camera_server_pb2_grpc.py +++ b/mavsdk/camera_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import camera_server_pb2 as camera__server_dot_camera__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in camera_server/camera_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -711,7 +716,6 @@ def add_CameraServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.camera_server.CameraServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.camera_server.CameraServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/component_metadata_pb2.py b/mavsdk/component_metadata_pb2.py index f4295485..1055965f 100644 --- a/mavsdk/component_metadata_pb2.py +++ b/mavsdk/component_metadata_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: component_metadata/component_metadata.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'component_metadata/component_metadata.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/component_metadata_pb2_grpc.py b/mavsdk/component_metadata_pb2_grpc.py index 01a94012..e3ec48d7 100644 --- a/mavsdk/component_metadata_pb2_grpc.py +++ b/mavsdk/component_metadata_pb2_grpc.py @@ -5,8 +5,10 @@ from . import component_metadata_pb2 as component__metadata_dot_component__metadata__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in component_metadata/component_metadata_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -123,7 +128,6 @@ def add_ComponentMetadataServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.component_metadata.ComponentMetadataService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.component_metadata.ComponentMetadataService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/component_metadata_server_pb2.py b/mavsdk/component_metadata_server_pb2.py index d1ba756a..8ab5ca59 100644 --- a/mavsdk/component_metadata_server_pb2.py +++ b/mavsdk/component_metadata_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: component_metadata_server/component_metadata_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'component_metadata_server/component_metadata_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/component_metadata_server_pb2_grpc.py b/mavsdk/component_metadata_server_pb2_grpc.py index e943e0f6..17c95fb5 100644 --- a/mavsdk/component_metadata_server_pb2_grpc.py +++ b/mavsdk/component_metadata_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import component_metadata_server_pb2 as component__metadata__server_dot_component__metadata__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in component_metadata_server/component_metadata_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -66,7 +71,6 @@ def add_ComponentMetadataServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.component_metadata_server.ComponentMetadataServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.component_metadata_server.ComponentMetadataServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/core_pb2.py b/mavsdk/core_pb2.py index fbd16b99..adb4563a 100644 --- a/mavsdk/core_pb2.py +++ b/mavsdk/core_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: core/core.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'core/core.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/core_pb2_grpc.py b/mavsdk/core_pb2_grpc.py index 6952bdca..db162a8e 100644 --- a/mavsdk/core_pb2_grpc.py +++ b/mavsdk/core_pb2_grpc.py @@ -5,8 +5,10 @@ from . import core_pb2 as core_dot_core__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in core/core_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -89,7 +94,6 @@ def add_CoreServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.core.CoreService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.core.CoreService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/events_pb2.py b/mavsdk/events_pb2.py index 94dff6d5..6ca5b09d 100644 --- a/mavsdk/events_pb2.py +++ b/mavsdk/events_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: events/events.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'events/events.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/events_pb2_grpc.py b/mavsdk/events_pb2_grpc.py index 61b5abb2..9d44172c 100644 --- a/mavsdk/events_pb2_grpc.py +++ b/mavsdk/events_pb2_grpc.py @@ -5,8 +5,10 @@ from . import events_pb2 as events_dot_events__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in events/events_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -102,7 +107,6 @@ def add_EventsServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.events.EventsService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.events.EventsService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/failure_pb2.py b/mavsdk/failure_pb2.py index cac2c4b9..2eb64352 100644 --- a/mavsdk/failure_pb2.py +++ b/mavsdk/failure_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: failure/failure.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'failure/failure.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/failure_pb2_grpc.py b/mavsdk/failure_pb2_grpc.py index dbea5ca1..df0aef6b 100644 --- a/mavsdk/failure_pb2_grpc.py +++ b/mavsdk/failure_pb2_grpc.py @@ -5,8 +5,10 @@ from . import failure_pb2 as failure_dot_failure__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in failure/failure_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -65,7 +70,6 @@ def add_FailureServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.failure.FailureService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.failure.FailureService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/follow_me_pb2.py b/mavsdk/follow_me_pb2.py index d124da65..8d7ac6de 100644 --- a/mavsdk/follow_me_pb2.py +++ b/mavsdk/follow_me_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: follow_me/follow_me.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'follow_me/follow_me.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/follow_me_pb2_grpc.py b/mavsdk/follow_me_pb2_grpc.py index 70bee549..1ac5c176 100644 --- a/mavsdk/follow_me_pb2_grpc.py +++ b/mavsdk/follow_me_pb2_grpc.py @@ -5,8 +5,10 @@ from . import follow_me_pb2 as follow__me_dot_follow__me__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in follow_me/follow_me_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -171,7 +176,6 @@ def add_FollowMeServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.follow_me.FollowMeService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.follow_me.FollowMeService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/ftp_pb2.py b/mavsdk/ftp_pb2.py index badb5c63..215ad6a3 100644 --- a/mavsdk/ftp_pb2.py +++ b/mavsdk/ftp_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: ftp/ftp.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'ftp/ftp.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/ftp_pb2_grpc.py b/mavsdk/ftp_pb2_grpc.py index 61706bb5..1672ddf4 100644 --- a/mavsdk/ftp_pb2_grpc.py +++ b/mavsdk/ftp_pb2_grpc.py @@ -5,8 +5,10 @@ from . import ftp_pb2 as ftp_dot_ftp__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in ftp/ftp_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -212,7 +217,6 @@ def add_FtpServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.ftp.FtpService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.ftp.FtpService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/ftp_server_pb2.py b/mavsdk/ftp_server_pb2.py index 569d51f8..abaeb846 100644 --- a/mavsdk/ftp_server_pb2.py +++ b/mavsdk/ftp_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: ftp_server/ftp_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'ftp_server/ftp_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/ftp_server_pb2_grpc.py b/mavsdk/ftp_server_pb2_grpc.py index 35015162..2805fe30 100644 --- a/mavsdk/ftp_server_pb2_grpc.py +++ b/mavsdk/ftp_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import ftp_server_pb2 as ftp__server_dot_ftp__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in ftp_server/ftp_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -71,7 +76,6 @@ def add_FtpServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.ftp_server.FtpServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.ftp_server.FtpServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/geofence_pb2.py b/mavsdk/geofence_pb2.py index 9c34b469..6626805d 100644 --- a/mavsdk/geofence_pb2.py +++ b/mavsdk/geofence_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: geofence/geofence.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'geofence/geofence.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/geofence_pb2_grpc.py b/mavsdk/geofence_pb2_grpc.py index 04f6bd2e..fbd3ba2d 100644 --- a/mavsdk/geofence_pb2_grpc.py +++ b/mavsdk/geofence_pb2_grpc.py @@ -5,8 +5,10 @@ from . import geofence_pb2 as geofence_dot_geofence__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in geofence/geofence_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -87,7 +92,6 @@ def add_GeofenceServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.geofence.GeofenceService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.geofence.GeofenceService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/gimbal_pb2.py b/mavsdk/gimbal_pb2.py index 772a1e54..5dac2b46 100644 --- a/mavsdk/gimbal_pb2.py +++ b/mavsdk/gimbal_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: gimbal/gimbal.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'gimbal/gimbal.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/gimbal_pb2_grpc.py b/mavsdk/gimbal_pb2_grpc.py index 3b87b602..7e7abc65 100644 --- a/mavsdk/gimbal_pb2_grpc.py +++ b/mavsdk/gimbal_pb2_grpc.py @@ -5,8 +5,10 @@ from . import gimbal_pb2 as gimbal_dot_gimbal__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in gimbal/gimbal_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -265,7 +270,6 @@ def add_GimbalServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.gimbal.GimbalService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.gimbal.GimbalService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/gripper_pb2.py b/mavsdk/gripper_pb2.py index aeb9735b..e5425b85 100644 --- a/mavsdk/gripper_pb2.py +++ b/mavsdk/gripper_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: gripper/gripper.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'gripper/gripper.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/gripper_pb2_grpc.py b/mavsdk/gripper_pb2_grpc.py index 0e0501bf..345e4c6b 100644 --- a/mavsdk/gripper_pb2_grpc.py +++ b/mavsdk/gripper_pb2_grpc.py @@ -5,8 +5,10 @@ from . import gripper_pb2 as gripper_dot_gripper__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in gripper/gripper_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -86,7 +91,6 @@ def add_GripperServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.gripper.GripperService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.gripper.GripperService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/info_pb2.py b/mavsdk/info_pb2.py index 52d7523d..1888f653 100644 --- a/mavsdk/info_pb2.py +++ b/mavsdk/info_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: info/info.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'info/info.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/info_pb2_grpc.py b/mavsdk/info_pb2_grpc.py index d2e8361f..efe9b5df 100644 --- a/mavsdk/info_pb2_grpc.py +++ b/mavsdk/info_pb2_grpc.py @@ -5,8 +5,10 @@ from . import info_pb2 as info_dot_info__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in info/info_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -150,7 +155,6 @@ def add_InfoServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.info.InfoService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.info.InfoService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/log_files_pb2.py b/mavsdk/log_files_pb2.py index d3f18c53..138117a6 100644 --- a/mavsdk/log_files_pb2.py +++ b/mavsdk/log_files_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: log_files/log_files.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'log_files/log_files.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/log_files_pb2_grpc.py b/mavsdk/log_files_pb2_grpc.py index 78e2fd33..0529d24a 100644 --- a/mavsdk/log_files_pb2_grpc.py +++ b/mavsdk/log_files_pb2_grpc.py @@ -5,8 +5,10 @@ from . import log_files_pb2 as log__files_dot_log__files__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in log_files/log_files_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -101,7 +106,6 @@ def add_LogFilesServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.log_files.LogFilesService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.log_files.LogFilesService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/log_streaming_pb2.py b/mavsdk/log_streaming_pb2.py index 6277fba3..a8189261 100644 --- a/mavsdk/log_streaming_pb2.py +++ b/mavsdk/log_streaming_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: log_streaming/log_streaming.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'log_streaming/log_streaming.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/log_streaming_pb2_grpc.py b/mavsdk/log_streaming_pb2_grpc.py index c8a116da..b4d7e5b7 100644 --- a/mavsdk/log_streaming_pb2_grpc.py +++ b/mavsdk/log_streaming_pb2_grpc.py @@ -5,8 +5,10 @@ from . import log_streaming_pb2 as log__streaming_dot_log__streaming__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in log_streaming/log_streaming_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -99,7 +104,6 @@ def add_LogStreamingServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.log_streaming.LogStreamingService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.log_streaming.LogStreamingService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/manual_control_pb2.py b/mavsdk/manual_control_pb2.py index 87fd97bd..8e07a688 100644 --- a/mavsdk/manual_control_pb2.py +++ b/mavsdk/manual_control_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: manual_control/manual_control.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'manual_control/manual_control.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/manual_control_pb2_grpc.py b/mavsdk/manual_control_pb2_grpc.py index 030de73b..d845f090 100644 --- a/mavsdk/manual_control_pb2_grpc.py +++ b/mavsdk/manual_control_pb2_grpc.py @@ -5,8 +5,10 @@ from . import manual_control_pb2 as manual__control_dot_manual__control__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in manual_control/manual_control_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -111,7 +116,6 @@ def add_ManualControlServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.manual_control.ManualControlService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.manual_control.ManualControlService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/mavsdk_options_pb2.py b/mavsdk/mavsdk_options_pb2.py index d3eafff3..38e7d3e3 100644 --- a/mavsdk/mavsdk_options_pb2.py +++ b/mavsdk/mavsdk_options_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: mavsdk_options.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'mavsdk_options.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/mavsdk_options_pb2_grpc.py b/mavsdk/mavsdk_options_pb2_grpc.py index a4ae726c..8c65d618 100644 --- a/mavsdk/mavsdk_options_pb2_grpc.py +++ b/mavsdk/mavsdk_options_pb2_grpc.py @@ -4,8 +4,10 @@ import warnings -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -15,10 +17,13 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in mavsdk_options_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) diff --git a/mavsdk/mission_pb2.py b/mavsdk/mission_pb2.py index 419a1ace..b1e7e631 100644 --- a/mavsdk/mission_pb2.py +++ b/mavsdk/mission_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: mission/mission.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'mission/mission.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/mission_pb2_grpc.py b/mavsdk/mission_pb2_grpc.py index e9e1434a..59da368b 100644 --- a/mavsdk/mission_pb2_grpc.py +++ b/mavsdk/mission_pb2_grpc.py @@ -5,8 +5,10 @@ from . import mission_pb2 as mission_dot_mission__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in mission/mission_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -331,7 +336,6 @@ def add_MissionServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.mission.MissionService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.mission.MissionService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/mission_raw_pb2.py b/mavsdk/mission_raw_pb2.py index 1722e0b4..3137a068 100644 --- a/mavsdk/mission_raw_pb2.py +++ b/mavsdk/mission_raw_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: mission_raw/mission_raw.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'mission_raw/mission_raw.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/mission_raw_pb2_grpc.py b/mavsdk/mission_raw_pb2_grpc.py index b4ffd24a..8fb989fd 100644 --- a/mavsdk/mission_raw_pb2_grpc.py +++ b/mavsdk/mission_raw_pb2_grpc.py @@ -5,8 +5,10 @@ from . import mission_raw_pb2 as mission__raw_dot_mission__raw__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in mission_raw/mission_raw_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -366,7 +371,6 @@ def add_MissionRawServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.mission_raw.MissionRawService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.mission_raw.MissionRawService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/mission_raw_server_pb2.py b/mavsdk/mission_raw_server_pb2.py index eb04fe32..5fc8b40a 100644 --- a/mavsdk/mission_raw_server_pb2.py +++ b/mavsdk/mission_raw_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: mission_raw_server/mission_raw_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'mission_raw_server/mission_raw_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/mission_raw_server_pb2_grpc.py b/mavsdk/mission_raw_server_pb2_grpc.py index 6d219a84..b3016020 100644 --- a/mavsdk/mission_raw_server_pb2_grpc.py +++ b/mavsdk/mission_raw_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import mission_raw_server_pb2 as mission__raw__server_dot_mission__raw__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in mission_raw_server/mission_raw_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -122,7 +127,6 @@ def add_MissionRawServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.mission_raw_server.MissionRawServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.mission_raw_server.MissionRawServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/mocap_pb2.py b/mavsdk/mocap_pb2.py index 40a65102..1843a8ba 100644 --- a/mavsdk/mocap_pb2.py +++ b/mavsdk/mocap_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: mocap/mocap.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'mocap/mocap.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/mocap_pb2_grpc.py b/mavsdk/mocap_pb2_grpc.py index 57e8694b..73337003 100644 --- a/mavsdk/mocap_pb2_grpc.py +++ b/mavsdk/mocap_pb2_grpc.py @@ -5,8 +5,10 @@ from . import mocap_pb2 as mocap_dot_mocap__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in mocap/mocap_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -105,7 +110,6 @@ def add_MocapServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.mocap.MocapService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.mocap.MocapService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/offboard_pb2.py b/mavsdk/offboard_pb2.py index bbf9ce76..6f911562 100644 --- a/mavsdk/offboard_pb2.py +++ b/mavsdk/offboard_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: offboard/offboard.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'offboard/offboard.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/offboard_pb2_grpc.py b/mavsdk/offboard_pb2_grpc.py index 974c36d8..2a6eaa39 100644 --- a/mavsdk/offboard_pb2_grpc.py +++ b/mavsdk/offboard_pb2_grpc.py @@ -5,8 +5,10 @@ from . import offboard_pb2 as offboard_dot_offboard__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in offboard/offboard_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -306,7 +311,6 @@ def add_OffboardServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.offboard.OffboardService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.offboard.OffboardService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/param_pb2.py b/mavsdk/param_pb2.py index 1875c2b5..30dbad4e 100644 --- a/mavsdk/param_pb2.py +++ b/mavsdk/param_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: param/param.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'param/param.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/param_pb2_grpc.py b/mavsdk/param_pb2_grpc.py index 03248989..e14fde6e 100644 --- a/mavsdk/param_pb2_grpc.py +++ b/mavsdk/param_pb2_grpc.py @@ -5,8 +5,10 @@ from . import param_pb2 as param_dot_param__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in param/param_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -206,7 +211,6 @@ def add_ParamServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.param.ParamService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.param.ParamService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/param_server_pb2.py b/mavsdk/param_server_pb2.py index f4d64128..f3a59c68 100644 --- a/mavsdk/param_server_pb2.py +++ b/mavsdk/param_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: param_server/param_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'param_server/param_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/param_server_pb2_grpc.py b/mavsdk/param_server_pb2_grpc.py index 70aac3cd..320c6219 100644 --- a/mavsdk/param_server_pb2_grpc.py +++ b/mavsdk/param_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import param_server_pb2 as param__server_dot_param__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in param_server/param_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -259,7 +264,6 @@ def add_ParamServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.param_server.ParamServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.param_server.ParamServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/rtk_pb2.py b/mavsdk/rtk_pb2.py index 6b44a8eb..82b5bd51 100644 --- a/mavsdk/rtk_pb2.py +++ b/mavsdk/rtk_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: rtk/rtk.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'rtk/rtk.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/rtk_pb2_grpc.py b/mavsdk/rtk_pb2_grpc.py index 6989be3f..5b871f27 100644 --- a/mavsdk/rtk_pb2_grpc.py +++ b/mavsdk/rtk_pb2_grpc.py @@ -5,8 +5,10 @@ from . import rtk_pb2 as rtk_dot_rtk__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in rtk/rtk_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -65,7 +70,6 @@ def add_RtkServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.rtk.RtkService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.rtk.RtkService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/server_utility_pb2.py b/mavsdk/server_utility_pb2.py index a18c20be..4e73dff2 100644 --- a/mavsdk/server_utility_pb2.py +++ b/mavsdk/server_utility_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: server_utility/server_utility.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'server_utility/server_utility.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/server_utility_pb2_grpc.py b/mavsdk/server_utility_pb2_grpc.py index 00a0aa64..6b12b422 100644 --- a/mavsdk/server_utility_pb2_grpc.py +++ b/mavsdk/server_utility_pb2_grpc.py @@ -5,8 +5,10 @@ from . import server_utility_pb2 as server__utility_dot_server__utility__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in server_utility/server_utility_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -67,7 +72,6 @@ def add_ServerUtilityServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.server_utility.ServerUtilityService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.server_utility.ServerUtilityService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/shell_pb2.py b/mavsdk/shell_pb2.py index 726af462..4b911aa2 100644 --- a/mavsdk/shell_pb2.py +++ b/mavsdk/shell_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: shell/shell.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'shell/shell.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/shell_pb2_grpc.py b/mavsdk/shell_pb2_grpc.py index 77b23261..bd832af7 100644 --- a/mavsdk/shell_pb2_grpc.py +++ b/mavsdk/shell_pb2_grpc.py @@ -5,8 +5,10 @@ from . import shell_pb2 as shell_dot_shell__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in shell/shell_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -88,7 +93,6 @@ def add_ShellServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.shell.ShellService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.shell.ShellService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/telemetry_pb2.py b/mavsdk/telemetry_pb2.py index 8e2de6d0..1aa0c1e5 100644 --- a/mavsdk/telemetry_pb2.py +++ b/mavsdk/telemetry_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: telemetry/telemetry.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'telemetry/telemetry.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/telemetry_pb2_grpc.py b/mavsdk/telemetry_pb2_grpc.py index f34b2816..37b7dc34 100644 --- a/mavsdk/telemetry_pb2_grpc.py +++ b/mavsdk/telemetry_pb2_grpc.py @@ -5,8 +5,10 @@ from . import telemetry_pb2 as telemetry_dot_telemetry__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in telemetry/telemetry_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -1005,7 +1010,6 @@ def add_TelemetryServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.telemetry.TelemetryService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.telemetry.TelemetryService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/telemetry_server_pb2.py b/mavsdk/telemetry_server_pb2.py index 58fecf6c..c51bf77a 100644 --- a/mavsdk/telemetry_server_pb2.py +++ b/mavsdk/telemetry_server_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: telemetry_server/telemetry_server.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'telemetry_server/telemetry_server.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/telemetry_server_pb2_grpc.py b/mavsdk/telemetry_server_pb2_grpc.py index 8a5b8eb6..1e5d12f4 100644 --- a/mavsdk/telemetry_server_pb2_grpc.py +++ b/mavsdk/telemetry_server_pb2_grpc.py @@ -5,8 +5,10 @@ from . import telemetry_server_pb2 as telemetry__server_dot_telemetry__server__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in telemetry_server/telemetry_server_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -307,7 +312,6 @@ def add_TelemetryServerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.telemetry_server.TelemetryServerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.telemetry_server.TelemetryServerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/transponder_pb2.py b/mavsdk/transponder_pb2.py index bf33d829..906709d0 100644 --- a/mavsdk/transponder_pb2.py +++ b/mavsdk/transponder_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: transponder/transponder.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'transponder/transponder.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/transponder_pb2_grpc.py b/mavsdk/transponder_pb2_grpc.py index a4440066..94498927 100644 --- a/mavsdk/transponder_pb2_grpc.py +++ b/mavsdk/transponder_pb2_grpc.py @@ -5,8 +5,10 @@ from . import transponder_pb2 as transponder_dot_transponder__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in transponder/transponder_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -86,7 +91,6 @@ def add_TransponderServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.transponder.TransponderService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.transponder.TransponderService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/tune_pb2.py b/mavsdk/tune_pb2.py index ecbc6ce0..c1f5b8ec 100644 --- a/mavsdk/tune_pb2.py +++ b/mavsdk/tune_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: tune/tune.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'tune/tune.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/tune_pb2_grpc.py b/mavsdk/tune_pb2_grpc.py index 3a9c977a..3c63b5d1 100644 --- a/mavsdk/tune_pb2_grpc.py +++ b/mavsdk/tune_pb2_grpc.py @@ -5,8 +5,10 @@ from . import tune_pb2 as tune_dot_tune__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in tune/tune_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -65,7 +70,6 @@ def add_TuneServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.tune.TuneService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.tune.TuneService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. diff --git a/mavsdk/winch_pb2.py b/mavsdk/winch_pb2.py index 045ea9eb..db23bf16 100644 --- a/mavsdk/winch_pb2.py +++ b/mavsdk/winch_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: winch/winch.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'winch/winch.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/mavsdk/winch_pb2_grpc.py b/mavsdk/winch_pb2_grpc.py index 9b620462..59dc50b2 100644 --- a/mavsdk/winch_pb2_grpc.py +++ b/mavsdk/winch_pb2_grpc.py @@ -5,8 +5,10 @@ from . import winch_pb2 as winch_dot_winch__pb2 -GRPC_GENERATED_VERSION = '1.70.0' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,15 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( + warnings.warn( f'The grpc package installed is at version {GRPC_VERSION},' + f' but the generated code in winch/winch_pb2_grpc.py depends on' + f' grpcio>={GRPC_GENERATED_VERSION}.' + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) @@ -251,7 +256,6 @@ def add_WinchServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'mavsdk.rpc.winch.WinchService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('mavsdk.rpc.winch.WinchService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. From be1cb129baedd8df9f66dbb23a08699cceebe675 Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 17:08:04 +0100 Subject: [PATCH 6/9] Re-generated `mavsdk` RST doc files --- mavsdk/source/plugins/index.rst | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/mavsdk/source/plugins/index.rst b/mavsdk/source/plugins/index.rst index 7a62a5f5..f6c73cb9 100644 --- a/mavsdk/source/plugins/index.rst +++ b/mavsdk/source/plugins/index.rst @@ -1,23 +1,22 @@ -Plugins -======= - -.. toctree:: - :titlesonly: - action action_server + arm_authorizer_server calibration camera + camera_server + component_metadata + component_metadata_server core - component_information - component_information_server failure follow_me ftp + ftp_server geofence gimbal + gripper info log_files + log_streaming manual_control mission mission_raw @@ -26,17 +25,13 @@ Plugins offboard param param_server + rtk server_utility shell telemetry telemetry_server - tracking_server transponder tune - camera_server - rtk - ftp_server - gripper winch arm_authorizer_server component_metadata From 21be5d7a38fd00d4e231bf4f0f245c5e65a8f445 Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 17:12:43 +0100 Subject: [PATCH 7/9] Updated + fixed `run_protoc` script --- other/tools/run_protoc.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/other/tools/run_protoc.sh b/other/tools/run_protoc.sh index ab0561b7..78c57fcf 100755 --- a/other/tools/run_protoc.sh +++ b/other/tools/run_protoc.sh @@ -64,7 +64,7 @@ function generate { ${plugin}/${plugin}.proto # protoc-gen-mavsdk capitalizes filenames, and we don't want that with python - mv ${GENERATED_DIR}/${plugin}/$(snake_case_to_camel_case ${plugin}).py ${GENERATED_DIR}/${plugin}.py + mv -f ${GENERATED_DIR}/${plugin}/$(snake_case_to_camel_case ${plugin}).py ${GENERATED_DIR}/${plugin}.py echo " -> [+] Generated plugin for ${plugin}" @@ -77,7 +77,9 @@ function generate { ${plugin}.proto # Again move generated file to its place. - mv ${GENERATED_DIR_RST}/$(snake_case_to_camel_case ${plugin}).rst ${GENERATED_DIR_RST}/${plugin}.rst + mv "${GENERATED_DIR_RST}/$(snake_case_to_camel_case ${plugin}).rst" "${GENERATED_DIR_RST}/temp.rst" + mv "${GENERATED_DIR_RST}/temp.rst" "${GENERATED_DIR_RST}/${plugin}.rst" + echo " -> [+] Generated doc entry for ${plugin}" # Add plugin entry to docs index if not already listed. From 8ce800c51be18cdba8ab0c85a61fb7d10132a381 Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 17:12:49 +0100 Subject: [PATCH 8/9] Updated + fixed `run_protoc` script --- other/tools/run_protoc.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/other/tools/run_protoc.sh b/other/tools/run_protoc.sh index 78c57fcf..edc24584 100755 --- a/other/tools/run_protoc.sh +++ b/other/tools/run_protoc.sh @@ -36,6 +36,7 @@ function generate { for plugin in ${PLUGIN_LIST}; do + echo " -> [+] Generating bindings for ${plugin}" # Generate protobuf and gRPC files python3 -m grpc_tools.protoc -I${PROTO_DIR}/protos \ --python_out=${GENERATED_DIR} \ From 9fff235e910acb6d66aa5c1edbdb46ce7aabc7c4 Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Thu, 20 Jun 2024 17:35:28 +0100 Subject: [PATCH 9/9] Fixed `index.rst` --- mavsdk/source/plugins/index.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mavsdk/source/plugins/index.rst b/mavsdk/source/plugins/index.rst index f6c73cb9..da4df86d 100644 --- a/mavsdk/source/plugins/index.rst +++ b/mavsdk/source/plugins/index.rst @@ -1,9 +1,17 @@ +Plugins +======= + +.. toctree:: + :titlesonly: + action action_server arm_authorizer_server calibration camera camera_server + component_information + component_information_server component_metadata component_metadata_server core @@ -30,6 +38,7 @@ shell telemetry telemetry_server + tracking_server transponder tune winch