Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions ucloud/services/ses/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,25 @@ def send_ses_email(

**Request Model**

**SendSESEmailParamHeaders**
- **Name** (str) - 邮件头名称,最多 20 个且仅允许字母、数字和 -(正则 ^[A-Za-z0-9-]+$)。禁止使用保留名称:From/To/Cc/Bcc/Subject/Reply-To/Content-Type/Mime-Version,以及 X-SES- 前缀(均不区分大小写)。
- **Value** (str) - 邮件头值


**SendSESEmailParamAttachments**
- **ContentType** (str) - MIME 类型,如: application/pdf
- **Data** (str) - 附件内容(Base64 编码),单次请求最多 10 个附件;总大小不超过 10MB
- **Filename** (str) - 附件文件名


**SendSESEmailParamHeaders**
- **Name** (str) - 邮件头名称,最多 20 个且仅允许字母、数字和 -(正则 ^[A-Za-z0-9-]+$)。禁止使用保留名称:From/To/Cc/Bcc/Subject/Reply-To/Content-Type/Mime-Version,以及 X-SES- 前缀(均不区分大小写)。
- **Value** (str) - 邮件头值


**Response Model**

**FailedTargetEmail**
- **Bcc** (list) - 密送
- **Cc** (list) - 抄送
- **EmailAddress** (str) - 收件邮箱
- **FailureReason** (str) - 失败原因
- **TemplateVariableParams** (list) - 模版变量
- **TemplateVariableParams** (list) - 模版变量,variableName{##}variableValue 格式;仅使用模版发送(SendSESEmailTemplate)时返回,未使用模版发送(SendSESEmail)时不返回该字段
- **To** (str) - 收件人


Expand Down Expand Up @@ -107,19 +107,19 @@ def send_ses_email_template(

**Request Model**

**SendSESEmailTemplateParamAttachments**
- **ContentType** (str) - MIME 类型,如: application/pdf
- **Data** (str) - 附件内容(Base64 编码),单次请求最多 10 个附件;总大小不超过 10MB
- **Filename** (str) - 附件文件名


**SendSESEmailTemplateParamEmailContent**
- **Bcc** (list) - 密送(抄送+密送总数量不能超过100)
- **Cc** (list) - 抄送(抄送+密送总数量不能超过100)
- **TemplateVariableParams** (list) - 模版变量,格式 variableName{##}variableValue (例:{"name{##}Tom", "code{##}1234"})
- **To** (str) - 收件人,最多100条


**SendSESEmailTemplateParamAttachments**
- **ContentType** (str) - MIME 类型,如: application/pdf
- **Data** (str) - 附件内容(Base64 编码),单次请求最多 10 个附件;总大小不超过 10MB
- **Filename** (str) - 附件文件名


**SendSESEmailTemplateParamHeaders**
- **Name** (str) - 邮件头名称,最多 20 个且仅允许字母、数字和 -(正则 ^[A-Za-z0-9-]+$)。禁止使用保留名称:From/To/Cc/Bcc/Subject/Reply-To/Content-Type/Mime-Version,以及 X-SES- 前缀(均不区分大小写)。
- **Value** (str) - 邮件头值
Expand Down
38 changes: 19 additions & 19 deletions ucloud/services/ses/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
"""


class SendSESEmailParamAttachmentsSchema(schema.RequestSchema):
"""SendSESEmailParamAttachments -"""
class SendSESEmailParamHeadersSchema(schema.RequestSchema):
"""SendSESEmailParamHeaders -"""

fields = {
"ContentType": fields.Str(required=False, dump_to="ContentType"),
"Data": fields.Str(required=False, dump_to="Data"),
"Filename": fields.Str(required=False, dump_to="Filename"),
"Name": fields.Str(required=False, dump_to="Name"),
"Value": fields.Str(required=False, dump_to="Value"),
}


class SendSESEmailParamHeadersSchema(schema.RequestSchema):
"""SendSESEmailParamHeaders -"""
class SendSESEmailParamAttachmentsSchema(schema.RequestSchema):
"""SendSESEmailParamAttachments -"""

fields = {
"Name": fields.Str(required=False, dump_to="Name"),
"Value": fields.Str(required=False, dump_to="Value"),
"ContentType": fields.Str(required=False, dump_to="ContentType"),
"Data": fields.Str(required=False, dump_to="Data"),
"Filename": fields.Str(required=False, dump_to="Filename"),
}


Expand Down Expand Up @@ -75,16 +75,6 @@ class SendSESEmailResponseSchema(schema.ResponseSchema):
"""


class SendSESEmailTemplateParamAttachmentsSchema(schema.RequestSchema):
"""SendSESEmailTemplateParamAttachments -"""

fields = {
"ContentType": fields.Str(required=False, dump_to="ContentType"),
"Data": fields.Str(required=False, dump_to="Data"),
"Filename": fields.Str(required=False, dump_to="Filename"),
}


class SendSESEmailTemplateParamEmailContentSchema(schema.RequestSchema):
"""SendSESEmailTemplateParamEmailContent -"""

Expand All @@ -96,6 +86,16 @@ class SendSESEmailTemplateParamEmailContentSchema(schema.RequestSchema):
}


class SendSESEmailTemplateParamAttachmentsSchema(schema.RequestSchema):
"""SendSESEmailTemplateParamAttachments -"""

fields = {
"ContentType": fields.Str(required=False, dump_to="ContentType"),
"Data": fields.Str(required=False, dump_to="Data"),
"Filename": fields.Str(required=False, dump_to="Filename"),
}


class SendSESEmailTemplateParamHeadersSchema(schema.RequestSchema):
"""SendSESEmailTemplateParamHeaders -"""

Expand Down
12 changes: 7 additions & 5 deletions ucloud/services/ulogservice/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,13 @@ def list_u_log_service_log_set(
**Response**

- **Data** (list) - 见 **LogSetInfo** 模型定义
- **TotalCount** (int) - 日志集数量

**Response Model**

**LogSetInfo**
- **CreateTime** (int) - 创建时间
- **LogSetId** (str) - 日志集ID
- **LogSetName** (str) - 日志集名称
- **LogSetRemark** (str) - 日志集备注
- **TopicCount** (int) - 日志集下主题数量
Expand Down Expand Up @@ -597,11 +599,6 @@ def query_u_log_service_log(

**Response Model**

**AnalysisField**
- **Name** (str) - 字段名
- **Type** (str) - 字段类型


**LogContent**
- **FileName** (str) - 日志文件路径
- **HostName** (str) - 日志来源主机
Expand All @@ -610,6 +607,11 @@ def query_u_log_service_log(
- **Timestamp** (int) - 日志时间


**AnalysisField**
- **Name** (str) - 字段名
- **Type** (str) - 字段类型


**LogQueryResult**
- **AnalysisRecords** (list) - 当使用SQL语句查询时,数据通过该字段返回
- **Columns** (list) - 见 **AnalysisField** 模型定义
Expand Down
1 change: 1 addition & 0 deletions ucloud/services/ulogservice/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ class ListULogServiceLogSetResponseSchema(schema.ResponseSchema):
"Data": fields.List(
models.LogSetInfoSchema(), required=False, load_from="Data"
),
"TotalCount": fields.Int(required=False, load_from="TotalCount"),
}


Expand Down
21 changes: 11 additions & 10 deletions ucloud/services/ulogservice/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,11 @@ class CollectConfSchema(schema.ResponseSchema):


class LogSetInfoSchema(schema.ResponseSchema):
"""LogSetInfo -"""
"""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"),
Expand All @@ -108,15 +109,6 @@ class TopicInfoSchema(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 LogContentSchema(schema.ResponseSchema):
"""LogContent - 日志内容"""

Expand All @@ -129,6 +121,15 @@ 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 - 日志检索结果"""

Expand Down
2 changes: 1 addition & 1 deletion ucloud/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "0.11.139"
version = "0.11.140"
Loading