ucloud-sdk-python3 0.11.121__tar.gz → 0.11.122__tar.gz

{ucloud_sdk_python3-0.11.121 → ucloud_sdk_python3-0.11.122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.121
+Version: 0.11.122
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest>=4.6; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: black; extra == "dev"
 Requires-Dist: requests_mock; extra == "dev"
 Requires-Dist: flake8>=3.6.0; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: black; extra == "dev"
 Requires-Dist: requests; extra == "dev"
+Requires-Dist: pytest>=4.6; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: pytest-cov; extra == "ci"
-Requires-Dist: pytest>=4.6; extra == "ci"
-Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: requests_mock; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: requests; extra == "ci"
+Requires-Dist: pytest>=4.6; extra == "ci"
+Requires-Dist: pytest-cov; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

ucloud_sdk_python3-0.11.122/ucloud/version.py

@@ -0,0 +1 @@
+version = "0.11.122"

{ucloud_sdk_python3-0.11.121 → ucloud_sdk_python3-0.11.122}/ucloud_sdk_python3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.121
+Version: 0.11.122
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest>=4.6; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: black; extra == "dev"
 Requires-Dist: requests_mock; extra == "dev"
 Requires-Dist: flake8>=3.6.0; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: black; extra == "dev"
 Requires-Dist: requests; extra == "dev"
+Requires-Dist: pytest>=4.6; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: pytest-cov; extra == "ci"
-Requires-Dist: pytest>=4.6; extra == "ci"
-Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: requests_mock; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: requests; extra == "ci"
+Requires-Dist: pytest>=4.6; extra == "ci"
+Requires-Dist: pytest-cov; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

ucloud_sdk_python3-0.11.121/ucloud/version.py

@@ -1 +0,0 @@
-version = "0.11.121"

{ucloud_sdk_python3-0.11.121 → ucloud_sdk_python3-0.11.122}/ucloud/services/cloudwatch/client.py

@@ -270,12 +270,6 @@ class CloudWatchClient(Client):
 
         **Response Model**
 
-        **ConversionRule**
-        - **ConversionFactor** (int) - 转换因子
-        - **From** (str) - 来源
-        - **To** (str) - 目标
-
-
         **MetricUnit**
         - **ConversionFactor** (int) - 转换因子
         - **CreatedAt** (str) - 创建时间
@@ -308,6 +302,12 @@ class CloudWatchClient(Client):
         - **UpdatedBy** (str) - 修改者
 
 
+        **ConversionRule**
+        - **ConversionFactor** (int) - 转换因子
+        - **From** (str) - 来源
+        - **To** (str) - 目标
+
+
         **MetricUnitConfig**
         - **ConversionFactor** (int) - 转换因子
         - **ConversionRules** (list) - 见 **ConversionRule** 模型定义
@@ -727,11 +727,6 @@ class CloudWatchClient(Client):
 
         **Response Model**
 
-        **ResourceExtendAttrItem**
-        - **Key** (str) - 键
-        - **Value** (str) - 值
-
-
         **LabelAttrItem**
         - **Key** (str) - 键
         - **Value** (str) - 值
@@ -758,6 +753,11 @@ class CloudWatchClient(Client):
         - **MetricValues** (list) - 见 **MetricSingleSample** 模型定义
 
 
+        **ResourceExtendAttrItem**
+        - **Key** (str) - 键
+        - **Value** (str) - 值
+
+
         **ResourceSummary**
         - **CompanyId** (int) - 公司id
         - **LabelAttrList** (list) - 见 **LabelAttrItem** 模型定义

{ucloud_sdk_python3-0.11.121 → ucloud_sdk_python3-0.11.122}/ucloud/services/cloudwatch/schemas/models.py

@@ -48,6 +48,31 @@ class GetMetricDataAggregationMethodRespSchema(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 - 指标单位配置"""
+
+    fields = {
+        "ConversionFactor": fields.Int(
+            required=False, load_from="ConversionFactor"
+        ),
+        "ConversionRules": fields.List(ConversionRuleSchema()),
+        "UnitCnNames": fields.List(fields.Str()),
+        "UnitEnNames": fields.List(fields.Str()),
+    }
+
+
 class MetricUnitSchema(schema.ResponseSchema):
     """MetricUnit - 指标单位"""
 
@@ -90,31 +115,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 - 指标单位配置"""
-
-    fields = {
-        "ConversionFactor": fields.Int(
-            required=False, load_from="ConversionFactor"
-        ),
-        "ConversionRules": fields.List(ConversionRuleSchema()),
-        "UnitCnNames": fields.List(fields.Str()),
-        "UnitEnNames": fields.List(fields.Str()),
-    }
-
-
 class GetProductMetricsRespDataSchema(schema.ResponseSchema):
     """GetProductMetricsRespData - 产品指标查询结果"""
 
@@ -261,12 +261,12 @@ class ListMonitorProductSchema(schema.ResponseSchema):
     }
 
 
-class MetricSampleSchema(schema.ResponseSchema):
-    """MetricSample - 指标数据点（代码结构体：MetricPoint）"""
+class TagEntrySchema(schema.ResponseSchema):
+    """TagEntry - 标签条目"""
 
     fields = {
-        "Timestamp": fields.Int(required=False, load_from="Timestamp"),
-        "Value": fields.Float(required=False, load_from="Value"),
+        "KeyList": fields.List(fields.Str()),
+        "TagName": fields.Str(required=False, load_from="TagName"),
     }
 
 
@@ -279,6 +279,15 @@ class TagListItemSchema(schema.ResponseSchema):
     }
 
 
