Skip to content

Commit 82aa5e6

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 37ed2061 of spec repo
1 parent a21394f commit 82aa5e6

File tree

10 files changed

+141
-28
lines changed

10 files changed

+141
-28
lines changed

.apigentools-info

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"info_version": "2",
44
"spec_versions": {
55
"v1": {
6-
"apigentools_version": "1.6.5",
7-
"regenerated": "2023-09-19 15:38:29.693348",
8-
"spec_repo_commit": "30c5293b"
6+
"apigentools_version": "1.6.6",
7+
"regenerated": "2023-09-21 12:00:39.572400",
8+
"spec_repo_commit": "37ed2061"
99
},
1010
"v2": {
11-
"apigentools_version": "1.6.5",
12-
"regenerated": "2023-09-19 15:38:29.707115",
13-
"spec_repo_commit": "30c5293b"
11+
"apigentools_version": "1.6.6",
12+
"regenerated": "2023-09-21 12:00:39.586103",
13+
"spec_repo_commit": "37ed2061"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3712,9 +3712,7 @@ components:
37123712
example: a
37133713
type: string
37143714
type:
3715-
description: The type of column present.
3716-
example: number
3717-
type: string
3715+
$ref: '#/components/schemas/ScalarColumnTypeNumber'
37183716
values:
37193717
description: The array of numerical values for one formula or query.
37203718
example:
@@ -3723,6 +3721,7 @@ components:
37233721
description: An individual value for a given column and group-by.
37243722
example: 0.5
37253723
format: double
3724+
nullable: true
37263725
type: number
37273726
type: array
37283727
type: object
@@ -5509,9 +5508,7 @@ components:
55095508
example: env
55105509
type: string
55115510
type:
5512-
description: The type of column present.
5513-
example: group
5514-
type: string
5511+
$ref: '#/components/schemas/ScalarColumnTypeGroup'
55155512
values:
55165513
description: The array of tag values for each group found for the results
55175514
of the formulas or queries.
@@ -12111,6 +12108,24 @@ components:
1211112108
oneOf:
1211212109
- $ref: '#/components/schemas/GroupScalarColumn'
1211312110
- $ref: '#/components/schemas/DataScalarColumn'
12111+
ScalarColumnTypeGroup:
12112+
default: group
12113+
description: The type of column present for groups.
12114+
enum:
12115+
- group
12116+
example: group
12117+
type: string
12118+
x-enum-varnames:
12119+
- GROUP
12120+
ScalarColumnTypeNumber:
12121+
default: number
12122+
description: The type of column present for numbers.
12123+
enum:
12124+
- number
12125+
example: number
12126+
type: string
12127+
x-enum-varnames:
12128+
- NUMBER
1211412129
ScalarFormulaQueryRequest:
1211512130
description: A wrapper request around one scalar query to be executed.
1211612131
properties:
@@ -12215,6 +12230,7 @@ components:
1221512230
If the second element is not present, the API returns null.'
1221612231
items:
1221712232
$ref: '#/components/schemas/Unit'
12233+
nullable: true
1221812234
type: array
1221912235
type: object
1222012236
ScalarQuery:

docs/datadog_api_client.v2.model.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5391,6 +5391,20 @@ scalar\_column
53915391
:members:
53925392
:show-inheritance:
53935393

5394+
scalar\_column\_type\_group
5395+
---------------------------
5396+
5397+
.. automodule:: datadog_api_client.v2.model.scalar_column_type_group
5398+
:members:
5399+
:show-inheritance:
5400+
5401+
scalar\_column\_type\_number
5402+
----------------------------
5403+
5404+
.. automodule:: datadog_api_client.v2.model.scalar_column_type_number
5405+
:members:
5406+
:show-inheritance:
5407+
53945408
scalar\_formula\_query\_request
53955409
-------------------------------
53965410

src/datadog_api_client/v2/model/data_scalar_column.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,28 @@
88
from datadog_api_client.model_utils import (
99
ModelNormal,
1010
cached_property,
11+
none_type,
1112
unset,
1213
UnsetType,
1314
)
1415

1516

1617
if TYPE_CHECKING:
1718
from datadog_api_client.v2.model.scalar_meta import ScalarMeta
19+
from datadog_api_client.v2.model.scalar_column_type_number import ScalarColumnTypeNumber
1820

1921

2022
class DataScalarColumn(ModelNormal):
2123
@cached_property
2224
def openapi_types(_):
2325
from datadog_api_client.v2.model.scalar_meta import ScalarMeta
26+
from datadog_api_client.v2.model.scalar_column_type_number import ScalarColumnTypeNumber
2427

2528
return {
2629
"meta": (ScalarMeta,),
2730
"name": (str,),
28-
"type": (str,),
29-
"values": ([float],),
31+
"type": (ScalarColumnTypeNumber,),
32+
"values": ([float, none_type],),
3033
}
3134

3235
attribute_map = {
@@ -40,7 +43,7 @@ def __init__(
4043
self_,
4144
meta: Union[ScalarMeta, UnsetType] = unset,
4245
name: Union[str, UnsetType] = unset,
43-
type: Union[str, UnsetType] = unset,
46+
type: Union[ScalarColumnTypeNumber, UnsetType] = unset,
4447
values: Union[List[float], UnsetType] = unset,
4548
**kwargs,
4649
):
@@ -53,11 +56,11 @@ def __init__(
5356
:param name: The name referencing the formula or query for this column.
5457
:type name: str, optional
5558
56-
:param type: The type of column present.
57-
:type type: str, optional
59+
:param type: The type of column present for numbers.
60+
:type type: ScalarColumnTypeNumber, optional
5861
5962
:param values: The array of numerical values for one formula or query.
60-
:type values: [float], optional
63+
:type values: [float, none_type], optional
6164
"""
6265
if meta is not unset:
6366
kwargs["meta"] = meta

src/datadog_api_client/v2/model/group_scalar_column.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright 2019-Present Datadog, Inc.
44
from __future__ import annotations
55

6-
from typing import List, Union
6+
from typing import List, Union, TYPE_CHECKING
77

88
from datadog_api_client.model_utils import (
99
ModelNormal,
@@ -13,12 +13,18 @@
1313
)
1414

1515

16+
if TYPE_CHECKING:
17+
from datadog_api_client.v2.model.scalar_column_type_group import ScalarColumnTypeGroup
18+
19+
1620
class GroupScalarColumn(ModelNormal):
1721
@cached_property
1822
def openapi_types(_):
23+
from datadog_api_client.v2.model.scalar_column_type_group import ScalarColumnTypeGroup
24+
1925
return {
2026
"name": (str,),
21-
"type": (str,),
27+
"type": (ScalarColumnTypeGroup,),
2228
"values": ([[str]],),
2329
}
2430

@@ -31,7 +37,7 @@ def openapi_types(_):
3137
def __init__(
3238
self_,
3339
name: Union[str, UnsetType] = unset,
34-
type: Union[str, UnsetType] = unset,
40+
type: Union[ScalarColumnTypeGroup, UnsetType] = unset,
3541
values: Union[List[List[str]], UnsetType] = unset,
3642
**kwargs,
3743
):
@@ -41,8 +47,8 @@ def __init__(
4147
:param name: The name of the tag key or group.
4248
:type name: str, optional
4349
44-
:param type: The type of column present.
45-
:type type: str, optional
50+
:param type: The type of column present for groups.
51+
:type type: ScalarColumnTypeGroup, optional
4652
4753
:param values: The array of tag values for each group found for the results of the formulas or queries.
4854
:type values: [[str]], optional

src/datadog_api_client/v2/model/scalar_column.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ def __init__(self, **kwargs):
1818
:param name: The name of the tag key or group.
1919
:type name: str, optional
2020
21-
:param type: The type of column present.
22-
:type type: str, optional
21+
:param type: The type of column present for groups.
22+
:type type: ScalarColumnTypeGroup, optional
2323
2424
:param values: The array of tag values for each group found for the results of the formulas or queries.
2525
:type values: [[str]], optional
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
2+
# This product includes software developed at Datadog (https://www.datadoghq.com/).
3+
# Copyright 2019-Present Datadog, Inc.
4+
from __future__ import annotations
5+
6+
7+
from datadog_api_client.model_utils import (
8+
ModelSimple,
9+
cached_property,
10+
)
11+
12+
from typing import ClassVar
13+
14+
15+
class ScalarColumnTypeGroup(ModelSimple):
16+
"""
17+
The type of column present for groups.
18+
19+
:param value: If omitted defaults to "group". Must be one of ["group"].
20+
:type value: str
21+
"""
22+
23+
allowed_values = {
24+
"group",
25+
}
26+
GROUP: ClassVar["ScalarColumnTypeGroup"]
27+
28+
@cached_property
29+
def openapi_types(_):
30+
return {
31+
"value": (str,),
32+
}
33+
34+
35+
ScalarColumnTypeGroup.GROUP = ScalarColumnTypeGroup("group")
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
2+
# This product includes software developed at Datadog (https://www.datadoghq.com/).
3+
# Copyright 2019-Present Datadog, Inc.
4+
from __future__ import annotations
5+
6+
7+
from datadog_api_client.model_utils import (
8+
ModelSimple,
9+
cached_property,
10+
)
11+
12+
from typing import ClassVar
13+
14+
15+
class ScalarColumnTypeNumber(ModelSimple):
16+
"""
17+
The type of column present for numbers.
18+
19+
:param value: If omitted defaults to "number". Must be one of ["number"].
20+
:type value: str
21+
"""
22+
23+
allowed_values = {
24+
"number",
25+
}
26+
NUMBER: ClassVar["ScalarColumnTypeNumber"]
27+
28+
@cached_property
29+
def openapi_types(_):
30+
return {
31+
"value": (str,),
32+
}
33+
34+
35+
ScalarColumnTypeNumber.NUMBER = ScalarColumnTypeNumber("number")

src/datadog_api_client/v2/model/scalar_meta.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ def openapi_types(_):
2424
from datadog_api_client.v2.model.unit import Unit
2525

2626
return {
27-
"unit": ([Unit, none_type],),
27+
"unit": ([Unit, none_type], none_type),
2828
}
2929

3030
attribute_map = {
3131
"unit": "unit",
3232
}
3333

34-
def __init__(self_, unit: Union[List[Unit], UnsetType] = unset, **kwargs):
34+
def __init__(self_, unit: Union[List[Unit], none_type, UnsetType] = unset, **kwargs):
3535
"""
3636
Metadata for the resulting numerical values.
3737
3838
:param unit: Detailed information about the unit.
3939
First element describes the "primary unit" (for example, ``bytes`` in ``bytes per second`` ).
4040
The second element describes the "per unit" (for example, ``second`` in ``bytes per second`` ).
4141
If the second element is not present, the API returns null.
42-
:type unit: [Unit, none_type], optional
42+
:type unit: [Unit, none_type], none_type, optional
4343
"""
4444
if unit is not unset:
4545
kwargs["unit"] = unit

src/datadog_api_client/v2/models/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,8 @@
886886
from datadog_api_client.v2.model.saml_assertion_attribute_attributes import SAMLAssertionAttributeAttributes
887887
from datadog_api_client.v2.model.saml_assertion_attributes_type import SAMLAssertionAttributesType
888888
from datadog_api_client.v2.model.scalar_column import ScalarColumn
889+
from datadog_api_client.v2.model.scalar_column_type_group import ScalarColumnTypeGroup
890+
from datadog_api_client.v2.model.scalar_column_type_number import ScalarColumnTypeNumber
889891
from datadog_api_client.v2.model.scalar_formula_query_request import ScalarFormulaQueryRequest
890892
from datadog_api_client.v2.model.scalar_formula_query_response import ScalarFormulaQueryResponse
891893
from datadog_api_client.v2.model.scalar_formula_request import ScalarFormulaRequest
@@ -2119,6 +2121,8 @@
21192121
"SAMLAssertionAttributeAttributes",
21202122
"SAMLAssertionAttributesType",
21212123
"ScalarColumn",
2124+
"ScalarColumnTypeGroup",
2125+
"ScalarColumnTypeNumber",
21222126
"ScalarFormulaQueryRequest",
21232127
"ScalarFormulaQueryResponse",
21242128
"ScalarFormulaRequest",

0 commit comments

Comments
 (0)