Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ucloud/services/cloudwatch/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,6 @@ def get_product_metrics(

**Response Model**

**ConversionRule**
- **ConversionFactor** (int) - 转换因子
- **From** (str) - 来源
- **To** (str) - 目标


**MetricUnit**
- **ConversionFactor** (int) - 转换因子
- **CreatedAt** (str) - 创建时间
Expand Down Expand Up @@ -308,6 +302,12 @@ def get_product_metrics(
- **UpdatedBy** (str) - 修改者


**ConversionRule**
- **ConversionFactor** (int) - 转换因子
- **From** (str) - 来源
- **To** (str) - 目标


**MetricUnitConfig**
- **ConversionFactor** (int) - 转换因子
- **ConversionRules** (list) - 见 **ConversionRule** 模型定义
Expand Down Expand Up @@ -727,11 +727,6 @@ def query_metric_data_summary(

**Response Model**

**ResourceExtendAttrItem**
- **Key** (str) - 键
- **Value** (str) - 值


**LabelAttrItem**
- **Key** (str) - 键
- **Value** (str) - 值
Expand All @@ -758,6 +753,11 @@ def query_metric_data_summary(
- **MetricValues** (list) - 见 **MetricSingleSample** 模型定义


**ResourceExtendAttrItem**
- **Key** (str) - 键
- **Value** (str) - 值


**ResourceSummary**
- **CompanyId** (int) - 公司id
- **LabelAttrList** (list) - 见 **LabelAttrItem** 模型定义
Expand Down
110 changes: 55 additions & 55 deletions ucloud/services/cloudwatch/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 - 指标单位"""

Expand Down Expand Up @@ -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 - 产品指标查询结果"""

Expand Down Expand Up @@ -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"),
}


Expand All @@ -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)"""

Expand All @@ -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 - 单个监控指标的查询结果"""

Expand All @@ -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()),
}


Expand Down
20 changes: 10 additions & 10 deletions ucloud/services/uai_modelverse/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,16 @@ def get_uf_square_model_detail(

**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) - 收费项描述
Expand All @@ -375,16 +385,6 @@ def get_uf_square_model_detail(
- **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) - 详细描述
Expand Down
22 changes: 11 additions & 11 deletions ucloud/services/uai_modelverse/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,17 +350,6 @@ class OrderItemDetailSchema(schema.ResponseSchema):
}


class RequestLogSummarySchema(schema.ResponseSchema):
"""RequestLogSummary - 请求日志汇总"""

fields = {
"FailedRequests": fields.Int(
required=False, load_from="FailedRequests"
),
"TotalRequests": fields.Int(required=False, load_from="TotalRequests"),
}


class RequestLogItemSchema(schema.ResponseSchema):
"""RequestLogItem - 请求日志列表项"""

Expand Down Expand Up @@ -409,6 +398,17 @@ class RequestLogItemSchema(schema.ResponseSchema):
}


class RequestLogSummarySchema(schema.ResponseSchema):
"""RequestLogSummary - 请求日志汇总"""

fields = {
"FailedRequests": fields.Int(
required=False, load_from="FailedRequests"
),
"TotalRequests": fields.Int(required=False, load_from="TotalRequests"),
}


class ListUMInferRequestLogsDataSchema(schema.ResponseSchema):
"""ListUMInferRequestLogsData - 日志明细列表返回数据"""

Expand Down
10 changes: 5 additions & 5 deletions ucloud/services/udb/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,11 @@ def describe_mongo_db_sharded_cluster(

**Response Model**

**UFileDataSet**
- **Bucket** (str) -
- **TokenID** (str) -


**UDBSlaveInstanceSet**
- **AdminUser** (str) -
- **BackupBeginTime** (int) -
Expand Down Expand Up @@ -881,11 +886,6 @@ def describe_mongo_db_sharded_cluster(
- **Zone** (str) -


**UFileDataSet**
- **Bucket** (str) -
- **TokenID** (str) -


**UDBInstanceSet**
- **AdminUser** (str) -
- **AutoRenew** (int) -
Expand Down
18 changes: 9 additions & 9 deletions ucloud/services/udb/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
from ucloud.core.typesystem import schema, fields


class UFileDataSetSchema(schema.ResponseSchema):
"""UFileDataSet - 增加ufile的描述"""

fields = {
"Bucket": fields.Str(required=False, load_from="Bucket"),
"TokenID": fields.Str(required=False, load_from="TokenID"),
}


class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
"""UDBSlaveInstanceSet - DescribeUDBSlaveInstance"""

Expand Down Expand Up @@ -73,15 +82,6 @@ class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
}


class UFileDataSetSchema(schema.ResponseSchema):
"""UFileDataSet - 增加ufile的描述"""

fields = {
"Bucket": fields.Str(required=False, load_from="Bucket"),
"TokenID": fields.Str(required=False, load_from="TokenID"),
}


class UDBInstanceSetSchema(schema.ResponseSchema):
"""UDBInstanceSet - DescribeUDBInstance"""

Expand Down
2 changes: 1 addition & 1 deletion ucloud/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "0.11.121"
version = "0.11.122"