Merge pull request #90 from agin719/cos-v4-dev

Cos v4 dev

ci.go

@@ -1,24 +1,199 @@
 package cos
 
 import (
+	"context"
 	"encoding/json"
+	"encoding/xml"
+	"net/http"
 )
 
+type CIService service
+
 type PicOperations struct {
 	IsPicInfo int                  `json:"is_pic_info,omitempty"`
 	Rules     []PicOperationsRules `json:"rules,omitemtpy"`
 }
-
 type PicOperationsRules struct {
 	Bucket string `json:"bucket,omitempty"`
 	FileId string `json:"fileid"`
 	Rule   string `json:"rule"`
 }
 
 func EncodePicOperations(pic *PicOperations) string {
+	if pic == nil {
+		return ""
+	}
 	bs, err := json.Marshal(pic)
 	if err != nil {
 		return ""
 	}
 	return string(bs)
 }
+
+type ImageProcessResult struct {
+	XMLName       xml.Name          `xml:"UploadResult"`
+	OriginalInfo  *PicOriginalInfo  `xml:"OriginalInfo,omitempty"`
+	ProcessObject *PicProcessObject `xml:"ProcessResults>Object,omitempty"`
+}
+type PicOriginalInfo struct {
+	Key       string        `xml:"Key,omitempty"`
+	Location  string        `xml:"Location,omitempty"`
+	ImageInfo *PicImageInfo `xml:"ImageInfo,omitempty"`
+}
+type PicImageInfo struct {
+	Format  string `xml:"Format,omitempty"`
+	Width   int    `xml:"Width,omitempty"`
+	Height  int    `xml:"Height,omitempty"`
+	Size    int    `xml:"Size,omitempty"`
+	Quality int    `xml:"Quality,omitempty"`
+}
+type PicProcessObject struct {
+	Key      string `xml:"Key,omitempty"`
+	Location string `xml:"Location,omitempty"`
+	Format   string `xml:"Format,omitempty"`
+	Width    int    `xml:"Width,omitempty"`
+	Height   int    `xml:"Height,omitempty"`
+	Size     int    `xml:"Size,omitempty"`
+	Quality  int    `xml:"Quality,omitempty"`
+}
+
+type picOperationsHeader struct {
+	PicOperations string `header:"Pic-Operations" xml:"-" url:"-"`
+}
+
+type ImageProcessOptions = PicOperations
+
+// 云上数据处理 https://cloud.tencent.com/document/product/460/18147
+func (s *CIService) ImageProcess(ctx context.Context, name string, opt *ImageProcessOptions) (*ImageProcessResult, *Response, error) {
+	header := &picOperationsHeader{
+		PicOperations: EncodePicOperations(opt),
+	}
+	var res ImageProcessResult
+	sendOpt := sendOptions{
+		baseURL:   s.client.BaseURL.BucketURL,
+		uri:       "/" + encodeURIComponent(name) + "?image_process",
+		method:    http.MethodPost,
+		optHeader: header,
+		result:    &res,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+	return &res, resp, err
+}
+
+type ImageRecognitionOptions struct {
+	CIProcess  string `url:"ci-process,omitempty"`
+	DetectType string `url:"detect-type,omitempty"`
+}
+
+type ImageRecognitionResult struct {
+	XMLName       xml.Name         `xml:"RecognitionResult"`
+	PornInfo      *RecognitionInfo `xml:"PornInfo,omitempty"`
+	TerroristInfo *RecognitionInfo `xml:"TerroristInfo,omitempty"`
+	PoliticsInfo  *RecognitionInfo `xml:"PoliticsInfo,omitempty"`
+	AdsInfo       *RecognitionInfo `xml:"AdsInfo,omitempty"`
+}
+type RecognitionInfo struct {
+	Code    int    `xml:"Code,omitempty"`
+	Msg     string `xml:"Msg,omitempty"`
+	HitFlag int    `xml:"HitFlag,omitempty"`
+	Score   int    `xml:"Score,omitempty"`
+	Label   string `xml:"Label,omitempty"`
+	Count   int    `xml:"Count,omitempty"`
+}
+
+// 图片审核 https://cloud.tencent.com/document/product/460/37318
+func (s *CIService) ImageRecognition(ctx context.Context, name string, opt *ImageRecognitionOptions) (*ImageRecognitionResult, *Response, error) {
+	if opt != nil && opt.CIProcess == "" {
+		opt.CIProcess = "sensitive-content-recognition"
+	}
+	var res ImageRecognitionResult
+	sendOpt := sendOptions{
+		baseURL:  s.client.BaseURL.BucketURL,
+		uri:      "/" + encodeURIComponent(name),
+		method:   http.MethodGet,
+		optQuery: opt,
+		result:   &res,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+	return &res, resp, err
+}
+
+type PutVideoAuditingJobOptions struct {
+	XMLName     xml.Name              `xml:"Request"`
+	InputObject string                `xml:"Input>Object"`
+	Conf        *VideoAuditingJobConf `xml:"Conf"`
+}
+type VideoAuditingJobConf struct {
+	DetectType string                       `xml:",omitempty"`
+	Snapshot   *PutVideoAuditingJobSnapshot `xml:",omitempty"`
+	Callback   string                       `xml:",omitempty"`
+}
+type PutVideoAuditingJobSnapshot struct {
+	Mode         string  `xml:",omitempty"`
+	Count        int     `xml:",omitempty"`
+	TimeInterval float32 `xml:",omitempty"`
+	Start        float32 `xml:",omitempty"`
+}
+
+type PutVideoAuditingJobResult struct {
+	XMLName    xml.Name `xml:"Response"`
+	JobsDetail struct {
+		JobId        string `xml:"JobId,omitempty"`
+		State        string `xml:"State,omitempty"`
+		CreationTime string `xml:"CreationTime,omitempty"`
+		Object       string `xml:"Object,omitempty"`
+	} `xml:"JobsDetail,omitempty"`
+}
+
+func (s *CIService) PutVideoAuditingJob(ctx context.Context, opt *PutVideoAuditingJobOptions) (*PutVideoAuditingJobResult, *Response, error) {
+	var res PutVideoAuditingJobResult
+	sendOpt := sendOptions{
+		baseURL: s.client.BaseURL.CIURL,
+		uri:     "/video/auditing",
+		method:  http.MethodPost,
+		body:    opt,
+		result:  &res,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+	return &res, resp, err
+}
+
+type GetVideoAuditingJobResult struct {
+	XMLName        xml.Name                `xml:"Response"`
+	JobsDetail     *VideoAuditingJobDetail `xml:",omitempty"`
+	NonExistJobIds string                  `xml:",omitempty"`
+}
+type VideoAuditingJobDetail struct {
+	Code          string                       `xml:",omitempty"`
+	Message       string                       `xml:",omitempty"`
+	JobId         string                       `xml:",omitempty"`
+	State         string                       `xml:",omitempty"`
+	CreationTime  string                       `xml:",omitempty"`
+	Object        string                       `xml:",omitempty"`
+	SnapshotCount string                       `xml:",omitempty"`
+	result        int                          `xml:",omitempty"`
+	PornInfo      *RecognitionInfo             `xml:",omitempty"`
+	TerrorismInfo *RecognitionInfo             `xml:",omitempty"`
+	PoliticsInfo  *RecognitionInfo             `xml:",omitempty"`
+	AdsInfo       *RecognitionInfo             `xml:",omitempty"`
+	Snapshot      *GetVideoAuditingJobSnapshot `xml:",omitempty"`
+}
+type GetVideoAuditingJobSnapshot struct {
+	Url           string           `xml:",omitempty"`
+	PornInfo      *RecognitionInfo `xml:",omitempty"`
+	TerrorismInfo *RecognitionInfo `xml:",omitempty"`
+	PoliticsInfo  *RecognitionInfo `xml:",omitempty"`
+	AdsInfo       *RecognitionInfo `xml:",omitempty"`
+}
+
+func (s *CIService) GetVideoAuditingJob(ctx context.Context, jobid string) (*GetVideoAuditingJobResult, *Response, error) {
+	var res GetVideoAuditingJobResult
+	sendOpt := sendOptions{
+		baseURL: s.client.BaseURL.CIURL,
+		uri:     "/video/auditing/" + jobid,
+		method:  http.MethodGet,
+		result:  &res,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+	return &res, resp, err
+}

cos.go

@@ -22,7 +22,7 @@ import (
 
 const (
 	// Version current go sdk version
-	Version               = "0.7.10"
+	Version               = "0.7.11"
 	userAgent             = "cos-go-sdk-v5/" + Version
 	contentTypeXML        = "application/xml"
 	defaultServiceBaseURL = "http://service.cos.myqcloud.com"
@@ -42,6 +42,8 @@ type BaseURL struct {
 	ServiceURL *url.URL
 	// 访问 job API 的基础 URL （不包含 path 部分）: http://example.com
 	BatchURL *url.URL
+	// 访问 CI 的基础 URL
+	CIURL *url.URL
 }
 
 // NewBucketURL 生成 BaseURL 所需的 BucketURL
@@ -82,6 +84,7 @@ type Client struct {
 	Bucket  *BucketService
 	Object  *ObjectService
 	Batch   *BatchService
+	CI      *CIService
 }
 
 type service struct {
@@ -99,6 +102,7 @@ func NewClient(uri *BaseURL, httpClient *http.Client) *Client {
 		baseURL.BucketURL = uri.BucketURL
 		baseURL.ServiceURL = uri.ServiceURL
 		baseURL.BatchURL = uri.BatchURL
+		baseURL.CIURL = uri.CIURL
 	}
 	if baseURL.ServiceURL == nil {
 		baseURL.ServiceURL, _ = url.Parse(defaultServiceBaseURL)
@@ -114,6 +118,7 @@ func NewClient(uri *BaseURL, httpClient *http.Client) *Client {
 	c.Bucket = (*BucketService)(&c.common)
 	c.Object = (*ObjectService)(&c.common)
 	c.Batch = (*BatchService)(&c.common)
+	c.CI = (*CIService)(&c.common)
 	return c
 }
 
@@ -244,9 +249,6 @@ func (c *Client) send(ctx context.Context, opt *sendOptions) (resp *Response, er
 	}
 
 	resp, err = c.doAPI(ctx, req, opt.result, !opt.disableCloseBody)
-	if err != nil {
-		return
-	}
 	return
 }
 

cos_test.go

@@ -32,7 +32,7 @@ func setup() {
 	server = httptest.NewServer(mux)
 
 	u, _ := url.Parse(server.URL)
-	client = NewClient(&BaseURL{u, u, u}, nil)
+	client = NewClient(&BaseURL{u, u, u, u}, nil)
 }
 
 // teardown closes the test HTTP server.

example/object/ci_image_process.go

@@ -0,0 +1,63 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"github.com/tencentyun/cos-go-sdk-v5"
+	"github.com/tencentyun/cos-go-sdk-v5/debug"
+)
+
+func log_status(err error) {
+	if err == nil {
+		return
+	}
+	if cos.IsNotFoundError(err) {
+		// WARN
+		fmt.Println("WARN: Resource is not existed")
+	} else if e, ok := cos.IsCOSError(err); ok {
+		fmt.Printf("ERROR: Code: %v\n", e.Code)
+		fmt.Printf("ERROR: Message: %v\n", e.Message)
+		fmt.Printf("ERROR: Resource: %v\n", e.Resource)
+		fmt.Printf("ERROR: RequestId: %v\n", e.RequestID)
+		// ERROR
+	} else {
+		fmt.Printf("ERROR: %v\n", err)
+		// ERROR
+	}
+}
+
+func main() {
+	u, _ := url.Parse("https://test-1259654469.cos.ap-guangzhou.myqcloud.com")
+	b := &cos.BaseURL{BucketURL: u}
+	c := cos.NewClient(b, &http.Client{
+		Transport: &cos.AuthorizationTransport{
+			SecretID:  os.Getenv("COS_SECRETID"),
+			SecretKey: os.Getenv("COS_SECRETKEY"),
+			Transport: &debug.DebugRequestTransport{
+				RequestHeader: true,
+				// Notice when put a large file and set need the request body, might happend out of memory error.
+				RequestBody:    false,
+				ResponseHeader: true,
+				ResponseBody:   true,
+			},
+		},
+	})
+
+	opt := &cos.ImageProcessOptions{
+		IsPicInfo: 1,
+		Rules: []cos.PicOperationsRules{
+			{
+				FileId: "format.jpg",
+				Rule:   "imageView2/format/png",
+			},
+		},
+	}
+	name := "test.jpg"
+	res, _, err := c.CI.ImageProcess(context.Background(), name, opt)
+	log_status(err)
+	fmt.Printf("%+v\n", res)
+}

example/object/ci_image_recognition.go

@@ -0,0 +1,56 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"github.com/tencentyun/cos-go-sdk-v5"
+	"github.com/tencentyun/cos-go-sdk-v5/debug"
+)
+
+func log_status(err error) {
+	if err == nil {
+		return
+	}
+	if cos.IsNotFoundError(err) {
+		// WARN
+		fmt.Println("WARN: Resource is not existed")
+	} else if e, ok := cos.IsCOSError(err); ok {
+		fmt.Printf("ERROR: Code: %v\n", e.Code)
+		fmt.Printf("ERROR: Message: %v\n", e.Message)
+		fmt.Printf("ERROR: Resource: %v\n", e.Resource)
+		fmt.Printf("ERROR: RequestId: %v\n", e.RequestID)
+		// ERROR
+	} else {
+		fmt.Printf("ERROR: %v\n", err)
+		// ERROR
+	}
+}
+
+func main() {
+	u, _ := url.Parse("https://test-1259654469.cos.ap-guangzhou.myqcloud.com")
+	b := &cos.BaseURL{BucketURL: u}
+	c := cos.NewClient(b, &http.Client{
+		Transport: &cos.AuthorizationTransport{
+			SecretID:  os.Getenv("COS_SECRETID"),
+			SecretKey: os.Getenv("COS_SECRETKEY"),
+			Transport: &debug.DebugRequestTransport{
+				RequestHeader:  true,
+				RequestBody:    true,
+				ResponseHeader: true,
+				ResponseBody:   true,
+			},
+		},
+	})
+	opt := &cos.ImageRecognitionOptions{
+		DetectType: "porn,terrorist,politics",
+	}
+
+	name := "test.jpg"
+	res, _, err := c.CI.ImageRecognition(context.Background(), name, opt)
+	log_status(err)
+	fmt.Printf("%+v\n", res)
+}