aihc-dev-12971 [Task] 【python sdk】服务扩缩容和配置公网访问接口

Change-Id: I962984eb3b725e04447d876be13b7225646f1405

Author: v_suiyufei

baidubce/services/aihc/modules/service/service_client.py

@@ -245,31 +245,31 @@ def ModifyServiceReplicas(
         instanceCount: int
     ):
         """
-        扩缩容在线服务。
+        服务扩缩容。
 
-        参考文档：https://cloud.baidu.com/doc/AIHC/s/Omb4vbjhh
+        参考文档：https://cloud.baidu.com/doc/AIHC/s/4mb4vaipm
 
         Args:
-            serviceId: 服务ID（必填）
-            instanceCount: 实例数量（必填）
+            serviceId: 服务ID（必填，Query参数）
+            instanceCount: 实例数量（必填，Query参数）
 
         Returns:
             baidubce.bce_response.BceResponse: 扩缩容结果
+
+        Raises:
+            BceHttpClientError: 当API调用失败时抛出
+            BceServerError: 当服务器返回错误时抛出
         """
         path = b'/'
         params = {
             'action': 'ModifyServiceReplicas',
             'serviceId': serviceId,
-        }
-
-        body = {
-            'instanceCount': instanceCount,
+            'instanceCount': instanceCount
         }
 
         return self._send_request(
             http_methods.POST,
             path,
-            body=json.dumps(body),
             params=params
         )
 
