ucloud-sdk-python3 0.11.149__py3-none-any.whl → 0.11.151__py3-none-any.whl

ucloud/services/sandbox/client.py

@@ -54,7 +54,7 @@ class SandboxClient(Client):
 
         - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
         - **Region** (str) - (Config) 地域。 参见  `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
-        - **APIKey** (str) - (Required) 密钥
+        - **APIKey** (str) - (Required)
         - **AccessCode** (str) - (Required) 访问码
         - **KeyID** (str) - (Required) 密钥ID
         - **Name** (str) - (Required) 站点空间名称
@@ -228,7 +228,6 @@ class SandboxClient(Client):
         - **Region** (str) - (Config) 地域。 参见  `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
         - **SandboxID** (str) - (Required) 站点沙箱ID
         - **Zone** (str) - (Required) 可用区。参见  `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
-        - **APIKey** (str) - 更新站点空间API Key
         - **AccessCode** (str) - 访问码
         - **Envs** (str) - 更新站点空间环境变量，格式为["Key=Value"]
         - **IPAccess** (dict) - 见 **UpdateSandboxSiteParamIPAccess** 模型定义

ucloud/services/sandbox/schemas/apis.py

@@ -46,7 +46,9 @@ class CreateSandboxSiteRequestSchema(schema.RequestSchema):
     """CreateSandboxSite - 创建站点空间"""
 
     fields = {
-        "APIKey": fields.Str(required=True, dump_to="APIKey"),
+        "APIKey": fields.Str(
+            required=True, dump_to="APIKey"
+        ),  # Deprecated, will be removed at 1.0
         "AccessCode": fields.Str(required=True, dump_to="AccessCode"),
         "Envs": fields.Str(required=False, dump_to="Envs"),
         "KeyID": fields.Str(required=True, dump_to="KeyID"),
@@ -164,7 +166,9 @@ class UpdateSandboxSiteRequestSchema(schema.RequestSchema):
     """UpdateSandboxSite - 更新站点空间"""
 
     fields = {
-        "APIKey": fields.Str(required=False, dump_to="APIKey"),
+        "APIKey": fields.Str(
+            required=False, dump_to="APIKey"
+        ),  # Deprecated, will be removed at 1.0
         "AccessCode": fields.Str(required=False, dump_to="AccessCode"),
         "Envs": fields.Str(required=False, dump_to="Envs"),
         "IPAccess": UpdateSandboxSiteParamIPAccessSchema(

ucloud/services/sandbox/schemas/models.py

@@ -3,21 +3,21 @@
 from ucloud.core.typesystem import schema, fields
 
 
-class SiteIPAccessSchema(schema.ResponseSchema):
-    """SiteIPAccess - 站点空间-访问设置-IP限制"""
+class SiteResourceSchema(schema.ResponseSchema):
+    """SiteResource - 站点资源"""
 
     fields = {
-        "IPList": fields.List(fields.Str()),
-        "Mode": fields.Str(required=False, load_from="Mode"),
+        "CPU": fields.Int(required=True, load_from="CPU"),
+        "MemoryMB": fields.Int(required=True, load_from="MemoryMB"),
     }
 
 
-class SiteResourceSchema(schema.ResponseSchema):
-    """SiteResource - 站点资源"""
+class SiteIPAccessSchema(schema.ResponseSchema):
+    """SiteIPAccess - 站点空间-访问设置-IP限制"""
 
     fields = {
-        "CPU": fields.Int(required=True, load_from="CPU"),
-        "MemoryMB": fields.Int(required=True, load_from="MemoryMB"),
+        "IPList": fields.List(fields.Str()),
+        "Mode": fields.Str(required=False, load_from="Mode"),
     }
 
 

ucloud/services/ulogservice/client.py

@@ -306,6 +306,46 @@ class ULogServiceClient(Client):
         resp = self.invoke("DeleteULogServiceTopic", d, **kwargs)
         return apis.DeleteULogServiceTopicResponseSchema().loads(resp)
 
+    def describe_u_log_service_log_set(
+        self, req: typing.Optional[dict] = None, **kwargs
+    ) -> dict:
+        """DescribeULogServiceLogSet - 获取日志集信息
+
+        **Request**
+
+        - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
+        - **Region** (str) - (Config) 地域。 参见  `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
+        - **LogSetId** (str) - (Required) 日志集ID
+        - **Zone** (str) - (Required) 可用区。参见  `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
+
+        **Response**
+
+        - **LogSetInfo** (dict) - 见 **LogSetInfo** 模型定义
+        - **TotalCount** (int) - 日志集总数
+
+        **Response Model**
+
+        **LogSetInfo**
+        - **CreateTime** (int) - 创建时间
+        - **LogSetId** (str) - 日志集ID
+        - **LogSetName** (str) - 日志集名称
+        - **LogSetRemark** (str) - 日志集备注
+        - **TopicCount** (int) - 日志集下主题数量
+        - **UpdateTime** (int) - 更新时间
+
+
+        """
+        # build request
+        d = {
+            "ProjectId": self.config.project_id,
+            "Region": self.config.region,
+        }
+        req and d.update(req)
+        d = apis.DescribeULogServiceLogSetRequestSchema().dumps(d)
+
+        resp = self.invoke("DescribeULogServiceLogSet", d, **kwargs)
+        return apis.DescribeULogServiceLogSetResponseSchema().loads(resp)
+
     def describe_u_log_service_machine_group(
         self, req: typing.Optional[dict] = None, **kwargs
     ) -> dict:
@@ -355,6 +395,44 @@ class ULogServiceClient(Client):
         resp = self.invoke("DescribeULogServiceMachineGroup", d, **kwargs)
         return apis.DescribeULogServiceMachineGroupResponseSchema().loads(resp)
 
+    def describe_u_log_service_topic(
+        self, req: typing.Optional[dict] = None, **kwargs
+    ) -> dict:
+        """DescribeULogServiceTopic - 获取ULogService主题详情
+
+        **Request**
+
+        - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
+        - **Region** (str) - (Config) 地域。 参见  `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
+        - **TopicId** (str) - (Required) 主题Id
+
+        **Response**
+
+        - **Data** (dict) - 见 **TopicInfo** 模型定义
+
+        **Response Model**
+
+        **TopicInfo**
+        - **IsReserved** (int) - 是否保留：0 - NORMAL, 1 - RESERVED
+        - **ReserveAge** (int) - 保存时间 1~730 天
+        - **State** (str) - 日志主题状态
+        - **TopicId** (str) - 主题ID
+        - **TopicName** (str) - 主题名称
+        - **TopicShardNum** (int) - 分区数量，固定是2
+
+
+        """
+        # build request
+        d = {
+            "ProjectId": self.config.project_id,
+            "Region": self.config.region,
+        }
+        req and d.update(req)
+        d = apis.DescribeULogServiceTopicRequestSchema().dumps(d)
+
+        resp = self.invoke("DescribeULogServiceTopic", d, **kwargs)
+        return apis.DescribeULogServiceTopicResponseSchema().loads(resp)
+
     def get_u_log_service_topic_field(
         self, req: typing.Optional[dict] = None, **kwargs
     ) -> dict:
@@ -555,7 +633,7 @@ class ULogServiceClient(Client):
         **TopicInfo**
         - **IsReserved** (int) - 是否保留：0 - NORMAL, 1 - RESERVED
         - **ReserveAge** (int) - 保存时间 1~730 天
-        - **TopicDesc** (str) - 主题描述
+        - **State** (str) - 日志主题状态
         - **TopicId** (str) - 主题ID
         - **TopicName** (str) - 主题名称
         - **TopicShardNum** (int) - 分区数量，固定是2

ucloud/services/ulogservice/schemas/apis.py

@@ -271,6 +271,33 @@ class DeleteULogServiceTopicResponseSchema(schema.ResponseSchema):
     }
 
 
+"""
+API: DescribeULogServiceLogSet
+
+获取日志集信息
+"""
+
+
+class DescribeULogServiceLogSetRequestSchema(schema.RequestSchema):
+    """DescribeULogServiceLogSet - 获取日志集信息"""
+
+    fields = {
+        "LogSetId": fields.Str(required=True, dump_to="LogSetId"),
+        "ProjectId": fields.Str(required=False, dump_to="ProjectId"),
+        "Region": fields.Str(required=True, dump_to="Region"),
+        "Zone": fields.Str(required=True, dump_to="Zone"),
+    }
+
+
+class DescribeULogServiceLogSetResponseSchema(schema.ResponseSchema):
+    """DescribeULogServiceLogSet - 获取日志集信息"""
+
+    fields = {
+        "LogSetInfo": models.LogSetInfoSchema(),
+        "TotalCount": fields.Int(required=True, load_from="TotalCount"),
+    }
+
+
 """
 API: DescribeULogServiceMachineGroup
 
