Skip to content

Commit 907b364

Browse files
si-23si-23
committed
cmk-graphing-engine: rename *_api -> *_v1/*_v2_unstable
Change-Id: If889162a09c886a559d90804129dd4550d7de218
1 parent 9bad6c5 commit 907b364

2 files changed

Lines changed: 115 additions & 117 deletions

File tree

‎packages/cmk-graphing-engine/cmk/graphing_engine/_from_api.py‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from collections.abc import Callable
77
from typing import assert_never
88

9-
from cmk.graphing.v1 import graphs as graphs_api
10-
from cmk.graphing.v1 import metrics as metrics_api
11-
from cmk.graphing.v2_unstable import metrics as metrics_v2_api
9+
from cmk.graphing.v1 import graphs as graphs_v1
10+
from cmk.graphing.v1 import metrics as metrics_v1
11+
from cmk.graphing.v2_unstable import metrics as metrics_v2_unstable
1212

1313
from ._objects import (
1414
AutoPrecision,
@@ -44,80 +44,80 @@
4444

4545
type _ApiQuantity = (
4646
str
47-
| metrics_api.Constant
48-
| metrics_api.WarningOf
49-
| metrics_api.CriticalOf
50-
| metrics_api.MinimumOf
51-
| metrics_api.MaximumOf
52-
| metrics_api.Sum
53-
| metrics_api.Product
54-
| metrics_api.Difference
55-
| metrics_api.Fraction
47+
| metrics_v1.Constant
48+
| metrics_v1.WarningOf
49+
| metrics_v1.CriticalOf
50+
| metrics_v1.MinimumOf
51+
| metrics_v1.MaximumOf
52+
| metrics_v1.Sum
53+
| metrics_v1.Product
54+
| metrics_v1.Difference
55+
| metrics_v1.Fraction
5656
)
5757

58-
_COLORS: dict[metrics_api.Color, str] = {
59-
metrics_api.Color.LIGHT_RED: "#f37c7c",
60-
metrics_api.Color.RED: "#ed3b3b",
61-
metrics_api.Color.DARK_RED: "#a82a2a",
62-
metrics_api.Color.LIGHT_ORANGE: "#ffad54",
63-
metrics_api.Color.ORANGE: "#ff8400",
64-
metrics_api.Color.DARK_ORANGE: "#b55e00",
65-
metrics_api.Color.LIGHT_YELLOW: "#ffe456",
66-
metrics_api.Color.YELLOW: "#ffd703",
67-
metrics_api.Color.DARK_YELLOW: "#ac7c02",
68-
metrics_api.Color.LIGHT_GREEN: "#62e0bf",
69-
metrics_api.Color.GREEN: "#15d1a0",
70-
metrics_api.Color.DARK_GREEN: "#0f9472",
71-
metrics_api.Color.LIGHT_BLUE: "#6fc1f7",
72-
metrics_api.Color.BLUE: "#28a2f3",
73-
metrics_api.Color.DARK_BLUE: "#1c73ad",
74-
metrics_api.Color.LIGHT_CYAN: "#68eeee",
75-
metrics_api.Color.CYAN: "#1ee6e6",
76-
metrics_api.Color.DARK_CYAN: "#17b5b5",
77-
metrics_api.Color.LIGHT_PURPLE: "#acaaff",
78-
metrics_api.Color.PURPLE: "#8380ff",
79-
metrics_api.Color.DARK_PURPLE: "#5d5bb5",
80-
metrics_api.Color.LIGHT_PINK: "#f9a8e2",
81-
metrics_api.Color.PINK: "#ec48b6",
82-
metrics_api.Color.DARK_PINK: "#be187a",
83-
metrics_api.Color.LIGHT_BROWN: "#d4ad84",
84-
metrics_api.Color.BROWN: "#bf8548",
85-
metrics_api.Color.DARK_BROWN: "#885e33",
86-
metrics_api.Color.LIGHT_GRAY: "#acacac",
87-
metrics_api.Color.GRAY: "#8c8c8c",
88-
metrics_api.Color.DARK_GRAY: "#5d5d5d",
89-
metrics_api.Color.BLACK: "#1e262e",
90-
metrics_api.Color.WHITE: "#ffffff",
58+
_COLORS: dict[metrics_v1.Color, str] = {
59+
metrics_v1.Color.LIGHT_RED: "#f37c7c",
60+
metrics_v1.Color.RED: "#ed3b3b",
61+
metrics_v1.Color.DARK_RED: "#a82a2a",
62+
metrics_v1.Color.LIGHT_ORANGE: "#ffad54",
63+
metrics_v1.Color.ORANGE: "#ff8400",
64+
metrics_v1.Color.DARK_ORANGE: "#b55e00",
65+
metrics_v1.Color.LIGHT_YELLOW: "#ffe456",
66+
metrics_v1.Color.YELLOW: "#ffd703",
67+
metrics_v1.Color.DARK_YELLOW: "#ac7c02",
68+
metrics_v1.Color.LIGHT_GREEN: "#62e0bf",
69+
metrics_v1.Color.GREEN: "#15d1a0",
70+
metrics_v1.Color.DARK_GREEN: "#0f9472",
71+
metrics_v1.Color.LIGHT_BLUE: "#6fc1f7",
72+
metrics_v1.Color.BLUE: "#28a2f3",
73+
metrics_v1.Color.DARK_BLUE: "#1c73ad",
74+
metrics_v1.Color.LIGHT_CYAN: "#68eeee",
75+
metrics_v1.Color.CYAN: "#1ee6e6",
76+
metrics_v1.Color.DARK_CYAN: "#17b5b5",
77+
metrics_v1.Color.LIGHT_PURPLE: "#acaaff",
78+
metrics_v1.Color.PURPLE: "#8380ff",
79+
metrics_v1.Color.DARK_PURPLE: "#5d5bb5",
80+
metrics_v1.Color.LIGHT_PINK: "#f9a8e2",
81+
metrics_v1.Color.PINK: "#ec48b6",
82+
metrics_v1.Color.DARK_PINK: "#be187a",
83+
metrics_v1.Color.LIGHT_BROWN: "#d4ad84",
84+
metrics_v1.Color.BROWN: "#bf8548",
85+
metrics_v1.Color.DARK_BROWN: "#885e33",
86+
metrics_v1.Color.LIGHT_GRAY: "#acacac",
87+
metrics_v1.Color.GRAY: "#8c8c8c",
88+
metrics_v1.Color.DARK_GRAY: "#5d5d5d",
89+
metrics_v1.Color.BLACK: "#1e262e",
90+
metrics_v1.Color.WHITE: "#ffffff",
9191
}
9292

9393

94-
def _parse_color(color: metrics_api.Color) -> str:
94+
def _parse_color(color: metrics_v1.Color) -> str:
9595
return _COLORS[color]
9696

9797

98-
def _parse_unit(unit: metrics_api.Unit) -> Unit:
98+
def _parse_unit(unit: metrics_v1.Unit) -> Unit:
9999
notation: Notation
100100
match unit.notation:
101-
case metrics_api.DecimalNotation(symbol):
101+
case metrics_v1.DecimalNotation(symbol):
102102
notation = DecimalNotation(symbol)
103-
case metrics_api.SINotation(symbol):
103+
case metrics_v1.SINotation(symbol):
104104
notation = SINotation(symbol)
105-
case metrics_api.IECNotation(symbol):
105+
case metrics_v1.IECNotation(symbol):
106106
notation = IECNotation(symbol)
107-
case metrics_api.StandardScientificNotation(symbol):
107+
case metrics_v1.StandardScientificNotation(symbol):
108108
notation = StandardScientificNotation(symbol)
109-
case metrics_api.EngineeringScientificNotation(symbol):
109+
case metrics_v1.EngineeringScientificNotation(symbol):
110110
notation = EngineeringScientificNotation(symbol)
111-
case metrics_api.TimeNotation():
111+
case metrics_v1.TimeNotation():
112112
notation = TimeNotation()
113113
case _:
114114
assert_never(unit.notation)
115115

116116
precision: Precision
117117
match unit.precision:
118-
case metrics_api.AutoPrecision(digits):
118+
case metrics_v1.AutoPrecision(digits):
119119
precision = AutoPrecision(digits)
120-
case metrics_api.StrictPrecision(digits):
120+
case metrics_v1.StrictPrecision(digits):
121121
precision = StrictPrecision(digits)
122122
case _:
123123
assert_never(unit.precision)
@@ -132,52 +132,52 @@ def _parse_quantity(
132132
match quantity:
133133
case str():
134134
return MetricName(quantity)
135-
case metrics_api.Constant():
135+
case metrics_v1.Constant():
136136
return Constant(
137137
title=quantity.title.localize(localizer),
138138
unit=_parse_unit(quantity.unit),
139139
color=_parse_color(quantity.color),
140140
value=quantity.value,
141141
)
142-
case metrics_v2_api.LowerWarningOf():
142+
case metrics_v2_unstable.LowerWarningOf():
143143
return LowerWarningOf(metric_name=MetricName(quantity.metric_name))
144-
case metrics_v2_api.LowerCriticalOf():
144+
case metrics_v2_unstable.LowerCriticalOf():
145145
return LowerCriticalOf(metric_name=MetricName(quantity.metric_name))
146-
case metrics_api.WarningOf():
146+
case metrics_v1.WarningOf():
147147
return WarningOf(metric_name=MetricName(quantity.metric_name))
148-
case metrics_api.CriticalOf():
148+
case metrics_v1.CriticalOf():
149149
return CriticalOf(metric_name=MetricName(quantity.metric_name))
150-
case metrics_api.MinimumOf():
150+
case metrics_v1.MinimumOf():
151151
return MinimumOf(
152152
metric_name=MetricName(quantity.metric_name),
153153
color=_parse_color(quantity.color),
154154
)
155-
case metrics_api.MaximumOf():
155+
case metrics_v1.MaximumOf():
156156
return MaximumOf(
157157
metric_name=MetricName(quantity.metric_name),
158158
color=_parse_color(quantity.color),
159159
)
160-
case metrics_api.Sum():
160+
case metrics_v1.Sum():
161161
return Sum(
162162
title=quantity.title.localize(localizer),
163163
color=_parse_color(quantity.color),
164164
summands=[_parse_quantity(s, localizer) for s in quantity.summands],
165165
)
166-
case metrics_api.Product():
166+
case metrics_v1.Product():
167167
return Product(
168168
title=quantity.title.localize(localizer),
169169
unit=_parse_unit(quantity.unit),
170170
color=_parse_color(quantity.color),
171171
factors=[_parse_quantity(f, localizer) for f in quantity.factors],
172172
)
173-
case metrics_api.Difference():
173+
case metrics_v1.Difference():
174174
return Difference(
175175
title=quantity.title.localize(localizer),
176176
color=_parse_color(quantity.color),
177177
minuend=_parse_quantity(quantity.minuend, localizer),
178178
subtrahend=_parse_quantity(quantity.subtrahend, localizer),
179179
)
180-
case metrics_api.Fraction():
180+
case metrics_v1.Fraction():
181181
return Fraction(
182182
title=quantity.title.localize(localizer),
183183
unit=_parse_unit(quantity.unit),
@@ -199,7 +199,7 @@ def _parse_bound(
199199

200200

201201
def _parse_minimal_range(
202-
minimal_range: graphs_api.MinimalRange,
202+
minimal_range: graphs_v1.MinimalRange,
203203
localizer: Callable[[str], str],
204204
) -> MinimalRange:
205205
return MinimalRange(
@@ -208,7 +208,7 @@ def _parse_minimal_range(
208208
)
209209

210210

211-
def _parse_graph(graph: graphs_api.Graph, localizer: Callable[[str], str]) -> Graph:
211+
def _parse_graph(graph: graphs_v1.Graph, localizer: Callable[[str], str]) -> Graph:
212212
return Graph(
213213
name=graph.name,
214214
title=graph.title.localize(localizer),
@@ -229,13 +229,13 @@ def _parse_graph(graph: graphs_api.Graph, localizer: Callable[[str], str]) -> Gr
229229

230230

231231
def parse_graph_from_api(
232-
graph: graphs_api.Graph | graphs_api.Bidirectional,
232+
graph: graphs_v1.Graph | graphs_v1.Bidirectional,
233233
localizer: Callable[[str], str],
234234
) -> Graph | Bidirectional:
235235
match graph:
236-
case graphs_api.Graph():
236+
case graphs_v1.Graph():
237237
return _parse_graph(graph, localizer)
238-
case graphs_api.Bidirectional():
238+
case graphs_v1.Bidirectional():
239239
return Bidirectional(
240240
name=graph.name,
241241
title=graph.title.localize(localizer),

0 commit comments

Comments
 (0)