yicloud-sdk-python 0.2.0__tar.gz → 0.2.1__tar.gz

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yicloud-sdk-python
-Version: 0.2.0
+Version: 0.2.1
 Summary: YiCloud OpenAPI SDK for Python
 Author: YiCloud
 Project-URL: Homepage, https://gitee.com/yicloud-team/openapi-sdk-python

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yicloud-sdk-python"
-version = "0.2.0"
+version = "0.2.1"
 description = "YiCloud OpenAPI SDK for Python"
 readme = "README.md"
 requires-python = ">=3.7"

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.2.1"
 
 
 def Version() -> str:

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/__init__.py

@@ -4,4 +4,4 @@ YiCloud Python SDK
 A Python SDK for the YiCloud OpenAPI service.
 """
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/base/msgs/__init__.py

@@ -1,5 +1,5 @@
 import contextvars
-from typing import Any, Dict, Generic, Optional, Tuple, TypeVar, Union, get_args, get_origin
+from typing import Any, Dict, Generic, Optional, Tuple, TypeVar, Union, get_args, get_origin, get_type_hints
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, fields, is_dataclass
 
@@ -60,7 +60,7 @@ def _dict_to_dataclass(target_type, data):
     if not is_dataclass(target_type) or not isinstance(data, dict):
         return data
 
-    field_types = {f.name: f.type for f in fields(target_type)}
+    field_types = get_type_hints(target_type)
 
     kwargs = {}
     for key, value in data.items():

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/services/fs/__init__.py

@@ -22,10 +22,12 @@ from .models import (
     Authorization,
     CreateFilesetWithQuotaReqAuthorization,
     UpdateFilesetReqAuthorization,
+    BucketResponse,
     CreateFilesetWithQuotaReq,
     DeleteFilesetReq,
     GetFileInfoData,
     GetFilesetData,
+    FilesetItem,
     ListDirData,
     ListFilesetsWithQuotaInfoData,
     SetFilesetQuotaReq,

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/services/fs/models.py

@@ -31,6 +31,19 @@ class UpdateFilesetReqAuthorization:
     Name: Optional[str] = None    # 授权名称  json:"Name,omitempty"
     Type: Optional[str] = None    # 授权类型  json:"Type,omitempty"
 
+@dataclass
+class BucketResponse:
+    Bucket: Optional[str] = ""    # 文件集名称  json:"Bucket,omitempty"
+    Capacity: Optional[str] = ""    # 文件集容量（字节）  json:"Capacity,omitempty"
+    Created: Optional[str] = ""    # 创建时间  json:"Created,omitempty"
+    Fs: Optional[str] = ""    # 文件系统  json:"Fs,omitempty"
+    FsCluster: Optional[str] = ""    # 文件系统集群  json:"FsCluster,omitempty"
+    Owner: Optional[str] = ""    # 文件集所有者  json:"Owner,omitempty"
+    Permission: Optional[str] = ""    # 文件集权限  json:"Permission,omitempty"
+    Size: Optional[str] = ""    # 已使用容量（字节）  json:"Size,omitempty"
+    State: Optional[str] = ""    # 文件集状态  json:"State,omitempty"
+    Tenant: Optional[str] = ""    # 租户信息  json:"Tenant,omitempty"
+
 @dataclass
 class CreateFilesetWithQuotaReq:
     Capacity: int    # 文件集容量，单位字节  json:"Capacity"
@@ -73,16 +86,21 @@ class GetFilesetData:
     Tenant: Optional[str] = ""    # 租户信息  json:"Tenant,omitempty"
     Used: Optional[str] = ""    # 已使用容量（字节）  json:"Used,omitempty"
 
+@dataclass
+class FilesetItem:
+    BucketResponse: Optional[BucketResponse] = None    # 文件集详情  json:"BucketResponse,omitempty"
+    ID: Optional[str] = ""    # 文件集ID  json:"ID,omitempty"
+
 @dataclass
 class ListDirData:
-    Items: Optional[List[GetFileInfoData]] = None    # 文件/目录列表  json:"Items,omitempty"
+    Files: Optional[List[GetFileInfoData]] = None    # 文件/目录列表  json:"Files,omitempty"
     Limit: Optional[int] = 0    # 每页大小  json:"Limit,omitempty"
     Offset: Optional[int] = 0    # 当前偏移量  json:"Offset,omitempty"
     Total: Optional[int] = 0    # 总文件/目录数  json:"Total,omitempty"
 
 @dataclass
 class ListFilesetsWithQuotaInfoData:
-    Items: Optional[List[GetFilesetData]] = None    # 文件集列表  json:"Items,omitempty"
+    Items: Optional[List[FilesetItem]] = None    # 文件集列表  json:"Items,omitempty"
     Total: Optional[int] = 0    # 总文件集数  json:"Total,omitempty"
 
 @dataclass
@@ -117,18 +135,18 @@ class GetFilesetReq:
 class ListDirReq:
     Path: str    # 目录路径  query:"Path"
     CalculateDirSize: Optional[bool] = None    # 是否计算目录大小  query:"CalculateDirSize,omitempty"
-    Offset: Optional[int] = None    # 偏移量，从第几条记录开始查询  query:"Offset,omitempty"
     Limit: Optional[int] = None    # 每页数量  query:"Limit,omitempty"
+    Offset: Optional[int] = None    # 偏移量，从第几条记录开始查询  query:"Offset,omitempty"
     SortBy: Optional[str] = None    # 排序字段  query:"SortBy,omitempty"
     SortOrder: Optional[str] = None    # 排序顺序  query:"SortOrder,omitempty"
 
 @dataclass
 class ListFilesetsWithQuotaInfoReq:
-    SortBy: Optional[str] = None    # 排序字段，格式：字段名:排序方向，如 created:desc  query:"SortBy,omitempty"
-    Offset: Optional[int] = None    # 偏移量，从第几条记录开始查询  query:"Offset,omitempty"
-    Limit: Optional[int] = None    # 每页数量  query:"Limit,omitempty"
     Fs: Optional[str] = None    # 文件系统，枚举值: GPFS SDK常量: FsGPFS  query:"Fs,omitempty"
     FsCluster: Optional[str] = None    # 文件系统集群，枚举值: gpfs1 SDK常量: FsClustergpfs1  query:"FsCluster,omitempty"
     Keyword: Optional[str] = None    # 关键字搜索  query:"Keyword,omitempty"
+    Limit: Optional[int] = None    # 每页数量  query:"Limit,omitempty"
+    Offset: Optional[int] = None    # 偏移量，从第几条记录开始查询  query:"Offset,omitempty"
     Owner: Optional[str] = None    # 所有者  query:"Owner,omitempty"
+    SortBy: Optional[str] = None    # 排序字段，格式：字段名:排序方向，如 created:desc  query:"SortBy,omitempty"
 

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/services/oss/models.py

@@ -35,37 +35,39 @@ class Type:
 @dataclass
 class Authorization:
     Mode: Optional[str] = None    # SDK常量: ModeREADONLY, ModeREADWRITE, ModeFULL_CONTROL  json:"Mode,omitempty"
-    Name: Optional[str] = ""    # 被分享对象名字  json:"Name,omitempty"
+    Name: Optional[str] = ""    # 被分享者名  json:"Name,omitempty"
     Type: Optional[str] = None    # SDK常量: TypeCanonicalUser, TypeGROUP, TypePROJECT  json:"Type,omitempty"
 
 @dataclass
 class CreateBucketReqAuthorization:
     Mode: Optional[str] = None    # SDK常量: ModeREADONLY, ModeREADWRITE, ModeFULL_CONTROL  json:"Mode,omitempty"
-    Name: Optional[str] = None    # 被分享对象名字  json:"Name,omitempty"
+    Name: Optional[str] = None    # 被分享者名  json:"Name,omitempty"
     Type: Optional[str] = None    # SDK常量: TypeCanonicalUser, TypeGROUP, TypePROJECT  json:"Type,omitempty"
 
 @dataclass
 class UpdateBucketReqAuthorization:
     Mode: Optional[str] = None    # SDK常量: ModeREADONLY, ModeREADWRITE, ModeFULL_CONTROL  json:"Mode,omitempty"
-    Name: Optional[str] = None    # 被分享对象名字  json:"Name,omitempty"
+    Name: Optional[str] = None    # 被分享者名  json:"Name,omitempty"
     Type: Optional[str] = None    # SDK常量: TypeCanonicalUser, TypeGROUP, TypePROJECT  json:"Type,omitempty"
 
 @dataclass
 class BucketResponse:
-    Authorizations: Optional[List[Authorization]] = None    # json:"Authorizations,omitempty"
-    Bucket: Optional[str] = ""    # json:"Bucket,omitempty"
-    Owner: Optional[str] = ""    # json:"Owner,omitempty"
+    Authorizations: Optional[List[Authorization]] = None    # 权限分享  json:"Authorizations,omitempty"
+    Bucket: Optional[str] = ""    # 存储桶名  json:"Bucket,omitempty"
+    Created: Optional[str] = ""    # 创建时间  json:"Created,omitempty"
+    Owner: Optional[str] = ""    # 所有者  json:"Owner,omitempty"
     Permission: Optional[str] = None    # SDK常量: PermissionDENY, PermissionREADONLY, PermissionREADWRITE, PermissionPUBLIC_READ, PermissionADMIN  json:"Permission,omitempty"
-    ProjectID: Optional[str] = ""    # json:"ProjectID,omitempty"
-    ProjectId: Optional[str] = ""    # json:"ProjectId,omitempty"
-    Size: Optional[str] = ""    # json:"Size,omitempty"
+    Project: Optional[str] = ""    # 所属项目  json:"Project,omitempty"
+    PublicRead: Optional[bool] = False    # 是否公共读  json:"PublicRead,omitempty"
+    ReadOnly: Optional[bool] = False    # 是否只读  json:"ReadOnly,omitempty"
+    Size: Optional[str] = ""    # 当前容量  json:"Size,omitempty"
     State: Optional[str] = None    # SDK常量: StateSTATE_PENDING, StateSTATE_READY, StateSTATE_FAILED, StateSTATE_DELETED  json:"State,omitempty"
-    Tenant: Optional[str] = ""    # json:"Tenant,omitempty"
+    Tenant: Optional[str] = ""    # 所属租户  json:"Tenant,omitempty"
 
 @dataclass
 class CreateBucketReq:
-    Bucket: str    # Bucket名，命名规则参照AWS S3存储桶命名规则  json:"Bucket"
-    Project: str    # 所属Project  json:"Project"
+    Bucket: str    # 存储桶名  json:"Bucket"
+    Project: str    # 所属项目  json:"Project"
     Authorizations: Optional[List[CreateBucketReqAuthorization]] = None    # 权限分享  json:"Authorizations,omitempty"
     Description: Optional[str] = None    # 描述  json:"Description,omitempty"
 
@@ -75,21 +77,22 @@ class DeleteBucketReq:
 
 @dataclass
 class GetBucketData:
-    Authorizations: Optional[List[Authorization]] = None    # json:"Authorizations,omitempty"
-    Bucket: Optional[str] = ""    # json:"Bucket,omitempty"
-    Owner: Optional[str] = ""    # json:"Owner,omitempty"
+    Authorizations: Optional[List[Authorization]] = None    # 权限分享  json:"Authorizations,omitempty"
+    Bucket: Optional[str] = ""    # 存储桶名  json:"Bucket,omitempty"
+    Created: Optional[str] = ""    # 创建时间  json:"Created,omitempty"
+    Owner: Optional[str] = ""    # 所有者  json:"Owner,omitempty"
     Permission: Optional[str] = None    # SDK常量: PermissionDENY, PermissionREADONLY, PermissionREADWRITE, PermissionPUBLIC_READ, PermissionADMIN  json:"Permission,omitempty"
-    Project: Optional[str] = ""    # json:"Project,omitempty"
-    ProjectID: Optional[str] = ""    # json:"ProjectID,omitempty"
-    ProjectId: Optional[str] = ""    # json:"ProjectId,omitempty"
-    Size: Optional[str] = ""    # json:"Size,omitempty"
+    Project: Optional[str] = ""    # 所属项目  json:"Project,omitempty"
+    PublicRead: Optional[bool] = False    # 是否公共读  json:"PublicRead,omitempty"
+    ReadOnly: Optional[bool] = False    # 是否只读  json:"ReadOnly,omitempty"
+    Size: Optional[str] = ""    # 当前容量  json:"Size,omitempty"
     State: Optional[str] = None    # SDK常量: StateSTATE_PENDING, StateSTATE_READY, StateSTATE_FAILED, StateSTATE_DELETED  json:"State,omitempty"
-    Tenant: Optional[str] = ""    # json:"Tenant,omitempty"
+    Tenant: Optional[str] = ""    # 所属租户  json:"Tenant,omitempty"
 
 @dataclass
 class ListBucketsData:
     Items: Optional[List[BucketResponse]] = None    # json:"Items,omitempty"
-    Total: Optional[int] = 0    # json:"Total,omitempty"
+    Total: Optional[int] = 0    # 总数  json:"Total,omitempty"
 
 @dataclass
 class CreateBucketData:
@@ -97,12 +100,12 @@ class CreateBucketData:
 
 @dataclass
 class UpdateBucketReq:
-    Bucket: str    # Bucket名  json:"Bucket"
+    Bucket: str    # 存储桶名  json:"Bucket"
     Authorizations: Optional[List[UpdateBucketReqAuthorization]] = None    # 权限分享  json:"Authorizations,omitempty"
-    Description: Optional[str] = None    # 对该Bucket的描述  json:"Description,omitempty"
-    Project: Optional[str] = None    # Bucket所属项目(只能在Bucket还没有归属某个项目时修改，一旦设置则无法再次更改)  json:"Project,omitempty"
-    PublicRead: Optional[bool] = None    # 是否可公共读  json:"PublicRead,omitempty"
-    ReadOnly: Optional[bool] = None    # 是否只读  json:"ReadOnly,omitempty"
+    Description: Optional[str] = None    # 描述  json:"Description,omitempty"
+    Project: Optional[str] = None    # 所属项目(当项目一旦被设置则不可更改)  json:"Project,omitempty"
+    PublicRead: Optional[str] = None    # 公共读  json:"PublicRead,omitempty"
+    ReadOnly: Optional[str] = None    # 只读  json:"ReadOnly,omitempty"
 
 @dataclass
 class GetBucketReq:
@@ -110,12 +113,12 @@ class GetBucketReq:
 
 @dataclass
 class ListBucketsReq:
-    SortOrder: Optional[str] = None    # 排序方向 (asc, desc, 默认asc)  query:"SortOrder,omitempty"
-    Offset: Optional[int] = None    # 偏移量 (默认 0, 0 <= Offset)  query:"Offset,omitempty"
-    Limit: Optional[int] = None    # 每页数量限制(默认100, 0 < Limit <= 100)  query:"Limit,omitempty"
-    SortBy: Optional[str] = None    # 排序规则(created, size, 默认:created)  query:"SortBy,omitempty"
     Keyword: Optional[str] = None    # 过滤条件，可以填项目名/桶名/所有者  query:"Keyword,omitempty"
+    Limit: Optional[int] = None    # 每页数量限制(默认100, 0 < Limit <= 100)  query:"Limit,omitempty"
+    Offset: Optional[int] = None    # 偏移量 (默认 0, 0 <= Offset)  query:"Offset,omitempty"
     Owner: Optional[str] = None    # 所有者  query:"Owner,omitempty"
+    SortBy: Optional[str] = None    # 排序规则(created,size,默认created)  query:"SortBy,omitempty"
+    SortOrder: Optional[str] = None    # 排序方向 (asc, desc, 默认asc)  query:"SortOrder,omitempty"
 
 
 DeleteBucketData = CreateBucketData

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/services/volume/__init__.py

@@ -43,6 +43,7 @@ from .models import (
     ListQuotaGroupVolumesReq,
     ListSnapshotsReq,
     ListVolumesReq,
+    ListStorageClassesReq,
     ListSnapshotsData,
     ListQuotaGroupVolumesData,
     ListStorageClassesData,

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/services/volume/models.py

@@ -162,44 +162,48 @@ class GetVolumeReq:
 class ListQuotaGroupVolumesReq:
     Project: str    # 项目名称 (从 Query 参数获取，必传)  query:"Project"
     QuotaGroup: str    # 配额组名称  query:"QuotaGroup"
-    Offset: Optional[int] = None    # 分页偏移量  query:"Offset,omitempty"
-    Limit: Optional[int] = None    # 每页数量，最大值 100  query:"Limit,omitempty"
     Keyword: Optional[str] = None    # 关键词搜索（匹配云盘名称）  query:"Keyword,omitempty"
-    SortBy: Optional[str] = None    # 排序字段（格式：字段:asc升序 或 字段:desc降序） - creationTimestamp:asc: 按创建时间升序 - creationTimestamp:desc: 按创建时间降序 - capacity:asc: 按容量升序 - capacity:desc: 按容量降序  query:"SortBy,omitempty"
+    Limit: Optional[int] = None    # 每页数量，最大值 100  query:"Limit,omitempty"
+    MountInstance: Optional[str] = None    # 按挂载实例类型过滤 SDK常量: MountReferenceTypeworkspace, MountReferenceTyperjob  query:"MountInstance,omitempty"
+    MountStatus: Optional[List[str]] = None    # 按挂载状态过滤，支持多选 - 0: 未挂载 - 1: 已挂载  query:"MountStatus,omitempty"
+    Offset: Optional[int] = None    # 分页偏移量  query:"Offset,omitempty"
     SoftDeleted: Optional[bool] = None    # 是否只查询回收站中的云盘（true=回收站，false或不传=正常云盘）  query:"SoftDeleted,omitempty"
-    StorageType: Optional[List[str]] = None    # 按存储类型过滤，支持多选 - 如: storage@hdd, storage@ssd, storage@nvme  query:"StorageType,omitempty"
+    SortBy: Optional[str] = None    # 排序字段（格式：字段:asc升序 或 字段:desc降序） - creationTimestamp:asc: 按创建时间升序 - creationTimestamp:desc: 按创建时间降序 - capacity:asc: 按容量升序 - capacity:desc: 按容量降序  query:"SortBy,omitempty"
+    Source: Optional[List[str]] = None    # 按云盘来源过滤，支持多选 - 0: 从快照创建 - 1: 新建（空白创建） - 2: 从开发机（Workspace）创建 - 3: 从 RJob 创建  query:"Source,omitempty"
     Status: Optional[List[str]] = None    # 按云盘状态过滤，支持多选 - 0: Creating（创建中） - 1: Success（成功/可用） - 2: Fail（失败） - 3: RollingBack（回滚中） - 4: RollbackFail（回滚失败）  query:"Status,omitempty"
-    MountStatus: Optional[List[str]] = None    # 按挂载状态过滤，支持多选 - 0: 未挂载 - 1: 已挂载  query:"MountStatus,omitempty"
-    MountInstance: Optional[str] = None    # 按挂载实例类型过滤 SDK常量: MountReferenceTypeworkspace, MountReferenceTyperjob  query:"MountInstance,omitempty"
+    StorageType: Optional[List[str]] = None    # 按存储类型过滤，支持多选 - 如: storage@hdd, storage@ssd, storage@nvme  query:"StorageType,omitempty"
     Type: Optional[List[str]] = None    # 按云盘类型过滤，支持多选 - data: 数据盘 - rootfs: 系统盘  query:"Type,omitempty"
-    Source: Optional[List[str]] = None    # 按云盘来源过滤，支持多选 - 0: 从快照创建 - 1: 新建（空白创建） - 2: 从开发机（Workspace）创建 - 3: 从 RJob 创建  query:"Source,omitempty"
 
 @dataclass
 class ListSnapshotsReq:
     Project: str    # 项目名称 (从 Query 参数获取，必传)  query:"Project"
-    VolumeID: Optional[str] = None    # 关联的云盘 ID  query:"VolumeID,omitempty"
-    Offset: Optional[int] = None    # 分页偏移量  query:"Offset,omitempty"
     Limit: Optional[int] = None    # 每页数量，最大值 100  query:"Limit,omitempty"
+    Offset: Optional[int] = None    # 分页偏移量  query:"Offset,omitempty"
+    VolumeID: Optional[str] = None    # 关联的云盘 ID  query:"VolumeID,omitempty"
 
 @dataclass
 class ListVolumesReq:
     Project: str    # 项目名称 (从 Query 参数获取，必传)  query:"Project"
-    IDs: Optional[List[str]] = None    # 批量查询云盘 ID  query:"IDs,omitempty"
-    SoftDeleted: Optional[bool] = None    # 是否查询软删除的云盘（回收站）  query:"SoftDeleted,omitempty"
-    QuotaGroup: Optional[str] = None    # 按配额组过滤  query:"QuotaGroup,omitempty"
     All: Optional[bool] = None    # 是否查询所有  query:"All,omitempty"
-    RJob: Optional[str] = None    # 按挂载的 RJob 过滤  query:"RJob,omitempty"
-    Workspace: Optional[str] = None    # 按挂载的 Workspace 过滤  query:"Workspace,omitempty"
+    IDs: Optional[List[str]] = None    # 批量查询云盘 ID  query:"IDs,omitempty"
+    Keyword: Optional[str] = None    # 关键词搜索（匹配云盘名称）  query:"Keyword,omitempty"
+    Limit: Optional[int] = None    # 每页数量，最大值 100  query:"Limit,omitempty"
     MountInstance: Optional[str] = None    # 按挂载实例类型过滤 SDK常量: MountReferenceTypeworkspace, MountReferenceTyperjob  query:"MountInstance,omitempty"
+    MountStatus: Optional[List[str]] = None    # 按挂载状态过滤，支持多选 - 0: 未挂载 - 1: 已挂载  query:"MountStatus,omitempty"
     Offset: Optional[int] = None    # 分页偏移量  query:"Offset,omitempty"
-    Limit: Optional[int] = None    # 每页数量，最大值 100  query:"Limit,omitempty"
+    QuotaGroup: Optional[str] = None    # 按配额组过滤  query:"QuotaGroup,omitempty"
+    RJob: Optional[str] = None    # 按挂载的 RJob 过滤  query:"RJob,omitempty"
+    SoftDeleted: Optional[bool] = None    # 是否查询软删除的云盘（回收站）  query:"SoftDeleted,omitempty"
+    SortBy: Optional[str] = None    # 排序字段（格式：字段:asc升序 或 字段:desc降序） - capacity:asc: 按容量升序 - capacity:desc: 按容量降序  query:"SortBy,omitempty"
+    Source: Optional[List[str]] = None    # 按云盘来源过滤，支持多选 - 0: 从快照创建 - 1: 新建（空白创建） - 2: 从开发机（Workspace）创建 - 3: 从 RJob 创建  query:"Source,omitempty"
     Status: Optional[List[str]] = None    # 按云盘状态过滤，支持多选 - 0: Creating（创建中） - 1: Success（成功/可用） - 2: Fail（失败） - 3: RollingBack（回滚中） - 4: RollbackFail（回滚失败）  query:"Status,omitempty"
     StorageType: Optional[List[str]] = None    # 按存储类型过滤，支持多选 - 如: storage@hdd, storage@ssd, storage@nvme  query:"StorageType,omitempty"
-    MountStatus: Optional[List[str]] = None    # 按挂载状态过滤，支持多选 - 0: 未挂载 - 1: 已挂载  query:"MountStatus,omitempty"
     Type: Optional[List[str]] = None    # 按云盘类型过滤，支持多选 - data: 数据盘 - rootfs: 系统盘  query:"Type,omitempty"
-    Keyword: Optional[str] = None    # 关键词搜索（匹配云盘名称）  query:"Keyword,omitempty"
-    SortBy: Optional[str] = None    # 排序字段（格式：字段:asc升序 或 字段:desc降序） - capacity:asc: 按容量升序 - capacity:desc: 按容量降序  query:"SortBy,omitempty"
-    Source: Optional[List[str]] = None    # 按云盘来源过滤，支持多选 - 0: 从快照创建 - 1: 新建（空白创建） - 2: 从开发机（Workspace）创建 - 3: 从 RJob 创建  query:"Source,omitempty"
+    Workspace: Optional[str] = None    # 按挂载的 Workspace 过滤  query:"Workspace,omitempty"
+
+@dataclass
+class ListStorageClassesReq:
+    pass
 
 
 CreateVolumeData = GetVolumeData

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud/services/workspace/models.py

@@ -89,9 +89,9 @@ class CreateWorkspaceReqDataSource:
 
 @dataclass
 class DeleteWorkspaceReq:
+    Project: str    # 项目名称  json:"Project"
     WorkspaceId: str    # 开发机 ID  json:"WorkspaceId"
     DelWithCloudVolume: Optional[bool] = None    # 云盘移入回收站  json:"DelWithCloudVolume,omitempty"
-    Project: Optional[str] = None    # 项目名称  json:"Project,omitempty"
 
 @dataclass
 class CreateWorkspaceReqDiskInput:
@@ -111,6 +111,7 @@ class DiskResponse:
 
 @dataclass
 class EditWorkspaceReq:
+    Project: str    # 项目名称  json:"Project"
     WorkspaceId: str    # 开发机 ID  json:"WorkspaceId"
     CPU: Optional[str] = None    # CPU 资源量  json:"CPU,omitempty"
     Description: Optional[str] = None    # 开发机描述  json:"Description,omitempty"
@@ -120,7 +121,6 @@ class EditWorkspaceReq:
     MountGPFS: Optional[str] = None    # GPFS 挂载路径  json:"MountGPFS,omitempty"
     MountGpfsVolumes: Optional[List[EditWorkspaceReqMountGpfsVolume]] = None    # GPFS 挂载卷列表（结构化），由 MountGPFS 字符串解析而来  json:"MountGpfsVolumes,omitempty"
     Name: Optional[str] = None    # 新开发机名称  json:"Name,omitempty"
-    Project: Optional[str] = None    # 项目名称  json:"Project,omitempty"
     QuotaGroup: Optional[str] = None    # 新配额组名称  json:"QuotaGroup,omitempty"
     SkuId: Optional[str] = None    # SKU 规格 ID  json:"SkuId,omitempty"
     SkuPrivate: Optional[bool] = None    # 是否使用私有 SKU  json:"SkuPrivate,omitempty"
@@ -212,6 +212,7 @@ class GetProcessData:
     SkuPoolName: Optional[str] = ""    # SKU 池名称  json:"SkuPoolName,omitempty"
     SkuPoolType: Optional[str] = ""    # SKU 池类型  json:"SkuPoolType,omitempty"
     StartTime: Optional[str] = ""    # 启动时间（RFC3339）  json:"StartTime,omitempty"
+    Uid: Optional[str] = ""    # 进程 UID，对应 Process CRD metadata.uid  json:"Uid,omitempty"
     UsePrivateMachine: Optional[bool] = False    # 是否使用专有机器  json:"UsePrivateMachine,omitempty"
     WorkspaceName: Optional[str] = ""    # 所属开发机名称  json:"WorkspaceName,omitempty"
 
@@ -237,29 +238,29 @@ class ReleaseProcessReq:
     ImageName: str    # 目标镜像名称（含 tag），如 registry.example.com/project/image:tag  json:"ImageName"
     Description: Optional[str] = None    # 镜像描述信息  json:"Description,omitempty"
     ExcludePatterns: Optional[List[str]] = None    # 自定义排除文件模式列表  json:"ExcludePatterns,omitempty"
-    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name；优先使用该字段  json:"ProcessId,omitempty"
-    ProcessName: Optional[str] = None    # 兼容字段，进程展示名称；未传 ProcessId 时回退使用  json:"ProcessName,omitempty"
+    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name；与 ProcessName 二选一  json:"ProcessId,omitempty"
+    ProcessName: Optional[str] = None    # 进程展示名称；与 ProcessId 二选一  json:"ProcessName,omitempty"
 
 @dataclass
 class RestartWorkspaceReq:
+    Project: str    # 项目名称  json:"Project"
     WorkspaceId: str    # 开发机 ID  json:"WorkspaceId"
-    Project: Optional[str] = None    # 项目名称  json:"Project,omitempty"
 
 @dataclass
 class StartWorkspaceReq:
+    Project: str    # 项目名称  json:"Project"
     WorkspaceId: str    # 开发机 ID  json:"WorkspaceId"
-    Project: Optional[str] = None    # 项目名称  json:"Project,omitempty"
 
 @dataclass
 class StopWorkspaceReq:
+    Project: str    # 项目名称  json:"Project"
     WorkspaceId: str    # 开发机 ID  json:"WorkspaceId"
-    Project: Optional[str] = None    # 项目名称  json:"Project,omitempty"
 
 @dataclass
 class TransferWorkspaceReq:
+    Project: str    # 项目名称  json:"Project"
     TargetUser: str    # 目标用户 ID  json:"TargetUser"
     WorkspaceId: str    # 开发机ID  json:"WorkspaceId"
-    Project: Optional[str] = None    # 项目名称  json:"Project,omitempty"
 
 @dataclass
 class BatchDeleteWorkspacesReqWorkspaceResourceIdentifier:
@@ -327,53 +328,53 @@ class WorkspaceVolumeDataSourceResponse:
 @dataclass
 class CheckNFSServiceReq:
     Project: str    # 项目名称  query:"Project"
-    ProcessName: Optional[str] = None    # 兼容字段，进程展示名称；未传 ProcessId 时回退使用  query:"ProcessName,omitempty"
-    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name  query:"ProcessId,omitempty"
+    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name；与 ProcessName 二选一  query:"ProcessId,omitempty"
+    ProcessName: Optional[str] = None    # 进程展示名称；与 ProcessId 二选一  query:"ProcessName,omitempty"
 
 @dataclass
 class DeleteProcessReq:
-    Project: str    # 项目名称  query:"Project"
     ProcessId: str    # 进程唯一标识，对应 Process CRD metadata.name  query:"ProcessId"
+    Project: str    # 项目名称  query:"Project"
 
 @dataclass
 class GetPredictReq:
-    Project: Optional[str] = None    # 项目名称  query:"Project,omitempty"
+    Project: str    # 项目名称  query:"Project"
+    AffinityMode: Optional[str] = None    # query:"AffinityMode,omitempty"
     CPU: Optional[int] = None    # query:"CPU,omitempty"
+    EphemeralStorage: Optional[int] = None    # query:"EphemeralStorage,omitempty"
     GPU: Optional[int] = None    # query:"GPU,omitempty"
+    GPUQos: Optional[str] = None    # query:"GPUQos,omitempty"
     Memory: Optional[int] = None    # query:"Memory,omitempty"
-    EphemeralStorage: Optional[int] = None    # query:"EphemeralStorage,omitempty"
-    NodeNum: Optional[int] = None    # query:"NodeNum,omitempty"
-    ResourceType: Optional[str] = None    # query:"ResourceType,omitempty"
-    Private: Optional[str] = None    # query:"Private,omitempty"
-    Preemptible: Optional[str] = None    # query:"Preemptible,omitempty"
-    PositiveTags: Optional[str] = None    # query:"PositiveTags,omitempty"
     NegativeTags: Optional[str] = None    # query:"NegativeTags,omitempty"
-    GPUQos: Optional[str] = None    # query:"GPUQos,omitempty"
     Network: Optional[str] = None    # query:"Network,omitempty"
-    AffinityMode: Optional[str] = None    # query:"AffinityMode,omitempty"
+    NodeNum: Optional[int] = None    # query:"NodeNum,omitempty"
     Pool: Optional[str] = None    # query:"Pool,omitempty"
+    PositiveTags: Optional[str] = None    # query:"PositiveTags,omitempty"
+    Preemptible: Optional[str] = None    # query:"Preemptible,omitempty"
+    Private: Optional[str] = None    # query:"Private,omitempty"
+    ResourceType: Optional[str] = None    # query:"ResourceType,omitempty"
 
 @dataclass
 class GetProcessReq:
     Project: str    # 项目名称  query:"Project"
-    ProcessName: Optional[str] = None    # 兼容字段，进程展示名称；未传 ProcessId 时回退使用  query:"ProcessName,omitempty"
-    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name  query:"ProcessId,omitempty"
+    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name；与 ProcessName 二选一  query:"ProcessId,omitempty"
+    ProcessName: Optional[str] = None    # 进程展示名称；与 ProcessId 二选一  query:"ProcessName,omitempty"
 
 @dataclass
 class GetProcessPidsReq:
     Project: str    # 项目名称  query:"Project"
-    ProcessName: Optional[str] = None    # 兼容字段，进程展示名称；未传 ProcessId 时回退使用  query:"ProcessName,omitempty"
-    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name  query:"ProcessId,omitempty"
+    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name；与 ProcessName 二选一  query:"ProcessId,omitempty"
+    ProcessName: Optional[str] = None    # 进程展示名称；与 ProcessId 二选一  query:"ProcessName,omitempty"
 
 @dataclass
 class GetReleaseExcludePatternsReq:
     Project: str    # 项目名称  query:"Project"
-    ProcessName: Optional[str] = None    # 兼容字段，进程展示名称；未传 ProcessId 时回退使用  query:"ProcessName,omitempty"
-    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name  query:"ProcessId,omitempty"
+    ProcessId: Optional[str] = None    # 进程唯一标识，对应 Process CRD metadata.name；与 ProcessName 二选一  query:"ProcessId,omitempty"
+    ProcessName: Optional[str] = None    # 进程展示名称；与 ProcessId 二选一  query:"ProcessName,omitempty"
 
 @dataclass
 class GetWorkspaceReq:
-    Project: Optional[str] = None    # 项目名称  query:"Project,omitempty"
+    Project: str    # 项目名称  query:"Project"
     WorkspaceId: str    # 开发机 ID  query:"WorkspaceId"
 
 @dataclass
@@ -394,23 +395,23 @@ class ListWorkersReq:
 
 @dataclass
 class ListWorkspacesReq:
-    Project: Optional[str] = None    # 项目名称（优先于 Header 中的 Project）  query:"Project,omitempty"
-    Offset: Optional[int] = None    # 偏移量  query:"Offset,omitempty"
-    Limit: Optional[int] = None    # 每页数量  query:"Limit,omitempty"
-    SortBy: Optional[str] = None    # 排序字段  query:"SortBy,omitempty"
+    CPUMax: Optional[int] = None    # CPU 核数上限  query:"CPUMax,omitempty"
+    CPUMin: Optional[int] = None    # CPU 核数下限  query:"CPUMin,omitempty"
+    CloseTimestampMax: Optional[int] = None    # 关闭时间戳上限（秒）  query:"CloseTimestampMax,omitempty"
+    CloseTimestampMin: Optional[int] = None    # 关闭时间戳下限（秒）  query:"CloseTimestampMin,omitempty"
+    CreationTimestampMax: Optional[int] = None    # 创建时间戳上限（秒）  query:"CreationTimestampMax,omitempty"
+    CreationTimestampMin: Optional[int] = None    # 创建时间戳下限（秒）  query:"CreationTimestampMin,omitempty"
     Creator: Optional[str] = None    # 创建者用户名（内部转换为用户 ID）  query:"Creator,omitempty"
+    Limit: Optional[int] = None    # 每页数量  query:"Limit,omitempty"
+    MemoryMax: Optional[int] = None    # 内存上限（GiB）  query:"MemoryMax,omitempty"
+    MemoryMin: Optional[int] = None    # 内存下限（GiB）  query:"MemoryMin,omitempty"
     Name: Optional[str] = None    # 按名称过滤（支持模糊匹配）  query:"Name,omitempty"
+    Offset: Optional[int] = None    # 偏移量  query:"Offset,omitempty"
+    Project: Optional[str] = None    # 项目名称  query:"Project,omitempty"
+    QuotaGroup: Optional[List[str]] = None    # 按配额组批量筛选  query:"QuotaGroup,omitempty"
     Share: Optional[str] = None    # 共享过滤模式  query:"Share,omitempty"
+    SortBy: Optional[str] = None    # 排序字段  query:"SortBy,omitempty"
     WorkspaceId: Optional[List[str]] = None    # 按开发机 ID 批量筛选  query:"WorkspaceId,omitempty"
-    QuotaGroup: Optional[List[str]] = None    # 按配额组批量筛选  query:"QuotaGroup,omitempty"
-    CPUMin: Optional[int] = None    # CPU 核数下限  query:"CPUMin,omitempty"
-    CPUMax: Optional[int] = None    # CPU 核数上限  query:"CPUMax,omitempty"
-    MemoryMin: Optional[int] = None    # 内存下限（GiB）  query:"MemoryMin,omitempty"
-    MemoryMax: Optional[int] = None    # 内存上限（GiB）  query:"MemoryMax,omitempty"
-    CreationTimestampMin: Optional[int] = None    # 创建时间戳下限（秒）  query:"CreationTimestampMin,omitempty"
-    CreationTimestampMax: Optional[int] = None    # 创建时间戳上限（秒）  query:"CreationTimestampMax,omitempty"
-    CloseTimestampMin: Optional[int] = None    # 关闭时间戳下限（秒）  query:"CloseTimestampMin,omitempty"
-    CloseTimestampMax: Optional[int] = None    # 关闭时间戳上限（秒）  query:"CloseTimestampMax,omitempty"
 
 
 BatchDeleteWorkspacesData = BatchStopWorkspacesData

{yicloud_sdk_python-0.2.0 → yicloud_sdk_python-0.2.1}/yicloud_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yicloud-sdk-python
-Version: 0.2.0
+Version: 0.2.1
 Summary: YiCloud OpenAPI SDK for Python
 Author: YiCloud
 Project-URL: Homepage, https://gitee.com/yicloud-team/openapi-sdk-python