From ff679521e1315e3752d88472f3ba139655638f3c Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Mon, 3 Nov 2025 09:59:40 +0100 Subject: [PATCH] Update protoc-gen-mavsdk to v2 (and adapt the templates accordingly) --- other/templates/py/call.j2 | 4 ++-- other/templates/py/request.j2 | 12 ++++++------ other/templates/py/stream.j2 | 10 +++++----- other/templates/py/struct.j2 | 8 ++++---- proto | 2 +- requirements-dev.txt | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/other/templates/py/call.j2 b/other/templates/py/call.j2 index 294cbd3c..cbfc1c66 100644 --- a/other/templates/py/call.j2 +++ b/other/templates/py/call.j2 @@ -7,7 +7,7 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na Parameters ---------- {% for param in params -%} - {{ param.name.lower_snake_case }} : {{ param.type_info.name }} + {{ param.name.lower_snake_case }} : {% if param.type_info.is_primitive %}{% if param.type_info.is_repeated %}[{{ param.type_info.name }}{% else %}{{ param.type_info.name }}{% endif %}{% else %}{% if param.type_info.is_repeated %}[{{ param.type_info.inner_name.upper_camel_case }}]{% else %}{{ param.type_info.inner_name.upper_camel_case }}{% endif %}{% endif %} {{ param.description }} {% endfor -%} {% endif -%} @@ -31,7 +31,7 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na {% else %} rpc_elems_list = [] for elem in {{ param.name.lower_snake_case }}: - rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name }}() + rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name.upper_camel_case }}() elem.translate_to_rpc(rpc_elem) rpc_elems_list.append(rpc_elem) {% endif %} diff --git a/other/templates/py/request.j2 b/other/templates/py/request.j2 index 6cde5ebf..7283d630 100644 --- a/other/templates/py/request.j2 +++ b/other/templates/py/request.j2 @@ -7,14 +7,14 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na Parameters ---------- {% for param in params -%} - {{ param.name.lower_snake_case }} : {{ param.type_info.name }} + {{ param.name.lower_snake_case }} : {% if param.type_info.is_primitive %}{% if param.type_info.is_repeated %}[{{ param.type_info.name }}]{% else %}{{ param.type_info.name }}{% endif %}{% else %}{% if param.type_info.is_repeated %}[{{ param.type_info.inner_name.upper_camel_case }}]{% else %}{{ param.type_info.name.upper_camel_case }}{% endif %}{% endif %} {{ param.description }} {% endfor -%} {% endif -%} Returns ------- - {{ return_name.lower_snake_case }} : {{ return_type.name }} + {{ return_name.lower_snake_case }} : {% if return_type.is_primitive %}{% if return_type.is_repeated %}[{{ return_type.name }}]{% else %}{{ return_type.name }}{% endif %}{% else %}{% if return_type.is_repeated %}[{{ return_type.inner_name.upper_camel_case }}]{% else %}{{ return_type.name.upper_camel_case }}{% endif %}{% endif %} {{ return_description }} {% if has_result -%} Raises @@ -31,11 +31,11 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na {% else %} {% if param.type_info.is_repeated %} {% if param.type_info.is_enum %} - rpc_elems_list = [elem.translate_to_rpc() for elem in {{ param.name.lower_snake_case }}] + rpc_elems_list = [elem.translate_to_rpc() for elem in {{ param.inner_name.lower_snake_case }}] {% else %} rpc_elems_list = [] for elem in {{ param.name.lower_snake_case }}: - rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name }}() + rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name.upper_camel_case }}() elem.translate_to_rpc(rpc_elem) rpc_elems_list.append(rpc_elem) {% endif %} @@ -60,8 +60,8 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na return response.{{ return_name.lower_snake_case }} {% else -%} {% if return_type.is_repeated -%} - return [{{ return_type.inner_name }}.translate_from_rpc(elem) for elem in response.{{ return_name.lower_snake_case }}] + return [{{ return_type.inner_name.upper_camel_case }}.translate_from_rpc(elem) for elem in response.{{ return_name.lower_snake_case }}] {% else -%} - return {{ return_type.inner_name }}.translate_from_rpc(response.{{ return_name.lower_snake_case }}) + return {{ return_type.inner_name.upper_camel_case }}.translate_from_rpc(response.{{ return_name.lower_snake_case }}) {% endif -%} {% endif %} diff --git a/other/templates/py/stream.j2 b/other/templates/py/stream.j2 index 71375461..ba9d941b 100644 --- a/other/templates/py/stream.j2 +++ b/other/templates/py/stream.j2 @@ -7,14 +7,14 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na Parameters ---------- {% for param in params -%} - {{ param.name.lower_snake_case }} : {{ param.type_info.name }} + {{ param.name.lower_snake_case }} : {% if param.type_info.is_primitive %}{% if param.type_info.is_repeated %}[{{ param.type_info.name }}]{% else %}{{ param.type_info.name }}{% endif %}{% else %}{% if param.type_info.is_repeated %}[{{ param.type_info.inner_name.upper_camel_case }}]{% else %}{{ param.type_info.inner_name.upper_camel_case }}{% endif %}{% endif %} {{ param.description }} {% endfor -%} {% endif -%} Yields ------- - {{ return_name.lower_snake_case }} : {{ return_type.name }} + {{ return_name.lower_snake_case }} : {% if return_type.is_primitive %}{% if return_type.is_repeated %}[{{ return_type.name }}]{% else %}{{ return_type.name }}{% endif %}{% else %}{% if return_type.is_repeated %}[{{ return_type.inner_name.upper_camel_case }}]{% else %}{{ return_type.inner_name.upper_camel_case }}{% endif %}{% endif %} {{ return_description }} {% if has_result -%} Raises @@ -35,7 +35,7 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na {% else %} rpc_elems_list = [for elem in {{ param.name.lower_snake_case }}] for elem in : - rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name }}() + rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name.upper_camel_case }}() elem.translate_to_rpc(rpc_elem) rpc_elems_list.append(rpc_elem) {% endif %} @@ -71,9 +71,9 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na {%- elif return_type.is_primitive %} yield response.{{ return_name.lower_snake_case }} {%- elif not return_type.is_primitive and not return_type.is_repeated %} - yield {{ return_type.name }}.translate_from_rpc(response.{{ return_name.lower_snake_case }}) + yield {{ return_type.name.upper_camel_case }}.translate_from_rpc(response.{{ return_name.lower_snake_case }}) {%- elif not return_type.is_primitive and return_type.is_repeated %} - yield [{{ return_type.inner_name }}.translate_from_rpc(x) for x in response.{{ return_name.lower_snake_case }}] + yield [{{ return_type.inner_name.upper_camel_case }}.translate_from_rpc(x) for x in response.{{ return_name.lower_snake_case }}] {%- endif %} finally: {{ name.lower_snake_case }}_stream.cancel() diff --git a/other/templates/py/struct.j2 b/other/templates/py/struct.j2 index 0921633a..e38cb06a 100644 --- a/other/templates/py/struct.j2 +++ b/other/templates/py/struct.j2 @@ -5,7 +5,7 @@ class {{ name.upper_camel_case }}: Parameters ---------- {% for field in fields -%} - {{ field.name.lower_snake_case }} : {{ field.type_info.name }} + {{ field.name.lower_snake_case }} : {% if field.type_info.is_primitive %}{{ field.type_info.name }}{% else %}{% if field.type_info.is_repeated %}[{{ field.type_info.inner_name.upper_camel_case }}]{% else %}{{ field.type_info.inner_name.upper_camel_case }}{% endif %}{% endif %} {{ field.description }} {% endfor -%} """ @@ -56,9 +56,9 @@ class {{ name.upper_camel_case }}: rpc{{ name.upper_camel_case }}.{{ field.name.lower_snake_case }}{{ "," if not loop.last }} {% else %} {%- if field.type_info.is_repeated %} - [{{ field.type_info.inner_name }}.translate_from_rpc(elem) for elem in rpc{{ name.upper_camel_case }}.{{ field.name.lower_snake_case }}]{{ "," if not loop.last }} + [{{ field.type_info.inner_name.upper_camel_case }}.translate_from_rpc(elem) for elem in rpc{{ name.upper_camel_case }}.{{ field.name.lower_snake_case }}]{{ "," if not loop.last }} {%- else %} - {% if field.type_info.parent_type is not none %}{{ field.type_info.parent_type }}.{% endif %}{{ field.type_info.inner_name }}.translate_from_rpc(rpc{{ name.upper_camel_case }}.{{ field.name.lower_snake_case }}){{ "," if not loop.last }} + {% if field.type_info.parent_type is not none %}{{ field.type_info.parent_type.upper_camel_case }}.{% endif %}{{ field.type_info.inner_name.upper_camel_case }}.translate_from_rpc(rpc{{ name.upper_camel_case }}.{{ field.name.lower_snake_case }}){{ "," if not loop.last }} {%- endif %} {% endif %} {%- endfor %}) @@ -77,7 +77,7 @@ class {{ name.upper_camel_case }}: {% else %} rpc_elems_list = [] for elem in self.{{ field.name.lower_snake_case }}: - rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ field.type_info.inner_name }}() + rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ field.type_info.inner_name.upper_camel_case }}() elem.translate_to_rpc(rpc_elem) rpc_elems_list.append(rpc_elem) {% endif %} diff --git a/proto b/proto index d4aa7faf..f22994b4 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit d4aa7faf60ae9680796e77e6779bdbbc54ed4b1b +Subproject commit f22994b46cd830eb2ad2e7d508b612582cd0173d diff --git a/requirements-dev.txt b/requirements-dev.txt index 63485662..b9f7e4f8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,3 @@ grpcio-tools>=1.40.0 -protoc-gen-mavsdk~=1.2 +protoc-gen-mavsdk~=2.0 ruff>=0.12.12