From 18660eab907590bc24a4a8abbe55323a421b794c Mon Sep 17 00:00:00 2001 From: ucloud-bot Date: Wed, 8 Jul 2026 03:52:13 +0000 Subject: [PATCH] sdk: rolling update for 0.11.104 --- ucloud/services/ucompshare/client.py | 136 +++++++++--------- ucloud/services/ucompshare/schemas/apis.py | 4 +- ucloud/services/ucompshare/schemas/models.py | 142 +++++++++---------- ucloud/version.py | 2 +- 4 files changed, 142 insertions(+), 142 deletions(-) diff --git a/ucloud/services/ucompshare/client.py b/ucloud/services/ucompshare/client.py index 671d100..7694016 100644 --- a/ucloud/services/ucompshare/client.py +++ b/ucloud/services/ucompshare/client.py @@ -481,15 +481,24 @@ def describe_available_comp_share_instance_types( - **Value** (float) - 值，单位是TFlops - **FeatureModes** - - **MinimalCpuPlatform** (list) - 这个特性必须是列出来的CPU平台及以上的CPU才支持 - - **Name** (str) - 模式|特性名称 - - **RelatedToImageFeature** (list) - 为镜像上支持这个特性的标签。例如DescribeImage返回的字段Features包含HotPlug，说明该镜像支持热升级。 + **BootDiskInfo** + - **Features** (list) - 磁盘可支持的服务 + - **InstantResize** (bool) - 系统盘是否允许扩容，如果是本地盘，则不允许扩容，InstantResize为false。 + - **MaximalSize** (int) - MaximalSize为磁盘最大值 + - **Name** (str) - 系统盘类别，包含普通云盘|CLOUD_NORMAL、SSD云盘|CLOUD_SSD和RSSD云盘|CLOUD_RSSD。普通本地盘只包含普通本地盘|LOCAL_NORMAL一种。SSD本地盘只包含SSD本地盘|LOCAL_SSD一种。 - **Features** - - **Modes** (list) - 见 **FeatureModes** 模型定义 - - **Name** (str) - 可支持的特性名称。目前支持的特性网络增强|NetCapability、热升级|Hotplug + **DataDiskInfo** + - **Features** (list) - 数据盘可支持的服务 + - **MaximalSize** (int) - MaximalSize为磁盘最大值 + - **MinimalSize** (int) - 磁盘最小值，如果没有该字段，最小值取基础镜像Size值即可（linux为20G，windows为40G）。 + - **Name** (str) - 数据盘类别，包含普通云盘|CLOUD_NORMAL、SSD云盘|CLOUD_SSD和RSSD云盘|CLOUD_RSSD。普通本地盘只包含普通本地盘|LOCAL_NORMAL一种。SSD本地盘只包含SSD本地盘|LOCAL_SSD一种。 + + + **Disks** + - **BootDisk** (list) - 见 **BootDiskInfo** 模型定义 + - **DataDisk** (list) - 见 **DataDiskInfo** 模型定义 + - **Name** (str) - 磁盘介质类别信息，磁盘主要分类如下：云盘|cloudDisk、普通本地盘|normalLocalDisk和SSD本地盘|ssdLocalDisk。 **GraphicsMemory** @@ -514,24 +523,15 @@ def describe_available_comp_share_instance_types( - **Intel** (list) - 返回Intel的CPU平台信息，例如：Intel: ['Intel/CascadeLake','Intel/CascadelakeR','Intel/IceLake'] - **BootDiskInfo** - - **Features** (list) - 磁盘可支持的服务 - - **InstantResize** (bool) - 系统盘是否允许扩容，如果是本地盘，则不允许扩容，InstantResize为false。 - - **MaximalSize** (int) - MaximalSize为磁盘最大值 - - **Name** (str) - 系统盘类别，包含普通云盘|CLOUD_NORMAL、SSD云盘|CLOUD_SSD和RSSD云盘|CLOUD_RSSD。普通本地盘只包含普通本地盘|LOCAL_NORMAL一种。SSD本地盘只包含SSD本地盘|LOCAL_SSD一种。 - - - **DataDiskInfo** - - **Features** (list) - 数据盘可支持的服务 - - **MaximalSize** (int) - MaximalSize为磁盘最大值 - - **MinimalSize** (int) - 磁盘最小值，如果没有该字段，最小值取基础镜像Size值即可（linux为20G，windows为40G）。 - - **Name** (str) - 数据盘类别，包含普通云盘|CLOUD_NORMAL、SSD云盘|CLOUD_SSD和RSSD云盘|CLOUD_RSSD。普通本地盘只包含普通本地盘|LOCAL_NORMAL一种。SSD本地盘只包含SSD本地盘|LOCAL_SSD一种。 + **FeatureModes** + - **MinimalCpuPlatform** (list) - 这个特性必须是列出来的CPU平台及以上的CPU才支持 + - **Name** (str) - 模式|特性名称 + - **RelatedToImageFeature** (list) - 为镜像上支持这个特性的标签。例如DescribeImage返回的字段Features包含HotPlug，说明该镜像支持热升级。 - **Disks** - - **BootDisk** (list) - 见 **BootDiskInfo** 模型定义 - - **DataDisk** (list) - 见 **DataDiskInfo** 模型定义 - - **Name** (str) - 磁盘介质类别信息，磁盘主要分类如下：云盘|cloudDisk、普通本地盘|normalLocalDisk和SSD本地盘|ssdLocalDisk。 + **Features** + - **Modes** (list) - 见 **FeatureModes** 模型定义 + - **Name** (str) - 可支持的特性名称。目前支持的特性网络增强|NetCapability、热升级|Hotplug **AvailableInstanceTypes** @@ -670,6 +670,11 @@ def describe_comp_share_custom_images( **Response Model** + **Projects** + - **AccountId** (str) - 账号Id + - **AccountName** (str) - 账号昵称 + + **Software** - **Applications** (list) - 【array of string】应用列表 - **CUDAVersion** (str) - CUDA版本 @@ -677,11 +682,6 @@ def describe_comp_share_custom_images( - **FrameworkVersion** (str) - 框架版本 - **Projects** - - **AccountId** (str) - 账号Id - - **AccountName** (str) - 账号昵称 - - **CompShareImage** - **AuthInfo** (int) - 镜像作者认证信息 - **Author** (str) - 镜像作者昵称 @@ -838,6 +838,11 @@ def describe_comp_share_images( **Response Model** + **Projects** + - **AccountId** (str) - 账号Id + - **AccountName** (str) - 账号昵称 + + **Software** - **Applications** (list) - 【array of string】应用列表 - **CUDAVersion** (str) - CUDA版本 @@ -845,11 +850,6 @@ def describe_comp_share_images( - **FrameworkVersion** (str) - 框架版本 - **Projects** - - **AccountId** (str) - 账号Id - - **AccountName** (str) - 账号昵称 - - **CompShareImage** - **AuthInfo** (int) - 镜像作者认证信息 - **Author** (str) - 镜像作者昵称 @@ -910,22 +910,15 @@ def describe_comp_share_instance( **Response Model** - **GpuMonitorInfo** - - **GPU** (str) - GPU卡名称 - - **GpuUsageRate** (str) - GPU卡使用率 - - **MemoryUsageRate** (str) - GPU显存使用率 - - - **MonitorMessage** - - **CpuUsageRate** (str) - CPU使用率 - - **GpuInfo** (list) - 见 **GpuMonitorInfo** 模型定义 - - **MemUsageRate** (str) - 内存使用率 - - - **WithoutGpuSpec** - - **Cpu** (int) - cpu - - **Gpu** (int) - gpu - - **Memory** (int) - 内存 + **UHostDiskSet** + - **DiskId** (str) - 磁盘ID + - **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 + - **Drive** (str) - 磁盘盘符 + - **Encrypted** (str) - "true": 加密盘 "false"：非加密盘 + - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 + - **Name** (str) - UDisk名字（仅当磁盘是UDisk时返回） + - **Size** (int) - 磁盘大小，单位: GB + - **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk **UHostIPSet** @@ -942,20 +935,10 @@ def describe_comp_share_instance( - **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。 - **UHostDiskSet** - - **DiskId** (str) - 磁盘ID - - **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 - - **Drive** (str) - 磁盘盘符 - - **Encrypted** (str) - "true": 加密盘 "false"：非加密盘 - - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 - - **Name** (str) - UDisk名字（仅当磁盘是UDisk时返回） - - **Size** (int) - 磁盘大小，单位: GB - - **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk - - - **SoftwareAddr** - - **Name** (str) - 软件名称 - - **URL** (str) - 软件地址 + **GpuMonitorInfo** + - **GPU** (str) - GPU卡名称 + - **GpuUsageRate** (str) - GPU卡使用率 + - **MemoryUsageRate** (str) - GPU显存使用率 **DiskPriceInfo** @@ -964,11 +947,28 @@ def describe_comp_share_instance( - **Price** (float) - 磁盘价格 + **WithoutGpuSpec** + - **Cpu** (int) - cpu + - **Gpu** (int) - gpu + - **Memory** (int) - 内存 + + + **MonitorMessage** + - **CpuUsageRate** (str) - CPU使用率 + - **GpuInfo** (list) - 见 **GpuMonitorInfo** 模型定义 + - **MemUsageRate** (str) - 内存使用率 + + **GraphicsMemory** - **Rate** (int) - 交互展示参数，可忽略 - **Value** (int) - 值，单位是GB + **SoftwareAddr** + - **Name** (str) - 软件名称 + - **URL** (str) - 软件地址 + + **CompShareInstanceSet** - **AutoRenew** (str) - 是否自动续费，自动续费：“Yes”，不自动续费：“No” - **CPU** (int) - 虚拟CPU核数，单位: 个 @@ -1285,11 +1285,6 @@ def describe_self_community_images( **Response Model** - **Projects** - - **AccountId** (str) - 账号Id - - **AccountName** (str) - 账号昵称 - - **Software** - **Applications** (list) - 【array of string】应用列表 - **CUDAVersion** (str) - CUDA版本 @@ -1297,6 +1292,11 @@ def describe_self_community_images( - **FrameworkVersion** (str) - 框架版本 + **Projects** + - **AccountId** (str) - 账号Id + - **AccountName** (str) - 账号昵称 + + **CompShareImage** - **AuthInfo** (int) - 镜像作者认证信息 - **Author** (str) - 镜像作者昵称 diff --git a/ucloud/services/ucompshare/schemas/apis.py b/ucloud/services/ucompshare/schemas/apis.py index 8703af5..88a5f46 100644 --- a/ucloud/services/ucompshare/schemas/apis.py +++ b/ucloud/services/ucompshare/schemas/apis.py @@ -372,7 +372,7 @@ class DeleteCompShareStopSchedulerRequestSchema(schema.RequestSchema): """DeleteCompShareStopScheduler - 删除实例定时关机任务""" fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "UHostId": fields.Str(required=True, dump_to="UHostId"), "Zone": fields.Str(required=False, dump_to="Zone"), @@ -2501,7 +2501,7 @@ class UpdateCompShareStopSchedulerRequestSchema(schema.RequestSchema): """UpdateCompShareStopScheduler - 更新实例定时关机时间，若不存在则新建此定时任务""" fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "StopTime": fields.Int(required=True, dump_to="StopTime"), "UHostId": fields.Str(required=True, dump_to="UHostId"), diff --git a/ucloud/services/ucompshare/schemas/models.py b/ucloud/services/ucompshare/schemas/models.py index 5cbd975..c556f4e 100644 --- a/ucloud/services/ucompshare/schemas/models.py +++ b/ucloud/services/ucompshare/schemas/models.py @@ -3,13 +3,23 @@ from ucloud.core.typesystem import schema, fields -class CpuPlatformsSchema(schema.ResponseSchema): - """CpuPlatforms - CPU平台信息""" +class CollectionSchema(schema.ResponseSchema): + """Collection - CPU和内存可支持的规格""" fields = { - "Amd": fields.List(fields.Str()), - "Ampere": fields.List(fields.Str()), - "Intel": fields.List(fields.Str()), + "Cpu": fields.Int(required=False, load_from="Cpu"), + "Memory": fields.List(fields.Int()), + "MinimalCpuPlatform": fields.List(fields.Str()), + } + + +class FeatureModesSchema(schema.ResponseSchema): + """FeatureModes - 可以支持的模式类别""" + + fields = { + "MinimalCpuPlatform": fields.List(fields.Str()), + "Name": fields.Str(required=False, load_from="Name"), + "RelatedToImageFeature": fields.List(fields.Str()), } @@ -45,16 +55,6 @@ class DisksSchema(schema.ResponseSchema): } -class CollectionSchema(schema.ResponseSchema): - """Collection - CPU和内存可支持的规格""" - - fields = { - "Cpu": fields.Int(required=False, load_from="Cpu"), - "Memory": fields.List(fields.Int()), - "MinimalCpuPlatform": fields.List(fields.Str()), - } - - class MachineSizesSchema(schema.ResponseSchema): """MachineSizes - GPU、CPU和内存信息""" @@ -73,13 +73,13 @@ class PerformanceSchema(schema.ResponseSchema): } -class FeatureModesSchema(schema.ResponseSchema): - """FeatureModes - 可以支持的模式类别""" +class CpuPlatformsSchema(schema.ResponseSchema): + """CpuPlatforms - CPU平台信息""" fields = { - "MinimalCpuPlatform": fields.List(fields.Str()), - "Name": fields.Str(required=False, load_from="Name"), - "RelatedToImageFeature": fields.List(fields.Str()), + "Amd": fields.List(fields.Str()), + "Ampere": fields.List(fields.Str()), + "Intel": fields.List(fields.Str()), } @@ -185,6 +185,34 @@ class CompShareImageSchema(schema.ResponseSchema): } +class DiskPriceInfoSchema(schema.ResponseSchema): + """DiskPriceInfo - 磁盘价格信息列表""" + + fields = { + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "IsBoot": fields.Bool(required=False, load_from="IsBoot"), + "Price": fields.Float(required=False, load_from="Price"), + } + + +class UHostDiskSetSchema(schema.ResponseSchema): + """UHostDiskSet -""" + + fields = { + "BackupType": fields.Str( + required=False, load_from="BackupType" + ), # Deprecated, will be removed at 1.0 + "DiskId": fields.Str(required=False, load_from="DiskId"), + "DiskType": fields.Str(required=True, load_from="DiskType"), + "Drive": fields.Str(required=False, load_from="Drive"), + "Encrypted": fields.Str(required=False, load_from="Encrypted"), + "IsBoot": fields.Str(required=True, load_from="IsBoot"), + "Name": fields.Str(required=False, load_from="Name"), + "Size": fields.Int(required=False, load_from="Size"), + "Type": fields.Str(required=False, load_from="Type"), + } + + class UHostIPSetSchema(schema.ResponseSchema): """UHostIPSet -""" @@ -227,13 +255,12 @@ class MonitorMessageSchema(schema.ResponseSchema): } -class DiskPriceInfoSchema(schema.ResponseSchema): - """DiskPriceInfo - 磁盘价格信息列表""" +class SoftwareAddrSchema(schema.ResponseSchema): + """SoftwareAddr -""" fields = { - "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "IsBoot": fields.Bool(required=False, load_from="IsBoot"), - "Price": fields.Float(required=False, load_from="Price"), + "Name": fields.Str(required=False, load_from="Name"), + "URL": fields.Str(required=False, load_from="URL"), } @@ -247,33 +274,6 @@ class WithoutGpuSpecSchema(schema.ResponseSchema): } -class SoftwareAddrSchema(schema.ResponseSchema): - """SoftwareAddr -""" - - fields = { - "Name": fields.Str(required=False, load_from="Name"), - "URL": fields.Str(required=False, load_from="URL"), - } - - -class UHostDiskSetSchema(schema.ResponseSchema): - """UHostDiskSet -""" - - fields = { - "BackupType": fields.Str( - required=False, load_from="BackupType" - ), # Deprecated, will be removed at 1.0 - "DiskId": fields.Str(required=False, load_from="DiskId"), - "DiskType": fields.Str(required=True, load_from="DiskType"), - "Drive": fields.Str(required=False, load_from="Drive"), - "Encrypted": fields.Str(required=False, load_from="Encrypted"), - "IsBoot": fields.Str(required=True, load_from="IsBoot"), - "Name": fields.Str(required=False, load_from="Name"), - "Size": fields.Int(required=False, load_from="Size"), - "Type": fields.Str(required=False, load_from="Type"), - } - - class CompShareInstanceSetSchema(schema.ResponseSchema): """CompShareInstanceSet - 算力平台实例详情""" @@ -430,20 +430,20 @@ class CompshareImageGroupSchema(schema.ResponseSchema): } -class ResourceTagItemSchema(schema.ResponseSchema): - """ResourceTagItem - 资源标识""" +class OrderDetailItemSchema(schema.ResponseSchema): + """OrderDetailItem - 配置详情""" fields = { - "KeyId": fields.Str(required=False, load_from="KeyId"), + "ProductName": fields.Str(required=False, load_from="ProductName"), "Value": fields.Str(required=False, load_from="Value"), } -class OrderDetailItemSchema(schema.ResponseSchema): - """OrderDetailItem - 配置详情""" +class ResourceTagItemSchema(schema.ResponseSchema): + """ResourceTagItem - 资源标识""" fields = { - "ProductName": fields.Str(required=False, load_from="ProductName"), + "KeyId": fields.Str(required=False, load_from="KeyId"), "Value": fields.Str(required=False, load_from="Value"), } @@ -555,19 +555,6 @@ class ULHostImageSetSchema(schema.ResponseSchema): } -class ULHostDiskSetSchema(schema.ResponseSchema): - """ULHostDiskSet - 轻量应用主机的磁盘信息""" - - fields = { - "DiskId": fields.Str(required=False, load_from="DiskId"), - "DiskType": fields.Str(required=False, load_from="DiskType"), - "Drive": fields.Str(required=False, load_from="Drive"), - "IsBoot": fields.Str(required=False, load_from="IsBoot"), - "Size": fields.Int(required=False, load_from="Size"), - "Type": fields.Str(required=False, load_from="Type"), - } - - class ExclusiveUTPInfoSchema(schema.ResponseSchema): """ExclusiveUTPInfo - 流量包详情""" @@ -582,6 +569,19 @@ class ExclusiveUTPInfoSchema(schema.ResponseSchema): } +class ULHostDiskSetSchema(schema.ResponseSchema): + """ULHostDiskSet - 轻量应用主机的磁盘信息""" + + fields = { + "DiskId": fields.Str(required=False, load_from="DiskId"), + "DiskType": fields.Str(required=False, load_from="DiskType"), + "Drive": fields.Str(required=False, load_from="Drive"), + "IsBoot": fields.Str(required=False, load_from="IsBoot"), + "Size": fields.Int(required=False, load_from="Size"), + "Type": fields.Str(required=False, load_from="Type"), + } + + class ULHostInstanceSetSchema(schema.ResponseSchema): """ULHostInstanceSet - 轻量应用云主机详情""" diff --git a/ucloud/version.py b/ucloud/version.py index 4700bc7..dda4a52 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1 +1 @@ -version = "0.11.103" +version = "0.11.104"