Skip to content

Commit ff67952

Browse files
JonasVautherinjulianoes
JonasVautherin
authored and
julianoes
committed
Update protoc-gen-mavsdk to v2 (and adapt the templates accordingly)
1 parent 37799be commit ff67952

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎other/templates/py/call.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
77
Parameters
88
----------
99
{% for param in params -%}
10-
{{ param.name.lower_snake_case }} : {{ param.type_info.name }}
10+
{{ 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 %}
1111
{{ param.description }}
1212
{% endfor -%}
1313
{% endif -%}
@@ -31,7 +31,7 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
3131
{% else %}
3232
rpc_elems_list = []
3333
for elem in {{ param.name.lower_snake_case }}:
34-
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name }}()
34+
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name.upper_camel_case }}()
3535
elem.translate_to_rpc(rpc_elem)
3636
rpc_elems_list.append(rpc_elem)
3737
{% endif %}

‎other/templates/py/request.j2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
77
Parameters
88
----------
99
{% for param in params -%}
10-
{{ param.name.lower_snake_case }} : {{ param.type_info.name }}
10+
{{ 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 %}
1111
{{ param.description }}
1212
{% endfor -%}
1313
{% endif -%}
1414

1515
Returns
1616
-------
17-
{{ return_name.lower_snake_case }} : {{ return_type.name }}
17+
{{ 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 %}
1818
{{ return_description }}
1919
{% if has_result -%}
2020
Raises
@@ -31,11 +31,11 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
3131
{% else %}
3232
{% if param.type_info.is_repeated %}
3333
{% if param.type_info.is_enum %}
34-
rpc_elems_list = [elem.translate_to_rpc() for elem in {{ param.name.lower_snake_case }}]
34+
rpc_elems_list = [elem.translate_to_rpc() for elem in {{ param.inner_name.lower_snake_case }}]
3535
{% else %}
3636
rpc_elems_list = []
3737
for elem in {{ param.name.lower_snake_case }}:
38-
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name }}()
38+
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name.upper_camel_case }}()
3939
elem.translate_to_rpc(rpc_elem)
4040
rpc_elems_list.append(rpc_elem)
4141
{% endif %}
@@ -60,8 +60,8 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
6060
return response.{{ return_name.lower_snake_case }}
6161
{% else -%}
6262
{% if return_type.is_repeated -%}
63-
return [{{ return_type.inner_name }}.translate_from_rpc(elem) for elem in response.{{ return_name.lower_snake_case }}]
63+
return [{{ return_type.inner_name.upper_camel_case }}.translate_from_rpc(elem) for elem in response.{{ return_name.lower_snake_case }}]
6464
{% else -%}
65-
return {{ return_type.inner_name }}.translate_from_rpc(response.{{ return_name.lower_snake_case }})
65+
return {{ return_type.inner_name.upper_camel_case }}.translate_from_rpc(response.{{ return_name.lower_snake_case }})
6666
{% endif -%}
6767
{% endif %}

‎other/templates/py/stream.j2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
77
Parameters
88
----------
99
{% for param in params -%}
10-
{{ param.name.lower_snake_case }} : {{ param.type_info.name }}
10+
{{ 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 %}
1111
{{ param.description }}
1212
{% endfor -%}
1313
{% endif -%}
1414

1515
Yields
1616
-------
17-
{{ return_name.lower_snake_case }} : {{ return_type.name }}
17+
{{ 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 %}
1818
{{ return_description }}
1919
{% if has_result -%}
2020
Raises
@@ -35,7 +35,7 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
3535
{% else %}
3636
rpc_elems_list = [for elem in {{ param.name.lower_snake_case }}]
3737
for elem in :
38-
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name }}()
38+
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ param.type_info.inner_name.upper_camel_case }}()
3939
elem.translate_to_rpc(rpc_elem)
4040
rpc_elems_list.append(rpc_elem)
4141
{% endif %}
@@ -71,9 +71,9 @@ async def {{ name.lower_snake_case }}(self{% for param in params %}, {{ param.na
7171
{%- elif return_type.is_primitive %}
7272
yield response.{{ return_name.lower_snake_case }}
7373
{%- elif not return_type.is_primitive and not return_type.is_repeated %}
74-
yield {{ return_type.name }}.translate_from_rpc(response.{{ return_name.lower_snake_case }})
74+
yield {{ return_type.name.upper_camel_case }}.translate_from_rpc(response.{{ return_name.lower_snake_case }})
7575
{%- elif not return_type.is_primitive and return_type.is_repeated %}
76-
yield [{{ return_type.inner_name }}.translate_from_rpc(x) for x in response.{{ return_name.lower_snake_case }}]
76+
yield [{{ return_type.inner_name.upper_camel_case }}.translate_from_rpc(x) for x in response.{{ return_name.lower_snake_case }}]
7777
{%- endif %}
7878
finally:
7979
{{ name.lower_snake_case }}_stream.cancel()

‎other/templates/py/struct.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class {{ name.upper_camel_case }}:
55
Parameters
66
----------
77
{% for field in fields -%}
8-
{{ field.name.lower_snake_case }} : {{ field.type_info.name }}
8+
{{ 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 %}
99
{{ field.description }}
1010
{% endfor -%}
1111
"""
@@ -56,9 +56,9 @@ class {{ name.upper_camel_case }}:
5656
rpc{{ name.upper_camel_case }}.{{ field.name.lower_snake_case }}{{ "," if not loop.last }}
5757
{% else %}
5858
{%- if field.type_info.is_repeated %}
59-
[{{ 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 }}
59+
[{{ 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 }}
6060
{%- else %}
61-
{% 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 }}
61+
{% 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 }}
6262
{%- endif %}
6363
{% endif %}
6464
{%- endfor %})
@@ -77,7 +77,7 @@ class {{ name.upper_camel_case }}:
7777
{% else %}
7878
rpc_elems_list = []
7979
for elem in self.{{ field.name.lower_snake_case }}:
80-
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ field.type_info.inner_name }}()
80+
rpc_elem = {{ plugin_name.lower_snake_case }}_pb2.{{ field.type_info.inner_name.upper_camel_case }}()
8181
elem.translate_to_rpc(rpc_elem)
8282
rpc_elems_list.append(rpc_elem)
8383
{% endif %}

‎proto‎

‎requirements-dev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
grpcio-tools>=1.40.0
2-
protoc-gen-mavsdk~=1.2
2+
protoc-gen-mavsdk~=2.0
33
ruff>=0.12.12

0 commit comments

Comments
 (0)