yicloud-sdk-python 0.3.1__tar.gz → 0.4.0__tar.gz

{yicloud_sdk_python-0.3.1/yicloud_sdk_python.egg-info → yicloud_sdk_python-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yicloud-sdk-python
-Version: 0.3.1
+Version: 0.4.0
 Summary: YiCloud OpenAPI SDK for Python
 Author: YiCloud
 Project-URL: Homepage, https://gitee.com/yicloud-team/openapi-sdk-python
@@ -111,18 +111,19 @@ except base.exc.YiCloudException as e:
 |---------|---------|---------|-------------|
 | BC | `yicloud.services.bc` | 5 | 账单管理 BC |
 | Dataset | `yicloud.services.dataset` | 10 | 数据集 DATASET |
-| FS | `yicloud.services.fs` | 8 | 文件系统 FS |
+| FS | `yicloud.services.fs` | 9 | 文件系统 FS |
 | IAM | `yicloud.services.iam` | 12 | 访问控制 IAM |
-| Inferset | `yicloud.services.inferset` | 14 | 模型推理服务 INFERSET |
+| Inferset | `yicloud.services.inferset` | 21 | 模型推理服务 INFERSET |
 | JOB | `yicloud.services.job` | 13 | 训练任务 JOB |
-| MC | `yicloud.services.mc` | 26 | 管理中心 MC |
+| MC | `yicloud.services.mc` | 29 | 管理中心 MC |
 | Modelrepo | `yicloud.services.modelrepo` | 11 | 模型仓库 MODELREPO |
 | Monitor | `yicloud.services.monitor` | 1 | 监控中心 MONITOR |
 | OSS | `yicloud.services.oss` | 5 | 对象存储OSS |
 | RAY | `yicloud.services.ray` | 9 | 分布式计算 Ray |
-| Registry | `yicloud.services.registry` | 12 | 镜像仓库 REGISTRY |
+| Registry | `yicloud.services.registry` | 9 | 镜像仓库 REGISTRY |
+| Sandbox | `yicloud.services.sandbox` | 19 | 沙盒 SANDBOX |
 | Volume | `yicloud.services.volume` | 12 | 云盘管理 Volume |
-| Workspace | `yicloud.services.workspace` | 21 | 开发机 WS |
+| Workspace | `yicloud.services.workspace` | 20 | 开发机 WS |
 
 ## Project Structure
 
@@ -136,7 +137,7 @@ yicloud/                    # Main package
 │   ├── log/                # Logger
 │   ├── msgs/               # Response types (Rsp[T], Header, RspMeta)
 │   └── utils/              # Utilities
-└── services/               # Business services (14 services)
+└── services/               # Business services (15 services)
     ├── bc/         # 账单管理 BC
     ├── dataset/    # 数据集 DATASET
     ├── fs/         # 文件系统 FS
@@ -149,6 +150,7 @@ yicloud/                    # Main package
     ├── oss/        # 对象存储OSS
     ├── ray/        # 分布式计算 Ray
     ├── registry/   # 镜像仓库 REGISTRY
+    ├── sandbox/    # 沙盒 SANDBOX
     ├── volume/     # 云盘管理 Volume
     ├── workspace/  # 开发机 WS
 examples/                   # Example code (one per service)

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/README.md

@@ -72,18 +72,19 @@ except base.exc.YiCloudException as e:
 |---------|---------|---------|-------------|
 | BC | `yicloud.services.bc` | 5 | 账单管理 BC |
 | Dataset | `yicloud.services.dataset` | 10 | 数据集 DATASET |
-| FS | `yicloud.services.fs` | 8 | 文件系统 FS |
+| FS | `yicloud.services.fs` | 9 | 文件系统 FS |
 | IAM | `yicloud.services.iam` | 12 | 访问控制 IAM |
-| Inferset | `yicloud.services.inferset` | 14 | 模型推理服务 INFERSET |
+| Inferset | `yicloud.services.inferset` | 21 | 模型推理服务 INFERSET |
 | JOB | `yicloud.services.job` | 13 | 训练任务 JOB |
-| MC | `yicloud.services.mc` | 26 | 管理中心 MC |
+| MC | `yicloud.services.mc` | 29 | 管理中心 MC |
 | Modelrepo | `yicloud.services.modelrepo` | 11 | 模型仓库 MODELREPO |
 | Monitor | `yicloud.services.monitor` | 1 | 监控中心 MONITOR |
 | OSS | `yicloud.services.oss` | 5 | 对象存储OSS |
 | RAY | `yicloud.services.ray` | 9 | 分布式计算 Ray |
-| Registry | `yicloud.services.registry` | 12 | 镜像仓库 REGISTRY |
+| Registry | `yicloud.services.registry` | 9 | 镜像仓库 REGISTRY |
+| Sandbox | `yicloud.services.sandbox` | 19 | 沙盒 SANDBOX |
 | Volume | `yicloud.services.volume` | 12 | 云盘管理 Volume |
-| Workspace | `yicloud.services.workspace` | 21 | 开发机 WS |
+| Workspace | `yicloud.services.workspace` | 20 | 开发机 WS |
 
 ## Project Structure
 
@@ -97,7 +98,7 @@ yicloud/                    # Main package
 │   ├── log/                # Logger
 │   ├── msgs/               # Response types (Rsp[T], Header, RspMeta)
 │   └── utils/              # Utilities
-└── services/               # Business services (14 services)
+└── services/               # Business services (15 services)
     ├── bc/         # 账单管理 BC
     ├── dataset/    # 数据集 DATASET
     ├── fs/         # 文件系统 FS
@@ -110,6 +111,7 @@ yicloud/                    # Main package
     ├── oss/        # 对象存储OSS
     ├── ray/        # 分布式计算 Ray
     ├── registry/   # 镜像仓库 REGISTRY
+    ├── sandbox/    # 沙盒 SANDBOX
     ├── volume/     # 云盘管理 Volume
     ├── workspace/  # 开发机 WS
 examples/                   # Example code (one per service)

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/pyproject.toml

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

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/version.py

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

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/yicloud/__init__.py

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

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/yicloud/base/__init__.py

@@ -4,6 +4,8 @@ from yicloud.base.client import (
     new_client,
     get,
     post,
+    get_async,
+    post_async,
     with_transport,
     with_http_client,
     with_host,
@@ -36,6 +38,8 @@ __all__ = [
     "new_credential",
     "get",
     "post",
+    "get_async",
+    "post_async",
     "with_transport",
     "with_http_client",
     "with_host",

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/yicloud/base/client.py

@@ -4,6 +4,7 @@ import time
 from pathlib import Path
 from typing import Any, Callable, Optional
 import requests
+import asyncio
 
 from yicloud.base import config, auth, errs, log, msgs, utils
 from yicloud.base.utils.retry import retry, with_attempts
@@ -166,6 +167,33 @@ def post(self, ctx: Context, path: str, body: Any, rsp: msgs.Response) -> None:
 Client.post = post
 
 
+async def get_async(self, ctx: Context, path: str, query: Any, rsp: msgs.Response) -> None:
+    """Async GET request.
+
+    Raises YiCloudException on error.
+    """
+    query_str = utils.build_query(query)
+    err = await self._request_async(ctx, "GET", path, query_str, None, rsp)
+    if err:
+        raise err
+
+
+Client.get_async = get_async
+
+
+async def post_async(self, ctx: Context, path: str, body: Any, rsp: msgs.Response) -> None:
+    """Async POST request.
+
+    Raises YiCloudException on error.
+    """
+    err = await self._request_async(ctx, "POST", path, "", body, rsp)
+    if err:
+        raise err
+
+
+Client.post_async = post_async
+
+
 def _request(
     self,
     ctx: Context,
@@ -229,6 +257,7 @@ def _request(
         "X-OGW-PUBLIC-KEY": self.crede.public_key,
         "X-OGW-TICK": tick_str,
         "X-OGW-SIGN": sign,
+        "X-OGW-REGION-ID": self.config.region_id,
     }
 
     # Execute request
@@ -315,3 +344,27 @@ def _request(
 
 # Add _request method to Client class
 Client._request = _request
+
+
+async def _request_async(
+    self,
+    ctx: Context,
+    method: str,
+    path: str,
+    query: str,
+    body: Any,
+    rsp: msgs.Response,
+) -> Optional[errs.YiCloudException]:
+    """
+    Core async request method.
+    Runs the synchronous _request in a thread pool executor to avoid blocking the event loop.
+
+    Returns None on success, or a YiCloudException on error.
+    """
+    loop = asyncio.get_running_loop()
+    return await loop.run_in_executor(
+        None, lambda: self._request(ctx, method, path, query, body, rsp)
+    )
+
+
+Client._request_async = _request_async

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/yicloud/base/config.py

@@ -13,12 +13,14 @@ class Config:
         timeout: float = 30.0,
         max_retries: int = 0,
         log_level: int = Level.WARN,
+        region_id: str = "",
     ):
         self.host = host
         self.user_agent = user_agent
         self.timeout = timeout
         self.max_retries = max_retries
         self.log_level = log_level
+        self.region_id = region_id
 
     def get_user_agent(self) -> str:
         return self.user_agent
@@ -31,6 +33,7 @@ class Config:
             timeout=30.0,
             max_retries=0,
             log_level=Level.WARN,
+            region_id="cn-shanghai",
         )
         cfg._apply_env()
         return cfg
@@ -53,6 +56,10 @@ class Config:
             except ValueError:
                 pass
 
+        v = os.getenv("YICLOUD_REGION_ID")
+        if v and v.strip():
+            self.region_id = v
+
     @staticmethod
     def new() -> "Config":
         return Config.new_default_config()

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/yicloud/base/msgs/__init__.py

@@ -62,10 +62,15 @@ def _dict_to_dataclass(target_type, data):
 
     field_types = get_type_hints(target_type)
 
+    # Map JSON key aliases (metadata={"json": ...}) to field names, so fields
+    # whose wire name collides with a Python keyword (e.g. "pass") still deserialize.
+    aliases = {f.metadata["json"]: f.name for f in fields(target_type) if "json" in f.metadata}
+
     kwargs = {}
     for key, value in data.items():
-        if key in field_types:
-            kwargs[key] = _convert_value(field_types[key], value)
+        name = key if key in field_types else aliases.get(key)
+        if name is not None:
+            kwargs[name] = _convert_value(field_types[name], value)
 
     return target_type(**kwargs)
 

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/yicloud/services/bc/__init__.py

@@ -10,6 +10,11 @@ from .actions import (
     list_billing_details,
     list_project_consolidations,
     list_tenant_consolidations,
+    get_overview_consolidation_async,
+    get_provision_consolidation_async,
+    list_billing_details_async,
+    list_project_consolidations_async,
+    list_tenant_consolidations_async,
 )
 
 # Re-export models

yicloud_sdk_python-0.4.0/yicloud/services/bc/actions.py

@@ -0,0 +1,160 @@
+# Code generated by generate_openapi.py. DO NOT EDIT.
+
+from typing import Optional
+from yicloud.base import msgs
+from yicloud.services.bc import models
+from yicloud.services.bc.client import client
+
+_PRODUCT_CODE = "bc"
+_LAST_VERSION = "v1alpha1"
+
+
+def get_overview_consolidation(ctx: Optional[dict], req: models.GetOverviewConsolidationReq) -> models.GetOverviewConsolidationData:
+    """查询总览维度月度账单
+    查询总览维度月度账单
+    GET /bc/v1alpha1/GetOverviewConsolidation
+    Action: GetOverviewConsolidation
+
+    Returns GetOverviewConsolidationData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/GetOverviewConsolidation"
+    rsp = msgs.Rsp[models.GetOverviewConsolidationData]()
+    client.base.get(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+async def get_overview_consolidation_async(ctx: Optional[dict], req: models.GetOverviewConsolidationReq) -> models.GetOverviewConsolidationData:
+    """查询总览维度月度账单（异步）
+    查询总览维度月度账单
+    GET /bc/v1alpha1/GetOverviewConsolidation
+    Action: GetOverviewConsolidation
+
+    Returns GetOverviewConsolidationData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/GetOverviewConsolidation"
+    rsp = msgs.Rsp[models.GetOverviewConsolidationData]()
+    await client.base.get_async(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+def get_provision_consolidation(ctx: Optional[dict], req: models.GetProvisionConsolidationReq) -> models.GetProvisionConsolidationData:
+    """查询供给方式维度月度账单
+    查询供给方式维度月度账单
+    GET /bc/v1alpha1/GetProvisionConsolidation
+    Action: GetProvisionConsolidation
+
+    Returns GetProvisionConsolidationData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/GetProvisionConsolidation"
+    rsp = msgs.Rsp[models.GetProvisionConsolidationData]()
+    client.base.get(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+async def get_provision_consolidation_async(ctx: Optional[dict], req: models.GetProvisionConsolidationReq) -> models.GetProvisionConsolidationData:
+    """查询供给方式维度月度账单（异步）
+    查询供给方式维度月度账单
+    GET /bc/v1alpha1/GetProvisionConsolidation
+    Action: GetProvisionConsolidation
+
+    Returns GetProvisionConsolidationData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/GetProvisionConsolidation"
+    rsp = msgs.Rsp[models.GetProvisionConsolidationData]()
+    await client.base.get_async(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+def list_billing_details(ctx: Optional[dict], req: models.ListBillingDetailsReq) -> models.ListBillingDetailsData:
+    """查询账单详情列表
+    查询账单明细列表或私有机器使用记录列表
+    GET /bc/v1alpha1/ListBillingDetails
+    Action: ListBillingDetails
+
+    Returns ListBillingDetailsData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/ListBillingDetails"
+    rsp = msgs.Rsp[models.ListBillingDetailsData]()
+    client.base.get(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+async def list_billing_details_async(ctx: Optional[dict], req: models.ListBillingDetailsReq) -> models.ListBillingDetailsData:
+    """查询账单详情列表（异步）
+    查询账单明细列表或私有机器使用记录列表
+    GET /bc/v1alpha1/ListBillingDetails
+    Action: ListBillingDetails
+
+    Returns ListBillingDetailsData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/ListBillingDetails"
+    rsp = msgs.Rsp[models.ListBillingDetailsData]()
+    await client.base.get_async(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+def list_project_consolidations(ctx: Optional[dict], req: models.ListProjectConsolidationsReq) -> models.ListProjectConsolidationsData:
+    """查询项目维度月度账单列表
+    查询项目维度月度账单列表
+    GET /bc/v1alpha1/ListProjectConsolidations
+    Action: ListProjectConsolidations
+
+    Returns ListProjectConsolidationsData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/ListProjectConsolidations"
+    rsp = msgs.Rsp[models.ListProjectConsolidationsData]()
+    client.base.get(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+async def list_project_consolidations_async(ctx: Optional[dict], req: models.ListProjectConsolidationsReq) -> models.ListProjectConsolidationsData:
+    """查询项目维度月度账单列表（异步）
+    查询项目维度月度账单列表
+    GET /bc/v1alpha1/ListProjectConsolidations
+    Action: ListProjectConsolidations
+
+    Returns ListProjectConsolidationsData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/ListProjectConsolidations"
+    rsp = msgs.Rsp[models.ListProjectConsolidationsData]()
+    await client.base.get_async(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+def list_tenant_consolidations(ctx: Optional[dict], req: models.ListTenantConsolidationsReq) -> models.ListTenantConsolidationsData:
+    """查询租户维度月度账单列表
+    查询租户维度月度账单列表
+    GET /bc/v1alpha1/ListTenantConsolidations
+    Action: ListTenantConsolidations
+
+    Returns ListTenantConsolidationsData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/ListTenantConsolidations"
+    rsp = msgs.Rsp[models.ListTenantConsolidationsData]()
+    client.base.get(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+
+
+async def list_tenant_consolidations_async(ctx: Optional[dict], req: models.ListTenantConsolidationsReq) -> models.ListTenantConsolidationsData:
+    """查询租户维度月度账单列表（异步）
+    查询租户维度月度账单列表
+    GET /bc/v1alpha1/ListTenantConsolidations
+    Action: ListTenantConsolidations
+
+    Returns ListTenantConsolidationsData on success. 
+    Raises YiCloudException on error.
+    """
+    path = f"/{_PRODUCT_CODE}/{_LAST_VERSION}/ListTenantConsolidations"
+    rsp = msgs.Rsp[models.ListTenantConsolidationsData]()
+    await client.base.get_async(ctx, path, req, rsp)
+    return rsp.get_typed_data()
+

{yicloud_sdk_python-0.3.1 → yicloud_sdk_python-0.4.0}/yicloud/services/dataset/__init__.py

@@ -15,6 +15,16 @@ from .actions import (
     list_data_sets,
     update_dataset,
     update_dataset_version,
+    create_dataset_async,
+    create_dataset_version_async,
+    delete_dataset_async,
+    delete_dataset_version_async,
+    get_dataset_async,
+    get_dataset_version_async,
+    list_dataset_versions_async,
+    list_data_sets_async,
+    update_dataset_async,
+    update_dataset_version_async,
 )
 
 # Re-export models