Skip to content

Commit e19eb11

Browse files
tencentyuncostencentyuncos
committed
Merge branch 'ci-audit' into 'master' (merge request !44)
审核黑白名单和音频审核新增字段
2 parents 9cf676b + 24dc798 commit e19eb11

File tree

1 file changed

+98
-49
lines changed

1 file changed

+98
-49
lines changed

‎ci.go‎

Lines changed: 98 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,24 @@ type ImageRecognitionOptions struct {
116116
Callback string `url:"callback,omitempty"`
117117
}
118118

119+
type UserListInfo struct {
120+
ListResults []UserListResults `xml:",omitempty"`
121+
}
122+
123+
//UserListResults 命中账号黑白名单信息
124+
type UserListResults struct {
125+
ListType *int `xml:",omitempty"`
126+
ListName string `xml:",omitempty"`
127+
Entity string `xml:",omitempty"`
128+
}
129+
119130
// ImageRecognitionResult is the result of ImageRecognition/ImageAuditing
120131
type ImageRecognitionResult struct {
121132
XMLName xml.Name `xml:"RecognitionResult"`
122133
JobId string `xml:"JobId,omitempty"`
134+
State string `xml:"State,omitempty"`
135+
Object string `xml:"Object,omitempty"`
136+
Url string `xml:"Url,omitempty"`
123137
Text string `xml:"Text,omitempty"`
124138
Label string `xml:"Label,omitempty"`
125139
Result int `xml:"Result,omitempty"`
@@ -138,18 +152,20 @@ type ImageRecognitionResult struct {
138152

139153
// RecognitionInfo is the result of auditing scene
140154
type RecognitionInfo struct {
141-
Code int `xml:"Code,omitempty"`
142-
Msg string `xml:"Msg,omitempty"`
143-
HitFlag int `xml:"HitFlag,omitempty"`
144-
Score int `xml:"Score,omitempty"`
145-
Label string `xml:"Label,omitempty"`
146-
Count int `xml:"Count,omitempty"`
147-
Category string `xml:"Category,omitempty"`
148-
SubLabel string `xml:"SubLabel,omitempty"`
149-
Keywords []string `xml:"Keywords,omitempty"`
150-
OcrResults []OcrResult `xml:"OcrResults,omitempty"`
151-
ObjectResults []ObjectResult `xml:"ObjectResults,omitempty"`
152-
LibResults []LibResult `xml:"LibResults,omitempty"`
155+
Code int `xml:"Code,omitempty"`
156+
Msg string `xml:"Msg,omitempty"`
157+
HitFlag int `xml:"HitFlag,omitempty"`
158+
Score int `xml:"Score,omitempty"`
159+
Label string `xml:"Label,omitempty"`
160+
Count int `xml:"Count,omitempty"`
161+
Category string `xml:"Category,omitempty"`
162+
SubLabel string `xml:"SubLabel,omitempty"`
163+
Keywords []string `xml:"Keywords,omitempty"`
164+
OcrResults []OcrResult `xml:"OcrResults,omitempty"`
165+
ObjectResults []ObjectResult `xml:"ObjectResults,omitempty"`
166+
LibResults []LibResult `xml:"LibResults,omitempty"`
167+
SpeakerResults []LanguageResult `xml:"SpeakerResults,omitempty"`
168+
RecognitionResults []LanguageResult `xml:"RecognitionResults,omitempty"`
153169
}
154170

155171
// 图片审核 https://cloud.tencent.com/document/product/460/37318
@@ -186,20 +202,25 @@ func (s *CIService) ImageAuditing(ctx context.Context, name string, opt *ImageRe
186202

187203
// UserExtraInfo is user defined information
188204
type UserExtraInfo struct {
189-
TokenId string `xml:",omitempty"`
190-
Nickname string `xml:",omitempty"`
191-
DeviceId string `xml:",omitempty"`
192-
AppId string `xml:",omitempty"`
193-
Room string `xml:",omitempty"`
194-
IP string `xml:",omitempty"`
195-
Type string `xml:",omitempty"`
205+
TokenId string `xml:",omitempty"`
206+
Nickname string `xml:",omitempty"`
207+
DeviceId string `xml:",omitempty"`
208+
AppId string `xml:",omitempty"`
209+
Room string `xml:",omitempty"`
210+
IP string `xml:",omitempty"`
211+
Type string `xml:",omitempty"`
212+
ReceiveTokenId string `xml:",omitempty"`
213+
Gender string `xml:",omitempty"`
214+
Level string `xml:",omitempty"`
215+
Role string `xml:",omitempty"`
196216
}
197217

198218
// ImageAuditingInputOptions is the option of BatchImageAuditingOptions
199219
type ImageAuditingInputOptions struct {
200220
DataId string `xml:",omitempty"`
201221
Object string `xml:",omitempty"`
202222
Url string `xml:",omitempty"`
223+
Content string `xml:",omitempty"`
203224
Interval int `xml:",omitempty"`
204225
MaxFrames int `xml:",omitempty"`
205226
LargeImageDetect int `xml:",omitempty"`
@@ -226,6 +247,7 @@ type ImageAuditingResult struct {
226247
Code string `xml:",omitempty"`
227248
Message string `xml:",omitempty"`
228249
JobId string `xml:",omitempty"`
250+
State string `xml:",omitempty"`
229251
DataId string `xml:",omitempty"`
230252
Object string `xml:",omitempty"`
231253
Url string `xml:",omitempty"`
@@ -242,6 +264,7 @@ type ImageAuditingResult struct {
242264
TeenagerInfo *RecognitionInfo `xml:",omitempty"`
243265
CompressionResult int `xml:",omitempty"`
244266
UserInfo *UserExtraInfo `xml:",omitempty"`
267+
ListInfo *UserListInfo `xml:",omitempty"`
245268
}
246269

247270
// BatchImageAuditingJobResult is the result of BatchImageAuditing
@@ -370,6 +393,7 @@ type AuditingJobDetail struct {
370393
AudioSection []AudioSectionResult `xml:",omitempty"`
371394
UserInfo *UserExtraInfo `xml:",omitempty"`
372395
Type string `xml:",omitempty"`
396+
ListInfo *UserListInfo `xml:",omitempty"`
373397
}
374398

375399
// GetVideoAuditingJobSnapshot is the snapshot result of AuditingJobDetail
@@ -388,16 +412,18 @@ type GetVideoAuditingJobSnapshot struct {
388412

389413
// AudioSectionResult is the audio section result of AuditingJobDetail/AudioAuditingJobDetail
390414
type AudioSectionResult struct {
391-
Url string `xml:",omitempty"`
392-
Text string `xml:",omitempty"`
393-
OffsetTime int `xml:",omitempty"`
394-
Duration int `xml:",omitempty"`
395-
Label string `xml:",omitempty"`
396-
Result int `xml:",omitempty"`
397-
PornInfo *RecognitionInfo `xml:",omitempty"`
398-
TerrorismInfo *RecognitionInfo `xml:",omitempty"`
399-
PoliticsInfo *RecognitionInfo `xml:",omitempty"`
400-
AdsInfo *RecognitionInfo `xml:",omitempty"`
415+
Url string `xml:",omitempty"`
416+
Text string `xml:",omitempty"`
417+
OffsetTime int `xml:",omitempty"`
418+
Duration int `xml:",omitempty"`
419+
Label string `xml:",omitempty"`
420+
Result int `xml:",omitempty"`
421+
PornInfo *RecognitionInfo `xml:",omitempty"`
422+
TerrorismInfo *RecognitionInfo `xml:",omitempty"`
423+
PoliticsInfo *RecognitionInfo `xml:",omitempty"`
424+
AdsInfo *RecognitionInfo `xml:",omitempty"`
425+
TeenagerInfo *RecognitionInfo `xml:",omitempty"`
426+
LanguageResults []LanguageResult `xml:",omitempty"`
401427
}
402428

403429
// 视频审核-查询任务 https://cloud.tencent.com/document/product/460/46926
@@ -441,6 +467,7 @@ type AudioAuditingJobConf struct {
441467
DetectType string `xml:",omitempty"`
442468
Callback string `xml:",omitempty"`
443469
CallbackVersion string `xml:",omitempty"`
470+
CallbackType int `xml:",omitempty"`
444471
BizType string `xml:",omitempty"`
445472
}
446473

@@ -470,23 +497,34 @@ type GetAudioAuditingJobResult struct {
470497

471498
// AudioAuditingJobDetail is the detail of GetAudioAuditingJobResult
472499
type AudioAuditingJobDetail struct {
473-
Code string `xml:",omitempty"`
474-
Message string `xml:",omitempty"`
475-
JobId string `xml:",omitempty"`
476-
State string `xml:",omitempty"`
477-
CreationTime string `xml:",omitempty"`
478-
Object string `xml:",omitempty"`
479-
Url string `xml:",omitempty"`
480-
DataId string `xml:",omitempty"`
481-
AudioText string `xml:",omitempty"`
482-
Label string `xml:",omitempty"`
483-
Result int `xml:",omitempty"`
484-
PornInfo *RecognitionInfo `xml:",omitempty"`
485-
TerrorismInfo *RecognitionInfo `xml:",omitempty"`
486-
PoliticsInfo *RecognitionInfo `xml:",omitempty"`
487-
AdsInfo *RecognitionInfo `xml:",omitempty"`
488-
Section []AudioSectionResult `xml:",omitempty"`
489-
UserInfo *UserExtraInfo `xml:",omitempty"`
500+
Code string `xml:",omitempty"`
501+
Message string `xml:",omitempty"`
502+
JobId string `xml:",omitempty"`
503+
State string `xml:",omitempty"`
504+
CreationTime string `xml:",omitempty"`
505+
Object string `xml:",omitempty"`
506+
Url string `xml:",omitempty"`
507+
DataId string `xml:",omitempty"`
508+
AudioText string `xml:",omitempty"`
509+
Label string `xml:",omitempty"`
510+
Result int `xml:",omitempty"`
511+
PornInfo *RecognitionInfo `xml:",omitempty"`
512+
TerrorismInfo *RecognitionInfo `xml:",omitempty"`
513+
PoliticsInfo *RecognitionInfo `xml:",omitempty"`
514+
AdsInfo *RecognitionInfo `xml:",omitempty"`
515+
TeenagerInfo *RecognitionInfo `xml:",omitempty"`
516+
LanguageResults []LanguageResult `xml:",omitempty"`
517+
Section []AudioSectionResult `xml:",omitempty"`
518+
UserInfo *UserExtraInfo `xml:",omitempty"`
519+
ListInfo *UserListInfo `xml:",omitempty"`
520+
}
521+
522+
// LanguageResult 语种识别结果
523+
type LanguageResult struct {
524+
Label string `xml:"Label"`
525+
Score uint32 `xml:"Score"`
526+
StartTime *int64 `xml:"StartTime,omitempty"`
527+
EndTime *int64 `xml:"EndTime,omitempty"`
490528
}
491529

492530
// 音频审核-查询任务 https://cloud.tencent.com/document/product/460/53396
@@ -519,6 +557,7 @@ type TextAuditingJobConf struct {
519557
Callback string `xml:",omitempty"`
520558
CallbackVersion string `xml:",omitempty"`
521559
BizType string `xml:",omitempty"`
560+
CallbackType int `xml:",omitempty"`
522561
}
523562

524563
// PutTextAuditingJobResult is the result of PutTextAuditingJob
@@ -567,6 +606,7 @@ type TextAuditingJobDetail struct {
567606
AbuseInfo *TextRecognitionInfo `xml:",omitempty"`
568607
Section []TextSectionResult `xml:",omitempty"`
569608
UserInfo *UserExtraInfo `xml:",omitempty"`
609+
ListInfo *UserListInfo `xml:",omitempty"`
570610
}
571611

572612
// TextLibResult
@@ -584,6 +624,7 @@ type TextRecognitionInfo struct {
584624
Count int `xml:",omitempty"`
585625
Keywords string `xml:",omitempty"`
586626
LibResults []TextLibResult `xml:",omitempty"`
627+
SubLabel string `xml:",omitempty"`
587628
}
588629

589630
// TextSectionResult is the section result of TextAuditingJobDetail
@@ -625,9 +666,10 @@ type PutDocumentAuditingJobOptions struct {
625666

626667
// DocumentAuditingJobConf is the config of PutDocumentAuditingJobOptions
627668
type DocumentAuditingJobConf struct {
628-
DetectType string `xml:",omitempty"`
629-
Callback string `xml:",omitempty"`
630-
BizType string `xml:",omitempty"`
669+
DetectType string `xml:",omitempty"`
670+
Callback string `xml:",omitempty"`
671+
BizType string `xml:",omitempty"`
672+
CallbackType int `xml:",omitempty"`
631673
}
632674

633675
// PutDocumentAuditingJobResult is the result of PutDocumentAuditingJob
@@ -670,6 +712,7 @@ type DocumentAuditingJobDetail struct {
670712
Labels *DocumentResultInfo `xml:",omitempty"`
671713
PageSegment *DocumentPageSegmentInfo `xml:",omitempty"`
672714
UserInfo *UserExtraInfo `xml:",omitempty"`
715+
ListInfo *UserListInfo `xml:",omitempty"`
673716
}
674717

675718
// DocumentResultInfo
@@ -755,6 +798,8 @@ type WebpageAuditingJobConf struct {
755798
DetectType string `xml:",omitempty"`
756799
Callback string `xml:",omitempty"`
757800
ReturnHighlightHtml bool `xml:",omitempty"`
801+
BizType string `xml:",omitempty"`
802+
CallbackType int `xml:",omitempty"`
758803
}
759804

760805
// PutWebpageAuditingJobResult is the result of PutWebpageAuditingJob
@@ -796,6 +841,8 @@ type WebpageAuditingJobDetail struct {
796841
HighlightHtml string `xml:",omitempty"`
797842
DataId string `xml:",omitempty"`
798843
UserInfo *UserExtraInfo `xml:",omitempty"`
844+
ListInfo *UserListInfo `xml:",omitempty"`
845+
Label string `xml:",omitempty"`
799846
}
800847

801848
// WebpageResultInfo
@@ -804,6 +851,8 @@ type WebpageResultInfo struct {
804851
TerrorismInfo *RecognitionInfo `xml:",omitempty"`
805852
PoliticsInfo *RecognitionInfo `xml:",omitempty"`
806853
AdsInfo *RecognitionInfo `xml:",omitempty"`
854+
IllegalInfo *RecognitionInfo `xml:",omitempty"`
855+
AbuseInfo *RecognitionInfo `xml:",omitempty"`
807856
}
808857

809858
// WebpageImageResults

0 commit comments

Comments
 (0)