@@ -425,12 +425,16 @@ def ModifyServiceNetConfig(
         参考文档：https://cloud.baidu.com/doc/AIHC/s/Gmb4vgurj
 
         Args:
-            serviceId: 服务ID（必填）
-            publicAccess: 是否开启公网访问（必填）
-            eip: 弹性公网IP（可选）
+            serviceId: 服务ID（必填，Query参数）
+            publicAccess: 是否开启公网访问（必填，Query参数）
+            eip: 弹性公网IP（可选，Query参数）
 
         Returns:
             baidubce.bce_response.BceResponse: 公网访问配置结果
+
+        Raises:
+            BceHttpClientError: 当API调用失败时抛出
+            BceServerError: 当服务器返回错误时抛出
         """
         path = b'/'
         params = {

baidubce/services/aihc/modules/service/service_model.py

@@ -32,10 +32,10 @@ class ResourcePoolConf(dict):
 
     def __init__(
         self,
-        resourcePoolId: str,
-        queueName: str,
-        resourcePoolType: str,
-        resourcePoolName: str
+        resourcePoolId,  # type: str
+        queueName,  # type: str
+        resourcePoolType,  # type: str
+        resourcePoolName  # type: str
     ):
         super().__init__()
         self["resourcePoolId"] = resourcePoolId
@@ -52,7 +52,7 @@ class PFSConfig(dict):
         InstanceId (str): PFS实例ID（如"pfs-12345"）
     """
 
-    def __init__(self, sourcePath: str, InstanceId: str):
+    def __init__(self, sourcePath, InstanceId):
         super().__init__()
         self["sourcePath"] = sourcePath
         self["InstanceId"] = InstanceId
@@ -72,9 +72,9 @@ class VolumnConf(dict):
 
     def __init__(
             self,
-            volumeType: str,
-            volumnName: str,
-            pfs: Optional[dict] = None
+            volumeType,  # type: str
+            volumnName,  # type: str
+            pfs,  # type: Optional[dict] = None
     ):
         super().__init__()
         self["volumeType"] = volumeType
@@ -92,8 +92,8 @@ class StorageConf(dict):
 
     def __init__(
             self,
-            shmSize: Optional[int] = None,
-            volumns: Optional[List[dict]] = None
+            shmSize, # type: Optional[int] = None,
+            volumns # type: Optional[List[dict]] = None
     ):
         super().__init__()
         if shmSize is not None:
@@ -116,10 +116,10 @@ class ImageConf(dict):
 
     def __init__(
             self,
-            imageType: int,
-            imageUrl: str,
-            username: Optional[str] = None,
-            password: Optional[str] = None
+            imageType,  # type: int
+            imageUrl,  # type: str
+            username,  # type: Optional[str]
+            password   # type: Optional[str]
     ):
         super().__init__()
         self["imageType"] = imageType
@@ -136,7 +136,7 @@ class ExecAction(dict):
         command (list): 要执行的命令数组（如["/bin/sh", "-c", "echo ready"]）
     """
 
-    def __init__(self, command: list):
+    def __init__(self, command):  # type: list
         super().__init__()
         self["command"] = command
 
@@ -148,7 +148,7 @@ class HTTPGetAction(dict):
         port (int): 请求端口号（如8080）
     """
 
-    def __init__(self, path: str, port: int):
+    def __init__(self, path, port):  # type: (str, int)
         super().__init__()
         self["path"] = path
         self["port"] = port
@@ -160,7 +160,7 @@ class TCPSocketAction(dict):
         port (int): 要检查的端口号
     """
 
-    def __init__(self, port: int):
+    def __init__(self, port):  # type: int
         super().__init__()
         self["port"] = port
 
@@ -177,9 +177,9 @@ class ProbeHandlerConf(dict):
 
     def __init__(
             self,
-            exec: Optional[dict] = None,
-            httpGet: Optional[dict] = None,
-            tcpSocketAction: Optional[dict] = None
+            exec, # type: Optional[dict]
+            httpGet, # type: Optional[dict]
+            tcpSocketAction # type: Optional[dict]
     ):
         super().__init__()
         if exec is not None:
@@ -203,12 +203,12 @@ class ProbeConf(dict):
 
     def __init__(
             self,
-            initialDelaySeconds: int,
-            timeoutSeconds: int,
-            periodSeconds: int,
-            successThreshold: int,
-            failureThreshold: int,
-            handler: dict
+            initialDelaySeconds,  # type: int
+            timeoutSeconds,       # type: int
+            periodSeconds,        # type: int
+            successThreshold,     # type: int
+            failureThreshold,     # type: int
+            handler               # type: dict
     ):
         super().__init__()
         self["initialDelaySeconds"] = initialDelaySeconds
@@ -240,19 +240,19 @@ class ContainerConf(dict):
 
     def __init__(
             self,
-            name: str,
-            cpus: int,
-            memory: int,
-            acceleratorCount: int,
-            image: dict,
-            command: Optional[list] = None,
-            runArgs: Optional[list] = None,
-            ports: Optional[list] = None,
-            envs: Optional[dict] = None,
-            volumeMounts: Optional[list] = None,
-            readinessProbe: Optional[dict] = None,
-            startupsProbe: Optional[dict] = None,
-            livenessProbe: Optional[dict] = None
+            name,  # type: str
+            cpus,  # type: int
+            memory,  # type: int
+            acceleratorCount,  # type: int
+            image,  # type: dict
+            command,  # type: Optional[list]
+            runArgs,  # type: Optional[list]
+            ports,  # type: Optional[list]
+            envs,  # type: Optional[dict]
+            volumeMounts,  # type: Optional[list]
+            readinessProbe,  # type: Optional[dict]
+            startupsProbe,  # type: Optional[dict]
+            livenessProbe   # type: Optional[dict]
     ):
         super().__init__()
         self["name"] = name
@@ -286,7 +286,7 @@ class AiGatewayConf(dict):
         enableAuth (bool): 是否开启鉴权（True/False）
     """
 
-    def __init__(self, enableAuth: bool):
+    def __init__(self, enableAuth):  # type: bool
         super().__init__()
         self["enableAuth"] = enableAuth
 
@@ -303,10 +303,10 @@ class AccessConf(dict):
 
     def __init__(
             self,
-            publicAccess: Optional[bool] = None,
-            eip: Optional[str] = None,
-            aiGateway: Optional[dict] = None,
-            networkType: Optional[str] = None
+            publicAccess,  # type: Optional[bool]
+            eip,           # type: Optional[str]
+            aiGateway,     # type: Optional[dict]
+            networkType    # type: Optional[str]
     ):
         super().__init__()
         if publicAccess is not None:
@@ -326,7 +326,7 @@ class LogConf(dict):
         persistent (Optional[bool]): 是否持久化容器标准输出日志（默认False）
     """
 
-    def __init__(self, persistent: Optional[bool] = None):
+    def __init__(self, persistent=None):  # type: Optional[bool]
         super().__init__()
         if persistent is not None:  # 日志持久化开关
             self["persistent"] = persistent
@@ -344,8 +344,8 @@ class CanaryStrategyConf(dict):
 
     def __init__(
             self,
-            maxSurge: Optional[int] = None,
-            maxUnavailable: Optional[int] = None
+            maxSurge,       # type: Optional[int]
+            maxUnavailable  # type: Optional[int]
     ):
         super().__init__()
         if maxSurge is not None:
@@ -361,7 +361,7 @@ class ScheduleConf(dict):
         priority (str): 优先级（"high"/"normal"/"low"）
     """
 
-    def __init__(self, priority: str):
+    def __init__(self, priority):  # type: str
         super().__init__()
         self["priority"] = priority
 
@@ -399,11 +399,11 @@ class Misc(dict):
 
     def __init__(
             self,
-            podLabels: Optional[dict] = None,
-            podAnnotations: Optional[dict] = None,
-            gracePeriodSec: Optional[int] = None,
-            fedPodsPerIns: Optional[int] = None,
-            enableRDMA: Optional[bool] = None
+            podLabels,      # type: Optional[dict]
+            podAnnotations, # type: Optional[dict]
+            gracePeriodSec, # type: Optional[int]
+            fedPodsPerIns,  # type: Optional[int]
+            enableRDMA      # type: Optional[bool]
     ):
         super().__init__()
         if podLabels is not None:
@@ -437,17 +437,17 @@ class ServiceConf(dict):
 
     def __init__(
             self,
-            name: str,
-            acceleratorType: str,
-            workloadType: str,
-            instanceCount: int,
-            resourcePool: dict,
-            containers: List[dict],
-            storage: Optional[dict] = None,
-            access: Optional[dict] = None,
-            log: Optional[dict] = None,
-            deploy: Optional[dict] = None,
-            misc: Optional[dict] = None
+            name,            # type: str
+            acceleratorType, # type: str
+            workloadType,    # type: str
+            instanceCount,   # type: int
+            resourcePool,    # type: dict
+            containers,      # type: List[dict]
+            storage,    # type: Optional[dict]
+            access,     # type: Optional[dict]
+            log,        # type: Optional[dict]
+            deploy,     # type: Optional[dict]
+            misc        # type: Optional[dict]
     ):
         super().__init__()
         self["name"] = name
@@ -485,15 +485,15 @@ class ModifyServiceConf(dict):
 
     def __init__(
             self,
-            name: str,
-            acceleratorType: str,
-            instanceCount: int,
-            resourcePool: dict,
-            containers: List[dict],
-            storage: Optional[dict] = None,
-            log: Optional[dict] = None,
-            deploy: Optional[dict] = None,
-            misc: Optional[dict] = None
+            name,            # type: str
+            acceleratorType, # type: str
+            instanceCount,   # type: int
+            resourcePool,    # type: dict
+            containers,      # type: List[dict]
+            storage,    # type: Optional[dict]
+            log,        # type: Optional[dict]
+            deploy,     # type: Optional[dict]
+            misc     # type: Optional[dict]
     ):
         super().__init__()
         self["name"] = name

sample/aihc/aihc_service_sample.py

@@ -371,6 +371,34 @@ def main():
     #     else:
     #         __logger.error('send request failed. Unknown exception: %s' % e)
 
+    # # 服务扩缩容
+    # try:
+    #     __logger.info('-----------------------ModifyServiceReplicas start...-----------------------------')
+    #     service_id = "s-xxx"
+    #     response = aihc_client.service.ModifyServiceReplicas(serviceId=service_id, instanceCount=2)
+    #     print(json.dumps(to_dict(response), ensure_ascii=False))
+    #     __logger.info('ModifyServiceReplicas: %s', response.__dict__.keys())
+    # except BceHttpClientError as e:
+    #     if isinstance(e.last_error, BceServerError):
+    #         __logger.error('send request failed. Response %s, code: %s, msg: %s'
+    #                        % (e.last_error.status_code, e.last_error.code, str(e.last_error)))
+    #     else:
+    #         __logger.error('send request failed. Unknown exception: %s' % e)
+
+    # # 配置公网访问
+    # try:
+    #     __logger.info('------------------------ModifyServiceNetConfig start...-----------------------------')
+    #     service_id = "s-xxx"
+    #     response = aihc_client.service.ModifyServiceNetConfig(serviceId=service_id, publicAccess=False)
+    #     print(json.dumps(to_dict(response), ensure_ascii=False))
+    #     __logger.info('ModifyServiceNetConfig: %s', response.__dict__.keys())
+    # except BceHttpClientError as e:
+    #     if isinstance(e.last_error, BceServerError):
+    #         __logger.error('send request failed. Response %s, code: %s, msg: %s'
+    #                        % (e.last_error.status_code, e.last_error.code, str(e.last_error)))
+    #     else:
+    #         __logger.error('send request failed. Unknown exception: %s' % e)
+
     # # 删除服务
     # try:
     #     __logger.info('----------------DeleteService start...-----------------------------')