Skip to content

Commit d3f8aea

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.150 (#383)
1 parent 6a2acbe commit d3f8aea

4 files changed

Lines changed: 165 additions & 32 deletions

File tree

‎ucloud/services/ulogservice/client.py‎

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,46 @@ def delete_u_log_service_topic(
306306
resp = self.invoke("DeleteULogServiceTopic", d, **kwargs)
307307
return apis.DeleteULogServiceTopicResponseSchema().loads(resp)
308308

309+
def describe_u_log_service_log_set(
310+
self, req: typing.Optional[dict] = None, **kwargs
311+
) -> dict:
312+
"""DescribeULogServiceLogSet - 获取日志集信息
313+
314+
**Request**
315+
316+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
317+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
318+
- **LogSetId** (str) - (Required) 日志集ID
319+
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
320+
321+
**Response**
322+
323+
- **LogSetInfo** (dict) - 见 **LogSetInfo** 模型定义
324+
- **TotalCount** (int) - 日志集总数
325+
326+
**Response Model**
327+
328+
**LogSetInfo**
329+
- **CreateTime** (int) - 创建时间
330+
- **LogSetId** (str) - 日志集ID
331+
- **LogSetName** (str) - 日志集名称
332+
- **LogSetRemark** (str) - 日志集备注
333+
- **TopicCount** (int) - 日志集下主题数量
334+
- **UpdateTime** (int) - 更新时间
335+
336+
337+
"""
338+
# build request
339+
d = {
340+
"ProjectId": self.config.project_id,
341+
"Region": self.config.region,
342+
}
343+
req and d.update(req)
344+
d = apis.DescribeULogServiceLogSetRequestSchema().dumps(d)
345+
346+
resp = self.invoke("DescribeULogServiceLogSet", d, **kwargs)
347+
return apis.DescribeULogServiceLogSetResponseSchema().loads(resp)
348+
309349
def describe_u_log_service_machine_group(
310350
self, req: typing.Optional[dict] = None, **kwargs
311351
) -> dict:
@@ -355,6 +395,44 @@ def describe_u_log_service_machine_group(
355395
resp = self.invoke("DescribeULogServiceMachineGroup", d, **kwargs)
356396
return apis.DescribeULogServiceMachineGroupResponseSchema().loads(resp)
357397

398+
def describe_u_log_service_topic(
399+
self, req: typing.Optional[dict] = None, **kwargs
400+
) -> dict:
401+
"""DescribeULogServiceTopic - 获取ULogService主题详情
402+
403+
**Request**
404+
405+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
406+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
407+
- **TopicId** (str) - (Required) 主题Id
408+
409+
**Response**
410+
411+
- **Data** (dict) - 见 **TopicInfo** 模型定义
412+
413+
**Response Model**
414+
415+
**TopicInfo**
416+
- **IsReserved** (int) - 是否保留：0 - NORMAL, 1 - RESERVED
417+
- **ReserveAge** (int) - 保存时间 1~730 天
418+
- **State** (str) - 日志主题状态
419+
- **TopicId** (str) - 主题ID
420+
- **TopicName** (str) - 主题名称
421+
- **TopicShardNum** (int) - 分区数量，固定是2
422+
423+
424+
"""
425+
# build request
426+
d = {
427+
"ProjectId": self.config.project_id,
428+
"Region": self.config.region,
429+
}
430+
req and d.update(req)
431+
d = apis.DescribeULogServiceTopicRequestSchema().dumps(d)
432+
433+
resp = self.invoke("DescribeULogServiceTopic", d, **kwargs)
434+
return apis.DescribeULogServiceTopicResponseSchema().loads(resp)
435+
358436
def get_u_log_service_topic_field(
359437
self, req: typing.Optional[dict] = None, **kwargs
360438
) -> dict:
@@ -555,7 +633,7 @@ def list_u_log_service_topic(
555633
**TopicInfo**
556634
- **IsReserved** (int) - 是否保留：0 - NORMAL, 1 - RESERVED
557635
- **ReserveAge** (int) - 保存时间 1~730 天
558-
- **TopicDesc** (str) - 主题描述
636+
- **State** (str) - 日志主题状态
559637
- **TopicId** (str) - 主题ID
560638
- **TopicName** (str) - 主题名称
561639
- **TopicShardNum** (int) - 分区数量，固定是2

‎ucloud/services/ulogservice/schemas/apis.py‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,33 @@ class DeleteULogServiceTopicResponseSchema(schema.ResponseSchema):
271271
}
272272

273273

274+
"""
275+
API: DescribeULogServiceLogSet
276+
277+
获取日志集信息
278+
"""
279+
280+
281+
class DescribeULogServiceLogSetRequestSchema(schema.RequestSchema):
282+
"""DescribeULogServiceLogSet - 获取日志集信息"""
283+
284+
fields = {
285+
"LogSetId": fields.Str(required=True, dump_to="LogSetId"),
286+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
287+
"Region": fields.Str(required=True, dump_to="Region"),
288+
"Zone": fields.Str(required=True, dump_to="Zone"),
289+
}
290+
291+
292+
class DescribeULogServiceLogSetResponseSchema(schema.ResponseSchema):
293+
"""DescribeULogServiceLogSet - 获取日志集信息"""
294+
295+
fields = {
296+
"LogSetInfo": models.LogSetInfoSchema(),
297+
"TotalCount": fields.Int(required=True, load_from="TotalCount"),
298+
}
299+
300+
274301
"""
275302
API: DescribeULogServiceMachineGroup
276303
@@ -298,6 +325,31 @@ class DescribeULogServiceMachineGroupResponseSchema(schema.ResponseSchema):
298325
}
299326

300327

328+
"""
329+
API: DescribeULogServiceTopic
330+
331+
获取ULogService主题详情
332+
"""
333+
334+
335+
class DescribeULogServiceTopicRequestSchema(schema.RequestSchema):
336+
"""DescribeULogServiceTopic - 获取ULogService主题详情"""
337+
338+
fields = {
339+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
340+
"Region": fields.Str(required=True, dump_to="Region"),
341+
"TopicId": fields.Str(required=True, dump_to="TopicId"),
342+
}
343+
344+
345+
class DescribeULogServiceTopicResponseSchema(schema.ResponseSchema):
346+
"""DescribeULogServiceTopic - 获取ULogService主题详情"""
347+
348+
fields = {
349+
"Data": models.TopicInfoSchema(),
350+
}
351+
352+
301353
"""
302354
API: GetULogServiceTopicField
303355

‎ucloud/services/ulogservice/schemas/models.py‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
from ucloud.core.typesystem import schema, fields
44

55

6+
class LogSetInfoSchema(schema.ResponseSchema):
7+
"""LogSetInfo - 日志集信息"""
8+
9+
fields = {
10+
"CreateTime": fields.Int(required=False, load_from="CreateTime"),
11+
"LogSetId": fields.Str(required=False, load_from="LogSetId"),
12+
"LogSetName": fields.Str(required=False, load_from="LogSetName"),
13+
"LogSetRemark": fields.Str(required=False, load_from="LogSetRemark"),
14+
"TopicCount": fields.Int(required=False, load_from="TopicCount"),
15+
"UpdateTime": fields.Int(required=False, load_from="UpdateTime"),
16+
}
17+
18+
619
class LogAgentSchema(schema.ResponseSchema):
720
"""LogAgent - logagent 信息"""
821

@@ -29,6 +42,22 @@ class MachineInfoSchema(schema.ResponseSchema):
2942
}
3043

3144

45+
class TopicInfoSchema(schema.ResponseSchema):
46+
"""TopicInfo - 主题信息"""
47+
48+
fields = {
49+
"IsReserved": fields.Int(required=False, load_from="IsReserved"),
50+
"ReserveAge": fields.Int(required=False, load_from="ReserveAge"),
51+
"State": fields.Str(required=False, load_from="State"),
52+
"TopicDesc": fields.Str(
53+
required=False, load_from="TopicDesc"
54+
), # Deprecated, will be removed at 1.0
55+
"TopicId": fields.Str(required=False, load_from="TopicId"),
56+
"TopicName": fields.Str(required=False, load_from="TopicName"),
57+
"TopicShardNum": fields.Int(required=False, load_from="TopicShardNum"),
58+
}
59+
60+
3261
class TopicFieldSchema(schema.ResponseSchema):
3362
"""TopicField - 索引字段"""
3463

@@ -83,29 +112,12 @@ class CollectConfSchema(schema.ResponseSchema):
83112
}
84113

85114

86-
class LogSetInfoSchema(schema.ResponseSchema):
87-
"""LogSetInfo - 日志集信息"""
88-
89-
fields = {
90-
"CreateTime": fields.Int(required=False, load_from="CreateTime"),
91-
"LogSetId": fields.Str(required=False, load_from="LogSetId"),
92-
"LogSetName": fields.Str(required=False, load_from="LogSetName"),
93-
"LogSetRemark": fields.Str(required=False, load_from="LogSetRemark"),
94-
"TopicCount": fields.Int(required=False, load_from="TopicCount"),
95-
"UpdateTime": fields.Int(required=False, load_from="UpdateTime"),
96-
}
97-
98-
99-
class TopicInfoSchema(schema.ResponseSchema):
100-
"""TopicInfo - 主题信息"""
115+
class AnalysisFieldSchema(schema.ResponseSchema):
116+
"""AnalysisField - 统计分析结果字段头"""
101117

102118
fields = {
103-
"IsReserved": fields.Int(required=False, load_from="IsReserved"),
104-
"ReserveAge": fields.Int(required=False, load_from="ReserveAge"),
105-
"TopicDesc": fields.Str(required=False, load_from="TopicDesc"),
106-
"TopicId": fields.Str(required=False, load_from="TopicId"),
107-
"TopicName": fields.Str(required=False, load_from="TopicName"),
108-
"TopicShardNum": fields.Int(required=False, load_from="TopicShardNum"),
119+
"Name": fields.Str(required=True, load_from="Name"),
120+
"Type": fields.Str(required=True, load_from="Type"),
109121
}
110122

111123

@@ -121,15 +133,6 @@ class LogContentSchema(schema.ResponseSchema):
121133
}
122134

123135

124-
class AnalysisFieldSchema(schema.ResponseSchema):
125-
"""AnalysisField - 统计分析结果字段头"""
126-
127-
fields = {
128-
"Name": fields.Str(required=True, load_from="Name"),
129-
"Type": fields.Str(required=True, load_from="Type"),
130-
}
131-
132-
133136
class LogQueryResultSchema(schema.ResponseSchema):
134137
"""LogQueryResult - 日志检索结果"""
135138

‎ucloud/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "0.11.149"
1+
version = "0.11.150"

0 commit comments

Comments
 (0)