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
88 changes: 44 additions & 44 deletions ucloud/services/uai_modelverse/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,23 +358,15 @@ def get_uf_square_model_detail(

**Response Model**

**InferenceRegionInfo**
- **ModelId** (str) - 地域模型ID (例如: deepseek-v4-flash-sg)
- **RegionCode** (str) - 地域代码: sg(新加坡)/us(美国)/hk(香港)
- **RegionName** (str) - 地域名称: 新加坡/美国/香港
- **RegionNameEn** (str) - 地域名称(英文): Singapore/United States/Hong Kong
- **SquareModelId** (str) - 广场模型ID (umodel-xxx)
- **Status** (str) - 状态: published(已发布)/unpublished(未发布)


**ModelTypeMap**
- **ImageToImage** (bool) - 图生图模型
- **ImageToVideo** (bool) - 图生视频模型
- **Inference** (bool) - 微调模型
- **Sensitive** (bool) - 海外模型
- **TextGeneration** (bool) - 文生文模型,true 表示是文生文模型,下同
- **TextToImage** (bool) - 文生图模型
- **TextToVideo** (bool) - 文生视频模型
**ModelCapabilities**
- **BatchInference** (bool) - 是否支持批量推理
- **ContextCaching** (bool) - 是否支持上下文缓存
- **Experience** (bool) - 是否支持体验
- **FunctionCall** (bool) - 是否支持函数调用
- **KnowledgeBase** (bool) - 是否支持知识库
- **Mcp** (bool) - 是否支持MCP
- **StructuredOutput** (bool) - 是否支持结构化输出
- **WebSearch** (bool) - 是否支持联网搜索


**Pricing**
Expand All @@ -387,6 +379,16 @@ def get_uf_square_model_detail(
- **Video** (str) - 生视频定价


**ModelTypeMap**
- **ImageToImage** (bool) - 图生图模型
- **ImageToVideo** (bool) - 图生视频模型
- **Inference** (bool) - 微调模型
- **Sensitive** (bool) - 海外模型
- **TextGeneration** (bool) - 文生文模型,true 表示是文生文模型,下同
- **TextToImage** (bool) - 文生图模型
- **TextToVideo** (bool) - 文生视频模型


**PriceRate**
- **ChargeItem** (str) - 收费项:input/output/thinking/tool...
- **ChargeItemDescription** (str) - 收费项描述
Expand All @@ -397,22 +399,13 @@ def get_uf_square_model_detail(
- **UnitEn** (str) - 计价单位英文


**ApiProtocols**
- **Anthropic** (bool) - 是否支持Anthropic协议
- **ChatCompletions** (bool) - 是否支持chat协议
- **Gemini** (bool) - 是否支持gemini协议
- **Responses** (bool) - 是否支持responses协议


**ModelCapabilities**
- **BatchInference** (bool) - 是否支持批量推理
- **ContextCaching** (bool) - 是否支持上下文缓存
- **Experience** (bool) - 是否支持体验
- **FunctionCall** (bool) - 是否支持函数调用
- **KnowledgeBase** (bool) - 是否支持知识库
- **Mcp** (bool) - 是否支持MCP
- **StructuredOutput** (bool) - 是否支持结构化输出
- **WebSearch** (bool) - 是否支持联网搜索
**InferenceRegionInfo**
- **ModelId** (str) - 地域模型ID (例如: deepseek-v4-flash-sg)
- **RegionCode** (str) - 地域代码: sg(新加坡)/us(美国)/hk(香港)
- **RegionName** (str) - 地域名称: 新加坡/美国/香港
- **RegionNameEn** (str) - 地域名称(英文): Singapore/United States/Hong Kong
- **SquareModelId** (str) - 广场模型ID (umodel-xxx)
- **Status** (str) - 状态: published(已发布)/unpublished(未发布)


**PriceTier**
Expand All @@ -422,6 +415,13 @@ def get_uf_square_model_detail(
- **Rates** (list) - 见 **PriceRate** 模型定义


**ApiProtocols**
- **Anthropic** (bool) - 是否支持Anthropic协议
- **ChatCompletions** (bool) - 是否支持chat协议
- **Gemini** (bool) - 是否支持gemini协议
- **Responses** (bool) - 是否支持responses协议


**SquareModel**
- **ApiProtocols** (dict) - 见 **ApiProtocols** 模型定义
- **BatchName** (str) - 关联的 batch 模型名称
Expand Down Expand Up @@ -492,7 +492,7 @@ def get_uf_square_model_prices(
- **ChargeItemDescription** (str) - 收费项描述
- **ChargeItemDescriptionEn** (str) - 收费项描述英文描述
- **Currency** (str) - 货币单位
- **Price** (str) - 价格
- **Price** (int) - 价格
- **Unit** (str) - 计价单位
- **UnitEn** (str) - 计价单位英文

Expand Down Expand Up @@ -842,16 +842,6 @@ def list_uf_square_model(

**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 @@ -862,6 +852,16 @@ def list_uf_square_model(
- **UnitEn** (str) - 计价单位英文


**Pricing**
- **Completion** (float) - 输出定价
- **Currency** (str) - 币种
- **Image** (float) - 生图定价
- **Prompt** (float) - 提示词定价
- **Unit** (str) - 单位(中文),如“次” “百万”
- **UnitEn** (str) - 单位(English),如“Time” “Million”
- **Video** (str) - 生视频定价


**PriceTier**
- **Condition** (str) - 档位/条件(例如 "32k"、"128k")
- **Description** (str) - 档位描述(例如 "标准上下文 32k")
Expand Down
72 changes: 36 additions & 36 deletions ucloud/services/uai_modelverse/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,35 +74,6 @@ class FilterOptionStringSchema(schema.ResponseSchema):
}


class PriceRateSchema(schema.ResponseSchema):
"""PriceRate - 该档位下的收费列表(有序数组)"""

fields = {
"ChargeItem": fields.Str(required=False, load_from="ChargeItem"),
"ChargeItemDescription": fields.Str(
required=False, load_from="ChargeItemDescription"
),
"ChargeItemDescriptionEn": fields.Str(
required=True, load_from="ChargeItemDescriptionEn"
),
"Currency": fields.Str(required=True, load_from="Currency"),
"Price": fields.Str(required=False, load_from="Price"),
"Unit": fields.Str(required=True, load_from="Unit"),
"UnitEn": fields.Str(required=True, load_from="UnitEn"),
}


class PriceTierSchema(schema.ResponseSchema):
"""PriceTier - 价格阶梯"""

fields = {
"Condition": fields.Str(required=False, load_from="Condition"),
"Description": fields.Str(required=False, load_from="Description"),
"DescriptionEn": fields.Str(required=True, load_from="DescriptionEn"),
"Rates": fields.List(PriceRateSchema()),
}


class ModelTypeMapSchema(schema.ResponseSchema):
"""ModelTypeMap - ModelTypeMap"""

Expand Down Expand Up @@ -133,16 +104,21 @@ class PricingSchema(schema.ResponseSchema):
}


class ApiProtocolsSchema(schema.ResponseSchema):
"""ApiProtocols - ApiProtocols"""
class PriceRateSchema(schema.ResponseSchema):
"""PriceRate - 该档位下的收费列表(有序数组)"""

fields = {
"Anthropic": fields.Bool(required=False, load_from="Anthropic"),
"ChatCompletions": fields.Bool(
required=False, load_from="ChatCompletions"
"ChargeItem": fields.Str(required=False, load_from="ChargeItem"),
"ChargeItemDescription": fields.Str(
required=False, load_from="ChargeItemDescription"
),
"Gemini": fields.Bool(required=False, load_from="Gemini"),
"Responses": fields.Bool(required=False, load_from="Responses"),
"ChargeItemDescriptionEn": fields.Str(
required=True, load_from="ChargeItemDescriptionEn"
),
"Currency": fields.Str(required=True, load_from="Currency"),
"Price": fields.Str(required=False, load_from="Price"),
"Unit": fields.Str(required=True, load_from="Unit"),
"UnitEn": fields.Str(required=True, load_from="UnitEn"),
}


Expand All @@ -167,6 +143,19 @@ class ModelCapabilitiesSchema(schema.ResponseSchema):
}


class ApiProtocolsSchema(schema.ResponseSchema):
"""ApiProtocols - ApiProtocols"""

fields = {
"Anthropic": fields.Bool(required=False, load_from="Anthropic"),
"ChatCompletions": fields.Bool(
required=False, load_from="ChatCompletions"
),
"Gemini": fields.Bool(required=False, load_from="Gemini"),
"Responses": fields.Bool(required=False, load_from="Responses"),
}


class InferenceRegionInfoSchema(schema.ResponseSchema):
"""InferenceRegionInfo - 地域推理模型信息"""

Expand All @@ -180,6 +169,17 @@ class InferenceRegionInfoSchema(schema.ResponseSchema):
}


class PriceTierSchema(schema.ResponseSchema):
"""PriceTier - 价格阶梯"""

fields = {
"Condition": fields.Str(required=False, load_from="Condition"),
"Description": fields.Str(required=False, load_from="Description"),
"DescriptionEn": fields.Str(required=True, load_from="DescriptionEn"),
"Rates": fields.List(PriceRateSchema()),
}


class SquareModelSchema(schema.ResponseSchema):
"""SquareModel - 广场模型"""

Expand Down
34 changes: 17 additions & 17 deletions ucloud/services/vpc/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1590,12 +1590,6 @@ def describe_natgw(

**Response Model**

**NatGatewaySubnetSet**
- **Subnet** (str) - 子网网段
- **SubnetName** (str) - 子网名字
- **SubnetworkId** (str) - 子网id


**NatGWIPResInfo**
- **EIP** (str) - 外网IP
- **OperatorName** (str) - IP的运营商信息
Expand All @@ -1609,6 +1603,12 @@ def describe_natgw(
- **Weight** (int) - 权重为100的为出口


**NatGatewaySubnetSet**
- **Subnet** (str) - 子网网段
- **SubnetName** (str) - 子网名字
- **SubnetworkId** (str) - 子网id


**NatGatewayDataSet**
- **CreateTime** (int) - natgw创建时间
- **FirewallId** (str) - 绑定的防火墙Id
Expand Down Expand Up @@ -1912,16 +1912,6 @@ def describe_network_interface(

**Response Model**

**UNIIpInfo**
- **IpAddr** (list) - ip 地址
- **IpType** (str) - ip类型 SecondaryIp/PrimaryIp


**FwInfo**
- **Id** (str) - 防火墙资源 ID
- **Name** (str) - 防火墙资源名称


**SimpleIPv6AddressInfo**
- **Attribute** (str) - 属性
- **IPv6Address** (str) - IPv6 地址
Expand All @@ -1939,6 +1929,16 @@ def describe_network_interface(
- **SecGroupId** (str) - 安全组ID


**FwInfo**
- **Id** (str) - 防火墙资源 ID
- **Name** (str) - 防火墙资源名称


**UNIIpInfo**
- **IpAddr** (list) - ip 地址
- **IpType** (str) - ip类型 SecondaryIp/PrimaryIp


**NetworkInterface**
- **AttachInstanceId** (str) - 绑定实例资源ID
- **CreateTime** (int) - 创建时间
Expand Down Expand Up @@ -3446,7 +3446,7 @@ def update_sec_group(

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
- **SecGroupId** (str) - (Required) 安全组资源ID数组。不支持 .n 格式。Type 为 string 数组。
- **SecGroupId** (list) - (Required) 安全组资源ID数组。不支持 .n 格式。Type 为 string 数组。
- **Name** (str) - 安全组名称,默认为空,为空则不做修改。Name,Tag,Remark必须填写1个及以上
- **Remark** (str) - 安全组备注,默认为空,为空则不做修改。Name,Tag,Remark必须填写1个及以上

Expand Down
2 changes: 1 addition & 1 deletion ucloud/services/vpc/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -2704,7 +2704,7 @@ class UpdateSecGroupRequestSchema(schema.RequestSchema):
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
"Region": fields.Str(required=True, dump_to="Region"),
"Remark": fields.Str(required=False, dump_to="Remark"),
"SecGroupId": fields.Str(required=True, dump_to="SecGroupId"),
"SecGroupId": fields.List(fields.Str()),
}


Expand Down
Loading
Loading