@@ -298,6 +325,31 @@ class DescribeULogServiceMachineGroupResponseSchema(schema.ResponseSchema):
     }
 
 
+"""
+API: DescribeULogServiceTopic
+
+获取ULogService主题详情
+"""
+
+
+class DescribeULogServiceTopicRequestSchema(schema.RequestSchema):
+    """DescribeULogServiceTopic - 获取ULogService主题详情"""
+
+    fields = {
+        "ProjectId": fields.Str(required=False, dump_to="ProjectId"),
+        "Region": fields.Str(required=True, dump_to="Region"),
+        "TopicId": fields.Str(required=True, dump_to="TopicId"),
+    }
+
+
+class DescribeULogServiceTopicResponseSchema(schema.ResponseSchema):
+    """DescribeULogServiceTopic - 获取ULogService主题详情"""
+
+    fields = {
+        "Data": models.TopicInfoSchema(),
+    }
+
+
 """
 API: GetULogServiceTopicField
 

ucloud/services/ulogservice/schemas/models.py

@@ -3,6 +3,19 @@
 from ucloud.core.typesystem import schema, fields
 
 
+class LogSetInfoSchema(schema.ResponseSchema):
+    """LogSetInfo - 日志集信息"""
+
+    fields = {
+        "CreateTime": fields.Int(required=False, load_from="CreateTime"),
+        "LogSetId": fields.Str(required=False, load_from="LogSetId"),
+        "LogSetName": fields.Str(required=False, load_from="LogSetName"),
+        "LogSetRemark": fields.Str(required=False, load_from="LogSetRemark"),
+        "TopicCount": fields.Int(required=False, load_from="TopicCount"),
+        "UpdateTime": fields.Int(required=False, load_from="UpdateTime"),
+    }
+
+
 class LogAgentSchema(schema.ResponseSchema):
     """LogAgent - logagent 信息"""
 
@@ -29,6 +42,22 @@ class MachineInfoSchema(schema.ResponseSchema):
     }
 
 
+class TopicInfoSchema(schema.ResponseSchema):
+    """TopicInfo - 主题信息"""
+
+    fields = {
+        "IsReserved": fields.Int(required=False, load_from="IsReserved"),
+        "ReserveAge": fields.Int(required=False, load_from="ReserveAge"),
+        "State": fields.Str(required=False, load_from="State"),
+        "TopicDesc": fields.Str(
+            required=False, load_from="TopicDesc"
+        ),  # Deprecated, will be removed at 1.0
+        "TopicId": fields.Str(required=False, load_from="TopicId"),
+        "TopicName": fields.Str(required=False, load_from="TopicName"),
+        "TopicShardNum": fields.Int(required=False, load_from="TopicShardNum"),
+    }
+
+
 class TopicFieldSchema(schema.ResponseSchema):
     """TopicField - 索引字段"""
 
@@ -83,29 +112,12 @@ class CollectConfSchema(schema.ResponseSchema):
     }
 
 
-class LogSetInfoSchema(schema.ResponseSchema):
-    """LogSetInfo - 日志集信息"""
-
-    fields = {
-        "CreateTime": fields.Int(required=False, load_from="CreateTime"),
-        "LogSetId": fields.Str(required=False, load_from="LogSetId"),
-        "LogSetName": fields.Str(required=False, load_from="LogSetName"),
-        "LogSetRemark": fields.Str(required=False, load_from="LogSetRemark"),
-        "TopicCount": fields.Int(required=False, load_from="TopicCount"),
-        "UpdateTime": fields.Int(required=False, load_from="UpdateTime"),
-    }
-
-
-class TopicInfoSchema(schema.ResponseSchema):
-    """TopicInfo - 主题信息"""
+class AnalysisFieldSchema(schema.ResponseSchema):
+    """AnalysisField - 统计分析结果字段头"""
 
     fields = {
-        "IsReserved": fields.Int(required=False, load_from="IsReserved"),
-        "ReserveAge": fields.Int(required=False, load_from="ReserveAge"),
-        "TopicDesc": fields.Str(required=False, load_from="TopicDesc"),
-        "TopicId": fields.Str(required=False, load_from="TopicId"),
-        "TopicName": fields.Str(required=False, load_from="TopicName"),
-        "TopicShardNum": fields.Int(required=False, load_from="TopicShardNum"),
+        "Name": fields.Str(required=True, load_from="Name"),
+        "Type": fields.Str(required=True, load_from="Type"),
     }
 
 
@@ -121,15 +133,6 @@ class LogContentSchema(schema.ResponseSchema):
     }
 
 
-class AnalysisFieldSchema(schema.ResponseSchema):
-    """AnalysisField - 统计分析结果字段头"""
-
-    fields = {
-        "Name": fields.Str(required=True, load_from="Name"),
-        "Type": fields.Str(required=True, load_from="Type"),
-    }
-
-
 class LogQueryResultSchema(schema.ResponseSchema):
     """LogQueryResult - 日志检索结果"""
 

ucloud/version.py

@@ -1 +1 @@
-version = "0.11.149"
+version = "0.11.151"

{ucloud_sdk_python3-0.11.149.dist-info → ucloud_sdk_python3-0.11.151.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.149
+Version: 0.11.151
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -22,20 +22,20 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
 Provides-Extra: ci
+Requires-Dist: pytest>=4.6; extra == "ci"
 Requires-Dist: requests-mock; extra == "ci"
+Requires-Dist: flake8>=3.6.0; extra == "ci"
 Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: requests; extra == "ci"
 Requires-Dist: pytest-cov; extra == "ci"
-Requires-Dist: flake8>=3.6.0; extra == "ci"
-Requires-Dist: pytest>=4.6; extra == "ci"
 Provides-Extra: dev
-Requires-Dist: requests-mock; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: pytest>=4.6; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8>=3.6.0; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: requests; extra == "dev"
+Requires-Dist: requests-mock; extra == "dev"
+Requires-Dist: black; extra == "dev"
 Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"

{ucloud_sdk_python3-0.11.149.dist-info → ucloud_sdk_python3-0.11.151.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ucloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ucloud/client.py,sha256=-BJGM-ulXMVFaj_-fHQkZlB5tu7f3bpZPxpUqFDuii8,14782
-ucloud/version.py,sha256=SBfjPmmfQlC5nRJidHoH-OEX_0W3D7aekazUbsebDOc,21
+ucloud/version.py,sha256=cCgd_3J-qwg2u1ZM3eBQDQKqv3cgAOvFMQYxHscKWk8,21
 ucloud/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ucloud/core/auth/__init__.py,sha256=yO69G6m3hTfWQZzqFmZJEe0-JXw6JKTHTDJu7goX_QU,71
 ucloud/core/auth/_cfg.py,sha256=7Zsv7bKxJ6NtxeR_VE9jldLh-iIy0ERvkr2AuvLESZY,2115
@@ -68,10 +68,10 @@ ucloud/services/pathx/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 ucloud/services/pathx/schemas/apis.py,sha256=VxXzxbV0Mt-dqK4XwuqevSOk7r3uKJ-QQZngvCTNxk0,35617
 ucloud/services/pathx/schemas/models.py,sha256=rKNRXmA3VuIrwKG80tq3Q482hEmUOioSqxgoL-PsObs,16225
 ucloud/services/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ucloud/services/sandbox/client.py,sha256=ghnxf1t3YYAYNalgOnfUf1vkVXbB8k7mWHygE-akf9g,11554
+ucloud/services/sandbox/client.py,sha256=_GxIbW6vEHl3fFZgjfRWD0FRj9JQWGaRRtqPg2Ruqbc,11492
 ucloud/services/sandbox/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ucloud/services/sandbox/schemas/apis.py,sha256=cBKsHFFgS_mwQzNBlEFfAkONu3q2-Xu3Veo0osZk3dM,5850
-ucloud/services/sandbox/schemas/models.py,sha256=n9CW8Tirs7aHrn6bNb2ETRU6aOYscaQ4RZUeEDIhL8U,1665
+ucloud/services/sandbox/schemas/apis.py,sha256=N1iynFuA7MDmFbShz5a31EWQqQ8GbO-Al90_sh2DT3U,5970
+ucloud/services/sandbox/schemas/models.py,sha256=aI3lCon7qP1kYvMNXa7wsU40MLkOb81Iso7gBCAf2xY,1665
 ucloud/services/ses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ucloud/services/ses/client.py,sha256=tuit4ZHx03WMuAbOqhuNht_W7bC0twBivxqdNtY0KrU,7395
 ucloud/services/ses/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -253,10 +253,10 @@ ucloud/services/ulighthost/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 ucloud/services/ulighthost/schemas/apis.py,sha256=d071A6P8Hh5gSs64XH1As6soKEfkzpRysF3SPBZqFV0,13695
 ucloud/services/ulighthost/schemas/models.py,sha256=H25HU6VWGlMLJcMABWtOJLcbhLyBT9YkVD7JBoPpTVo,5994
 ucloud/services/ulogservice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ucloud/services/ulogservice/client.py,sha256=7L1YNh7vcC2q2fVsaj0-zBqfhC2_KnWX3JKdPSMuFLw,34212
+ucloud/services/ulogservice/client.py,sha256=B_QjychwIY0CIKdAmr99DaX0F95M9eVcRqJgXpNZUOQ,37213
 ucloud/services/ulogservice/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ucloud/services/ulogservice/schemas/apis.py,sha256=Efd4Zy4IPCvXZi7d_1xUJDMKI9q678vY0uL6gPIpV40,17918
-ucloud/services/ulogservice/schemas/models.py,sha256=GlOvu9MjI8Q0oV6QSh9zyk3emAFarP2spWMPKDtXBgU,5746
+ucloud/services/ulogservice/schemas/apis.py,sha256=6Bw_UHDrP7er2A_6FAP0bAoCOnPNb7G1khRNMzH9Tik,19298
+ucloud/services/ulogservice/schemas/models.py,sha256=RDJRL7fqzWf30TXgWq76u_Yn87UK86ot0Bg84i3ESjs,5870
 ucloud/services/umem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ucloud/services/umem/client.py,sha256=O5l_V2pGfQApgfalL5VINVDZXfHR1idVz6X1QhLRhLc,97128
 ucloud/services/umem/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -343,8 +343,8 @@ ucloud/testing/driver/__init__.py,sha256=54MLBVRxmiRLl0NLnP5dBi7abADTzWT3hJTgWxD
 ucloud/testing/driver/_scenario.py,sha256=9L8TTuPRTRIAowNT9fe8lX-dx3QHPxVuVXlBRkKJs-Y,2585
 ucloud/testing/driver/_specification.py,sha256=FaKgkqsZJej7cTPp6-YjbNotR13mUZvRJlsnxxhUCMs,1726
 ucloud/testing/driver/_step.py,sha256=rK9PN4Hu20eD4ol7jV8KAIqfdwTXKEj9nJoXd_tzHpE,5443
-ucloud_sdk_python3-0.11.149.dist-info/LICENSE,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
-ucloud_sdk_python3-0.11.149.dist-info/METADATA,sha256=MG2UuM9cruHM6EU75KJQsHJoWLHKb6RMSeLu35oYuaE,2876
-ucloud_sdk_python3-0.11.149.dist-info/WHEEL,sha256=BNRMDyzLkkcmlv0J8ppDQkk2VED33SesJDynr9ED1gc,91
-ucloud_sdk_python3-0.11.149.dist-info/top_level.txt,sha256=zDw9C3GldC2mbAz2YzUcVbMsPS4MYmWmXnGeYcoIeJI,7
-ucloud_sdk_python3-0.11.149.dist-info/RECORD,,
+ucloud_sdk_python3-0.11.151.dist-info/LICENSE,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
+ucloud_sdk_python3-0.11.151.dist-info/METADATA,sha256=rDoX2wx82UhX2jtnC4ldcHpzFSoYbRLxik8wZ6aJGMY,2876
+ucloud_sdk_python3-0.11.151.dist-info/WHEEL,sha256=BNRMDyzLkkcmlv0J8ppDQkk2VED33SesJDynr9ED1gc,91
+ucloud_sdk_python3-0.11.151.dist-info/top_level.txt,sha256=zDw9C3GldC2mbAz2YzUcVbMsPS4MYmWmXnGeYcoIeJI,7
+ucloud_sdk_python3-0.11.151.dist-info/RECORD,,