sdk: rolling update for 0.11.124

ucloud/services/cloudwatch/client.py

@@ -270,19 +270,6 @@ def get_product_metrics(
 
         **Response Model**
 
-        **ConversionRule**
-        - **ConversionFactor** (int) - 转换因子
-        - **From** (str) - 来源
-        - **To** (str) - 目标
-
-
-        **MetricUnitConfig**
-        - **ConversionFactor** (int) - 转换因子
-        - **ConversionRules** (list) - 见 **ConversionRule** 模型定义
-        - **UnitCnNames** (list) - 指标中文名列表
-        - **UnitEnNames** (list) - 指标英文名列表
-
-
         **MetricUnit**
         - **ConversionFactor** (int) - 转换因子
         - **CreatedAt** (str) - 创建时间
@@ -315,6 +302,19 @@ def get_product_metrics(
         - **UpdatedBy** (str) - 修改者
 
 
+        **ConversionRule**
+        - **ConversionFactor** (int) - 转换因子
+        - **From** (str) - 来源
+        - **To** (str) - 目标
+
+
+        **MetricUnitConfig**
+        - **ConversionFactor** (int) - 转换因子
+        - **ConversionRules** (list) - 见 **ConversionRule** 模型定义
+        - **UnitCnNames** (list) - 指标中文名列表
+        - **UnitEnNames** (list) - 指标英文名列表
+
+
         **GetProductMetricsRespData**
         - **List** (list) - 见 **Metirc** 模型定义
         - **Total** (int) - 查询结果总数
@@ -661,16 +661,16 @@ def query_metric_data_set(
         - **TagName** (str) - 标签名称
 
 
-        **MetricSample**
-        - **Timestamp** (int) - 时间戳
-        - **Value** (float) - 样本值
-
-
         **TagListItem**
         - **Tag** (str) - 标签名
         - **TagValue** (str) - 标签值
 
 
+        **MetricSample**
+        - **Timestamp** (int) - 时间戳
+        - **Value** (float) - 样本值
+
+
         **MetricResult**
         - **ResourceId** (str) - 资源的短id
         - **ResourceName** (str) - 资源名称

ucloud/services/cloudwatch/schemas/models.py

@@ -68,6 +68,18 @@ class MetricUnitSchema(schema.ResponseSchema):
     }
 
 
+class ConversionRuleSchema(schema.ResponseSchema):
+    """ConversionRule - 指标单位转换规则"""
+
+    fields = {
+        "ConversionFactor": fields.Int(
+            required=False, load_from="ConversionFactor"
+        ),
+        "From": fields.Str(required=False, load_from="From"),
+        "To": fields.Str(required=False, load_from="To"),
+    }
+
+
 class MetircSchema(schema.ResponseSchema):
     """Metirc - 指标"""
 
@@ -90,18 +102,6 @@ class MetircSchema(schema.ResponseSchema):
     }
 
 
-class ConversionRuleSchema(schema.ResponseSchema):
-    """ConversionRule - 指标单位转换规则"""
-
-    fields = {
-        "ConversionFactor": fields.Int(
-            required=False, load_from="ConversionFactor"
-        ),
-        "From": fields.Str(required=False, load_from="From"),
-        "To": fields.Str(required=False, load_from="To"),
-    }
-
-
 class MetricUnitConfigSchema(schema.ResponseSchema):
     """MetricUnitConfig - 指标单位配置"""
 
@@ -261,21 +261,21 @@ class ListMonitorProductSchema(schema.ResponseSchema):
     }
 
 
-class TagListItemSchema(schema.ResponseSchema):
-    """TagListItem - 标签键值项"""
+class MetricSampleSchema(schema.ResponseSchema):
+    """MetricSample - 指标数据点（代码结构体：MetricPoint）"""
 
     fields = {
-        "Tag": fields.Str(required=False, load_from="Tag"),
-        "TagValue": fields.Str(required=False, load_from="TagValue"),
+        "Timestamp": fields.Int(required=False, load_from="Timestamp"),
+        "Value": fields.Float(required=False, load_from="Value"),
     }
 
 
-class MetricSampleSchema(schema.ResponseSchema):
-    """MetricSample - 指标数据点（代码结构体：MetricPoint）"""
+class TagListItemSchema(schema.ResponseSchema):
+    """TagListItem - 标签键值项"""
 
     fields = {
-        "Timestamp": fields.Int(required=False, load_from="Timestamp"),
-        "Value": fields.Float(required=False, load_from="Value"),
+        "Tag": fields.Str(required=False, load_from="Tag"),
+        "TagValue": fields.Str(required=False, load_from="TagValue"),
     }
 
 
@@ -320,40 +320,40 @@ class QueryMetricDataRespSchema(schema.ResponseSchema):
     }
 
 
-class ResourceExtendAttrItemSchema(schema.ResponseSchema):
-    """ResourceExtendAttrItem - 资源扩展属性项"""
+class MetricSingleSampleSchema(schema.ResponseSchema):
+    """MetricSingleSample - 指标单个样本点结果"""
 
     fields = {
-        "Key": fields.Str(required=False, load_from="Key"),
-        "Value": fields.Str(required=False, load_from="Value"),
+        "Metric": fields.Str(required=False, load_from="Metric"),
+        "TagsList": fields.List(TagListItemSchema()),
+        "Value": MetricSampleSchema(),
     }
 
 
-class LabelAttrItemSchema(schema.ResponseSchema):
-    """LabelAttrItem - 标签扩展属性项"""
+class ResourceMonitorItemSchema(schema.ResponseSchema):
+    """ResourceMonitorItem - 资源监控的单个指标数据"""
 
     fields = {
-        "Key": fields.Str(required=False, load_from="Key"),
-        "Value": fields.Str(required=False, load_from="Value"),
+        "Metric": fields.Str(required=False, load_from="Metric"),
+        "MetricValues": fields.List(MetricSingleSampleSchema()),
     }
 
 
-class MetricSingleSampleSchema(schema.ResponseSchema):
-    """MetricSingleSample - 指标单个样本点结果"""
+class ResourceExtendAttrItemSchema(schema.ResponseSchema):
+    """ResourceExtendAttrItem - 资源扩展属性项"""
 
     fields = {
-        "Metric": fields.Str(required=False, load_from="Metric"),
-        "TagsList": fields.List(TagListItemSchema()),
-        "Value": MetricSampleSchema(),
+        "Key": fields.Str(required=False, load_from="Key"),
+        "Value": fields.Str(required=False, load_from="Value"),
     }
 
 
-class ResourceMonitorItemSchema(schema.ResponseSchema):
-    """ResourceMonitorItem - 资源监控的单个指标数据"""
+class LabelAttrItemSchema(schema.ResponseSchema):
+    """LabelAttrItem - 标签扩展属性项"""
 
     fields = {
-        "Metric": fields.Str(required=False, load_from="Metric"),
-        "MetricValues": fields.List(MetricSingleSampleSchema()),
+        "Key": fields.Str(required=False, load_from="Key"),
+        "Value": fields.Str(required=False, load_from="Value"),
     }