Skip to content

Commit 2ea4a3c

Browse files
Allow empty descriptions. (#2899)
1 parent 81ebc0d commit 2ea4a3c

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

.generator/src/generator/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def cli(specs, output):
125125
api_path = package / "api" / filename
126126
api_path.parent.mkdir(parents=True, exist_ok=True)
127127
with api_path.open("w") as fp:
128-
fp.write(api_j2.render(name=name, operations=operations, description=tags_by_name[name]["description"]))
128+
fp.write(api_j2.render(name=name, operations=operations, description=tags_by_name[name].get("description")))
129129

130130
api_init_path = package / "api" / "__init__.py"
131131
with api_init_path.open("w") as fp:

.generator/src/generator/formatter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def header(self, text, level, raw=None):
167167

168168
def docstring(text):
169169
return (
170-
m2r2.convert(text.replace("\\n", "\\\\n"), renderer=CustomRenderer())[1:-1]
170+
m2r2.convert((text or "").replace("\\n", "\\\\n"), renderer=CustomRenderer())[1:-1]
171171
.replace("\\ ", " ")
172172
.replace("\\`", "\\\\`")
173173
.replace("\n\n\n", "\n\n")

.generator/src/generator/templates/model_enum.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ from typing import ClassVar
33

44
class {{ name }}(ModelSimple):
55
"""
6+
{%- if "description" in model %}
67
{{ model.description|indent(8) }}
8+
{%- endif %}
79

810
:param value: {%- if default != None %} If omitted defaults to {{ default|format_value }}.{%- endif %} Must be one of [{%- for value in model.enum %}{{ value|format_value }}{% if not loop.last %}, {% endif %}{%- endfor %}].
911
:type value: {{ get_enum_type(model) }}

.generator/src/generator/templates/model_generic.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class {{ name }}(ModelNormal):
127127
{%- endif %}
128128
{%- for attr, definition in model.get("properties", {}).items() %}
129129
{# keep new line #}
130-
:param {{ attr|attribute_name }}: {{ definition.description|docstring|indent(12) }}{% if definition.deprecated %} **Deprecated**.{% endif %}
130+
:param {{ attr|attribute_name }}: {% if "description" in definition %}{{ definition.description|docstring|indent(12) }}{% if definition.deprecated %} **Deprecated**.{% endif %}{% endif %}
131131
:type {{ attr|attribute_name }}: {{ get_type_for_attribute(model, attr, current_name=name) }}{% if definition.nullable %}, none_type{% endif %}{% if attr not in model.get("required", []) %}, optional{% endif %}
132132
{%- endfor %}
133133
"""

.generator/src/generator/templates/model_oneof.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ class {{ name }}(ModelComposed):
88

99
def __init__(self, **kwargs):
1010
"""
11+
{%- if "description" in model %}
1112
{{ model.description|docstring|indent(8) }}
13+
{%- endif %}
1214
{%- for attr, definition, schema in get_oneof_parameters(model) %}
1315
{# keep new line #}
14-
:param {{ attr|attribute_name }}: {{ definition.description|indent(12) }}
16+
:param {{ attr|attribute_name }}: {% if "description" in definition %}{{ definition.description|indent(12) }}{% endif %}
1517
:type {{ attr|attribute_name }}: {{ get_type_for_attribute(schema, attr, current_name=name) }}{% if definition.nullable %}, none_type{% endif %}{% if attr not in schema.get("required", []) %}, optional{% endif %}
1618
{%- endfor %}
1719
"""

.generator/src/generator/templates/model_simple.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
class {{ name }}(ModelSimple):
44
"""
5+
{%- if "description" in model %}
56
{{ model.description|docstring|indent(8) }}
7+
{%- endif %}
68

79
{# empty line #}
810
{%- if "default" in model and model.default != None %}

0 commit comments

Comments
 (0)