+class MetricSampleSchema(schema.ResponseSchema):
+    """MetricSample - 指标数据点（代码结构体：MetricPoint）"""
+
+    fields = {
+        "Timestamp": fields.Int(required=False, load_from="Timestamp"),
+        "Value": fields.Float(required=False, load_from="Value"),
+    }
+
+
 class MetricResultSchema(schema.ResponseSchema):
     """MetricResult - 单条时间序列的结果（代码结构体：MetricValues）"""
 
@@ -290,15 +299,6 @@ class MetricResultSchema(schema.ResponseSchema):
     }
 
 
-class TagEntrySchema(schema.ResponseSchema):
-    """TagEntry - 标签条目"""
-
-    fields = {
-        "KeyList": fields.List(fields.Str()),
-        "TagName": fields.Str(required=False, load_from="TagName"),
-    }
-
-
 class QueryMetricDataRespItemSchema(schema.ResponseSchema):
     """QueryMetricDataRespItem - 单个监控指标的查询结果"""
 
@@ -320,40 +320,40 @@ class QueryMetricDataRespSchema(schema.ResponseSchema):
     }
 
 
-class MetricSingleSampleSchema(schema.ResponseSchema):
-    """MetricSingleSample - 指标单个样本点结果"""
+class LabelAttrItemSchema(schema.ResponseSchema):
+    """LabelAttrItem - 标签扩展属性项"""
 
     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 ResourceExtendAttrItemSchema(schema.ResponseSchema):
+    """ResourceExtendAttrItem - 资源扩展属性项"""
 
     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"),
     }
 
 
-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()),
     }
 
 

{ucloud_sdk_python3-0.11.121 → ucloud_sdk_python3-0.11.122}/ucloud/services/uai_modelverse/client.py

@@ -358,6 +358,16 @@ class UAI_ModelverseClient(Client):
 
         **Response Model**
 
+        **Pricing**
+        - **Completion** (float) - 输出定价
+        - **Currency** (str) - 币种
+        - **Image** (float) - 生图定价
+        - **Prompt** (float) - 提示词定价
+        - **Unit** (str) - 单位（中文），如“次” “百万”
+        - **UnitEn** (str) - 单位（English），如“Time” “Million”
+        - **Video** (str) - 生视频定价
+
+
         **PriceRate**
         - **ChargeItem** (str) - 收费项：input/output/thinking/tool...
         - **ChargeItemDescription** (str) - 收费项描述
@@ -375,16 +385,6 @@ class UAI_ModelverseClient(Client):
         - **Rates** (list) - 见 **PriceRate** 模型定义
 
 
-        **Pricing**
-        - **Completion** (float) - 输出定价
-        - **Currency** (str) - 币种
-        - **Image** (float) - 生图定价
-        - **Prompt** (float) - 提示词定价
-        - **Unit** (str) - 单位（中文），如“次” “百万”
-        - **UnitEn** (str) - 单位（English），如“Time” “Million”
-        - **Video** (str) - 生视频定价
-
-
         **SquareModel**
         - **CreateAt** (int) - 创建时间
         - **Describe** (str) - 详细描述