Skip to content

Commit e2e95ee

Browse files
api-clients-generation-pipeline[bot]skarimoci.datadog-api-spec
authored
[AAWF-638] Remove description requirements (#2908)
* handle missing discription * Regenerate client from commit 77596ba of spec repo --------- Co-authored-by: skarimo <sherzod.karimov@datadoghq.com> Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com> Co-authored-by: skarimo <40482491+skarimo@users.noreply.github.com>
1 parent 1935a2d commit e2e95ee

File tree

8 files changed

+23
-22
lines changed

8 files changed

+23
-22
lines changed

.generator/schemas/v1/openapi.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9646,6 +9646,8 @@ components:
96469646
type: object
96479647
NotebookGlobalTime:
96489648
description: Notebook global timeframe.
9649+
example:
9650+
live_span: 1h
96499651
oneOf:
96509652
- $ref: '#/components/schemas/NotebookRelativeTime'
96519653
- $ref: '#/components/schemas/NotebookAbsoluteTime'
@@ -14820,6 +14822,7 @@ components:
1482014822
SyntheticsAssertionTargetValue:
1482114823
description: Value used by the operator in assertions. Can be either a number
1482214824
or string.
14825+
example: 0.0
1482314826
oneOf:
1482414827
- $ref: '#/components/schemas/SyntheticsAssertionTargetValueNumber'
1482514828
- $ref: '#/components/schemas/SyntheticsAssertionTargetValueString'

.generator/schemas/v2/openapi.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2361,6 +2361,7 @@ components:
23612361
- $ref: '#/components/schemas/ActionQueryMockedOutputsObject'
23622362
ActionQueryMockedOutputsEnabled:
23632363
description: Whether to enable the mocked outputs for testing.
2364+
example: false
23642365
oneOf:
23652366
- type: boolean
23662367
- description: If this is a string, it must be a valid JavaScript expression
@@ -2450,6 +2451,7 @@ components:
24502451
type: string
24512452
ActionQuerySpec:
24522453
description: The definition of the action query.
2454+
example: ''
24532455
oneOf:
24542456
- type: string
24552457
- $ref: '#/components/schemas/ActionQuerySpecObject'
@@ -13516,6 +13518,7 @@ components:
1351613518
type: object
1351713519
CustomAttributeValuesUnion:
1351813520
description: Union of supported value for a custom attribute
13521+
example: ''
1351913522
oneOf:
1352013523
- $ref: '#/components/schemas/CustomAttributeStringValue'
1352113524
- $ref: '#/components/schemas/CustomAttributeMultiStringValue'
@@ -33546,6 +33549,7 @@ components:
3354633549
ObservabilityPipelineOcsfMapperProcessorMappingMapping:
3354733550
description: Defines a single mapping rule for transforming logs into the OCSF
3354833551
schema.
33552+
example: CloudTrail Account Change
3354933553
oneOf:
3355033554
- $ref: '#/components/schemas/ObservabilityPipelineOcsfMappingLibrary'
3355133555
ObservabilityPipelineOcsfMapperProcessorType:

.generator/src/generator/formatter.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ def header(self, text, level, raw=None):
166166

167167

168168
def docstring(text):
169+
if not text:
170+
return text
169171
return (
170172
m2r2.convert((text or "").replace("\\n", "\\\\n"), renderer=CustomRenderer())[1:-1]
171173
.replace("\\ ", " ")

.generator/src/generator/templates/api.j2

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ from {{ package }}.{{ version }}.model.{{ model|safe_snake_case }} import {{ mod
2525
{% set classname = name|class_name %}
2626
class {{ classname }}:
2727
"""
28-
{{ description|docstring|indent(4) }}
28+
{{ (description or "")|docstring|indent(4) }}
2929
"""
3030
def __init__(self, api_client=None):
3131
if api_client is None:
@@ -140,18 +140,18 @@ class {{ classname }}:
140140
{%- for path, method, operation in operations|sort(attribute="2.operationId") %}
141141
{%- set returnType = operation|return_type %}
142142
def {{ operation.operationId|safe_snake_case }}(self, {% for name, parameter in operation|parameters if parameter.required %}{{name|attribute_name}}: {{ get_type_for_parameter(parameter, typing=True) }}, {% endfor %}{% for name, parameter in operation|parameters if not parameter.required %}{% if loop.first %}*, {% endif %}{{name|attribute_name}}: Union[{{ get_type_for_parameter(parameter, typing=True) }}, UnsetType]=unset, {% endfor %}) -> {% if returnType %}{{ returnType.replace("[", "List[") }}{% else %}None{% endif %}:
143-
"""{{ operation.summary|indent(8) }}.{% if operation.deprecated %} **Deprecated**.{% endif %}
143+
"""{{ (operation.summary or "")|indent(8) }}.{% if operation.deprecated %} **Deprecated**.{% endif %}
144144
{% if operation.description %}
145-
{{ operation.description|docstring|indent(8) }}
145+
{{ (operation.description or "")|docstring|indent(8) }}
146146
{% endif %}
147147
{%- for name, parameter in operation|parameters if parameter.required %}
148148
{%- if parameter.description %}
149-
:param {{ name|attribute_name }}: {{ parameter.description|docstring|indent(12) }}{% if parameter.default %} Defaults to {{ parameter.default }}.{% endif %}{% endif %}
149+
:param {{ name|attribute_name }}: {{ (parameter.description or "")|docstring|indent(12) }}{% if parameter.default %} Defaults to {{ parameter.default }}.{% endif %}{% endif %}
150150
:type {{ name|attribute_name }}: {{ get_type_for_parameter(parameter) }}
151151
{%- endfor %}
152152
{%- for name, parameter in operation|parameters if not parameter.required %}
153153
{%- if parameter.description %}
154-
:param {{ name|attribute_name }}: {{ parameter.description|docstring|indent(12) }}{%- if parameter.default %} If omitted the server will use the default value of {{ parameter.default }}.{% endif %}{% endif %}
154+
:param {{ name|attribute_name }}: {{ (parameter.description or "")|docstring|indent(12) }}{%- if parameter.default %} If omitted the server will use the default value of {{ parameter.default }}.{% endif %}{% endif %}
155155
:type {{ name|attribute_name }}: {{ get_type_for_parameter(parameter) }}, optional
156156
{%- endfor %}
157157

@@ -175,18 +175,18 @@ class {{ classname }}:
175175
{%- set pagination = operation["x-pagination"] %}
176176

177177
def {{ operation.operationId|safe_snake_case }}_with_pagination(self, {% for name, parameter in operation|parameters if parameter.required %}{{name|attribute_name}}: {{ get_type_for_parameter(parameter, typing=True) }}, {% endfor %}{% for name, parameter in operation|parameters if not parameter.required %}{% if loop.first %}*, {% endif %}{{name|attribute_name}}: Union[{{ get_type_for_parameter(parameter, typing=True) }}, UnsetType]=unset, {% endfor %}) -> collections.abc.Iterable[{{ get_type_at_path(operation, pagination.resultsPath) }}]:
178-
"""{{ operation.summary|indent(8) }}.
178+
"""{{ (operation.summary or "")|indent(8) }}.
179179

180180
Provide a paginated version of :meth:`{{ operation.operationId|safe_snake_case }}`, returning all items.
181181
{# keep new line #}
182182
{%- for name, parameter in operation|parameters if parameter.required %}
183183
{%- if parameter.description %}
184-
:param {{ name|attribute_name }}: {{ parameter.description|docstring|indent(12) }}{% if parameter.default %} Defaults to {{ parameter.default }}.{% endif %}{% endif %}
184+
:param {{ name|attribute_name }}: {{ (parameter.description or "")|docstring|indent(12) }}{% if parameter.default %} Defaults to {{ parameter.default }}.{% endif %}{% endif %}
185185
:type {{ name|attribute_name }}: {{ get_type_for_parameter(parameter) }}
186186
{%- endfor %}
187187
{%- for name, parameter in operation|parameters if not parameter.required %}
188188
{%- if parameter.description %}
189-
:param {{ name|attribute_name }}: {{ parameter.description|docstring|indent(12) }}{%- if parameter.default %} If omitted the server will use the default value of {{ parameter.default }}.{% endif %}{% endif %}
189+
:param {{ name|attribute_name }}: {{ (parameter.description or "")|docstring|indent(12) }}{%- if parameter.default %} If omitted the server will use the default value of {{ parameter.default }}.{% endif %}{% endif %}
190190
:type {{ name|attribute_name }}: {{ get_type_for_parameter(parameter) }}, optional
191191
{%- endfor %}
192192

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

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

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

108
: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 %}].
119
:type value: {{ get_enum_type(model) }}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,10 @@ class {{ name }}(ModelNormal):
122122
{%- if attr not in model.get("required", []) %} {{ attr|attribute_name }}: {{ get_typing_for_attribute(model, attr, current_name=name, optional=True) }}=unset,{% endif %}
123123
{%- endfor %} **kwargs):
124124
"""
125-
{%- if "description" in model %}
126-
{{ model.description|docstring|indent(8) }}
127-
{%- endif %}
125+
{{ (model.description or "")|docstring|indent(8) }}
128126
{%- for attr, definition in model.get("properties", {}).items() %}
129127
{# keep new line #}
130-
:param {{ attr|attribute_name }}: {% if "description" in definition %}{{ definition.description|docstring|indent(12) }}{% if definition.deprecated %} **Deprecated**.{% endif %}{% endif %}
128+
:param {{ attr|attribute_name }}: {{ (definition.description or "")|docstring|indent(12) }}{% if definition.deprecated %} **Deprecated**.{% endif %}
131129
: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 %}
132130
{%- endfor %}
133131
"""

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

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

99
def __init__(self, **kwargs):
1010
"""
11-
{%- if "description" in model %}
12-
{{ model.description|docstring|indent(8) }}
13-
{%- endif %}
11+
{{ (model.description or "")|docstring|indent(8) }}
1412
{%- for attr, definition, schema in get_oneof_parameters(model) %}
1513
{# keep new line #}
16-
:param {{ attr|attribute_name }}: {% if "description" in definition %}{{ definition.description|indent(12) }}{% endif %}
14+
:param {{ attr|attribute_name }}: {{ (definition.description or "")|indent(12) }}
1715
: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 %}
1816
{%- endfor %}
1917
"""

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

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

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

0 commit comments

Comments
 (0)