ucloud-sdk-python3 0.11.149__tar.gz → 0.11.150__tar.gz

{ucloud_sdk_python3-0.11.149 → ucloud_sdk_python3-0.11.150}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.149
+Version: 0.11.150
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 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: pytest>=4.6; extra == "dev"
 Requires-Dist: requests; extra == "dev"
+Requires-Dist: requests_mock; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: requests_mock; extra == "ci"
-Requires-Dist: sphinx; extra == "ci"
-Requires-Dist: requests; extra == "ci"
 Requires-Dist: pytest-cov; extra == "ci"
+Requires-Dist: requests_mock; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: pytest>=4.6; extra == "ci"
+Requires-Dist: requests; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

{ucloud_sdk_python3-0.11.149 → ucloud_sdk_python3-0.11.150}/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_sdk_python3-0.11.149 → ucloud_sdk_python3-0.11.150}/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_sdk_python3-0.11.149 → ucloud_sdk_python3-0.11.150}/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_sdk_python3-0.11.150/ucloud/version.py

@@ -0,0 +1 @@
+version = "0.11.150"

{ucloud_sdk_python3-0.11.149 → ucloud_sdk_python3-0.11.150}/ucloud_sdk_python3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.149
+Version: 0.11.150
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 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: pytest>=4.6; extra == "dev"
 Requires-Dist: requests; extra == "dev"
+Requires-Dist: requests_mock; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: requests_mock; extra == "ci"
-Requires-Dist: sphinx; extra == "ci"
-Requires-Dist: requests; extra == "ci"
 Requires-Dist: pytest-cov; extra == "ci"
+Requires-Dist: requests_mock; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: pytest>=4.6; extra == "ci"
+Requires-Dist: requests; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

ucloud_sdk_python3-0.11.149/ucloud/version.py

@@ -1 +0,0 @@
-version = "0.11.149"