Skip to content

Commit b11149d

Browse files
machinabotmachinabot
committed
Made all SDKs Accept JSON
1 parent aa0c347 commit b11149d

File tree

8 files changed

+129
-19
lines changed

8 files changed

+129
-19
lines changed

‎facebox/facebox.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@ func (c *Client) Info() (*boxutil.Info, error) {
6363
if !u.IsAbs() {
6464
return nil, errors.New("box address must be absolute")
6565
}
66-
resp, err := c.HTTPClient.Get(u.String())
66+
req, err := http.NewRequest("GET", u.String(), nil)
67+
if err != nil {
68+
return nil, err
69+
}
70+
req.Header.Set("Accept", "application/json; charset=utf-8")
71+
resp, err := c.HTTPClient.Do(req)
6772
if err != nil {
6873
return nil, err
6974
}

‎facebox/facebox_check.go‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import (
55
"encoding/json"
66
"io"
77
"mime/multipart"
8+
"net/http"
89
"net/url"
10+
"strings"
911

1012
"github.com/pkg/errors"
1113
)
@@ -32,7 +34,13 @@ func (c *Client) Check(image io.Reader) ([]Face, error) {
3234
if !u.IsAbs() {
3335
return nil, errors.New("box address must be absolute")
3436
}
35-
resp, err := c.HTTPClient.Post(u.String(), w.FormDataContentType(), &buf)
37+
req, err := http.NewRequest("POST", u.String(), &buf)
38+
if err != nil {
39+
return nil, err
40+
}
41+
req.Header.Set("Accept", "application/json; charset=utf-8")
42+
req.Header.Set("Content-Type", w.FormDataContentType())
43+
resp, err := c.HTTPClient.Do(req)
3644
if err != nil {
3745
return nil, err
3846
}
@@ -54,7 +62,12 @@ func (c *Client) CheckURL(imageURL *url.URL) ([]Face, error) {
5462
}
5563
form := url.Values{}
5664
form.Set("url", imageURL.String())
57-
resp, err := c.HTTPClient.PostForm(u.String(), form)
65+
req, err := http.NewRequest("POST", u.String(), strings.NewReader(form.Encode()))
66+
if err != nil {
67+
return nil, err
68+
}
69+
req.Header.Set("Accept", "application/json; charset=utf-8")
70+
resp, err := c.HTTPClient.Do(req)
5871
if err != nil {
5972
return nil, err
6073
}

‎facebox/facebox_similar.go‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import (
55
"encoding/json"
66
"io"
77
"mime/multipart"
8+
"net/http"
89
"net/url"
10+
"strings"
911

1012
"github.com/pkg/errors"
1113
)
@@ -32,7 +34,13 @@ func (c *Client) Similar(image io.Reader) ([]Similar, error) {
3234
if !u.IsAbs() {
3335
return nil, errors.New("box address must be absolute")
3436
}
35-
resp, err := c.HTTPClient.Post(u.String(), w.FormDataContentType(), &buf)
37+
req, err := http.NewRequest("POST", u.String(), &buf)
38+
if err != nil {
39+
return nil, err
40+
}
41+
req.Header.Set("Accept", "application/json; charset=utf-8")
42+
req.Header.Set("Content-Type", w.FormDataContentType())
43+
resp, err := c.HTTPClient.Do(req)
3644
if err != nil {
3745
return nil, err
3846
}
@@ -54,7 +62,12 @@ func (c *Client) SimilarURL(imageURL *url.URL) ([]Similar, error) {
5462
}
5563
form := url.Values{}
5664
form.Set("url", imageURL.String())
57-
resp, err := c.HTTPClient.PostForm(u.String(), form)
65+
req, err := http.NewRequest("POST", u.String(), strings.NewReader(form.Encode()))
66+
if err != nil {
67+
return nil, err
68+
}
69+
req.Header.Set("Accept", "application/json; charset=utf-8")
70+
resp, err := c.HTTPClient.Do(req)
5871
if err != nil {
5972
return nil, err
6073
}

‎facebox/facebox_state.go‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import (
55
"errors"
66
"io"
77
"mime/multipart"
8+
"net/http"
89
"net/url"
10+
"strings"
911
)
1012

1113
// OpenState opens the state file for reading.
@@ -18,7 +20,12 @@ func (c *Client) OpenState() (io.ReadCloser, error) {
1820
if !u.IsAbs() {
1921
return nil, errors.New("box address must be absolute")
2022
}
21-
resp, err := c.HTTPClient.Get(u.String())
23+
req, err := http.NewRequest("GET", u.String(), nil)
24+
if err != nil {
25+
return nil, err
26+
}
27+
req.Header.Set("Accept", "application/json; charset=utf-8")
28+
resp, err := c.HTTPClient.Do(req)
2229
if err != nil {
2330
return nil, err
2431
}
@@ -47,7 +54,13 @@ func (c *Client) PostState(r io.Reader) error {
4754
if !u.IsAbs() {
4855
return errors.New("box address must be absolute")
4956
}
50-
resp, err := c.HTTPClient.Post(u.String(), w.FormDataContentType(), &buf)
57+
req, err := http.NewRequest("POST", u.String(), &buf)
58+
if err != nil {
59+
return err
60+
}
61+
req.Header.Set("Accept", "application/json; charset=utf-8")
62+
req.Header.Set("Content-Type", w.FormDataContentType())
63+
resp, err := c.HTTPClient.Do(req)
5164
if err != nil {
5265
return err
5366
}
@@ -70,10 +83,19 @@ func (c *Client) PostStateURL(stateURL *url.URL) error {
7083
}
7184
form := url.Values{}
7285
form.Set("url", stateURL.String())
73-
resp, err := c.HTTPClient.PostForm(u.String(), form)
86+
req, err := http.NewRequest("POST", u.String(), strings.NewReader(form.Encode()))
87+
if err != nil {
88+
return err
89+
}
90+
req.Header.Set("Accept", "application/json; charset=utf-8")
91+
resp, err := c.HTTPClient.Do(req)
7492
if err != nil {
7593
return err
7694
}
7795
defer resp.Body.Close()
78-
return c.parseResponse(resp.Body)
96+
err = c.parseResponse(resp.Body)
97+
if err != nil {
98+
return err
99+
}
100+
return nil
79101
}

‎facebox/facebox_teach.go‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import (
55
"encoding/json"
66
"io"
77
"mime/multipart"
8+
"net/http"
89
"net/url"
10+
"strings"
911

1012
"github.com/pkg/errors"
1113
)
@@ -44,7 +46,13 @@ func (c *Client) Teach(image io.Reader, id, name string) error {
4446
if !u.IsAbs() {
4547
return errors.New("box address must be absolute")
4648
}
47-
resp, err := c.HTTPClient.Post(u.String(), w.FormDataContentType(), &buf)
49+
req, err := http.NewRequest("POST", u.String(), &buf)
50+
if err != nil {
51+
return err
52+
}
53+
req.Header.Set("Accept", "application/json; charset=utf-8")
54+
req.Header.Set("Content-Type", w.FormDataContentType())
55+
resp, err := c.HTTPClient.Do(req)
4856
if err != nil {
4957
return err
5058
}
@@ -69,12 +77,21 @@ func (c *Client) TeachURL(imageURL *url.URL, id, name string) error {
6977
form.Set("url", imageURL.String())
7078
form.Set("name", name)
7179
form.Set("id", id)
72-
resp, err := c.HTTPClient.PostForm(u.String(), form)
80+
req, err := http.NewRequest("POST", u.String(), strings.NewReader(form.Encode()))
81+
if err != nil {
82+
return err
83+
}
84+
req.Header.Set("Accept", "application/json; charset=utf-8")
85+
resp, err := c.HTTPClient.Do(req)
7386
if err != nil {
7487
return err
7588
}
7689
defer resp.Body.Close()
77-
return c.parseResponse(resp.Body)
90+
err = c.parseResponse(resp.Body)
91+
if err != nil {
92+
return err
93+
}
94+
return nil
7895
}
7996

8097
func (c *Client) parseResponse(r io.Reader) error {

‎nudebox/nudebox.go‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"mime/multipart"
99
"net/http"
1010
"net/url"
11+
"strings"
1112
"time"
1213

1314
"github.com/machinebox/sdk-go/x/boxutil"
@@ -46,7 +47,12 @@ func (c *Client) Info() (*boxutil.Info, error) {
4647
if !u.IsAbs() {
4748
return nil, errors.New("box address must be absolute")
4849
}
49-
resp, err := c.HTTPClient.Get(u.String())
50+
req, err := http.NewRequest("GET", u.String(), nil)
51+
if err != nil {
52+
return nil, err
53+
}
54+
req.Header.Set("Accept", "application/json; charset=utf-8")
55+
resp, err := c.HTTPClient.Do(req)
5056
if err != nil {
5157
return nil, err
5258
}
@@ -79,7 +85,13 @@ func (c *Client) Check(image io.Reader) (float64, error) {
7985
if !u.IsAbs() {
8086
return 0, errors.New("box address must be absolute")
8187
}
82-
resp, err := c.HTTPClient.Post(u.String(), w.FormDataContentType(), &buf)
88+
req, err := http.NewRequest("POST", u.String(), &buf)
89+
if err != nil {
90+
return 0, err
91+
}
92+
req.Header.Set("Accept", "application/json; charset=utf-8")
93+
req.Header.Set("Content-Type", w.FormDataContentType())
94+
resp, err := c.HTTPClient.Do(req)
8395
if err != nil {
8496
return 0, err
8597
}
@@ -100,7 +112,12 @@ func (c *Client) CheckURL(imageURL *url.URL) (float64, error) {
100112
}
101113
form := url.Values{}
102114
form.Set("url", imageURL.String())
103-
resp, err := c.HTTPClient.PostForm(u.String(), form)
115+
req, err := http.NewRequest("POST", u.String(), strings.NewReader(form.Encode()))
116+
if err != nil {
117+
return 0, err
118+
}
119+
req.Header.Set("Accept", "application/json; charset=utf-8")
120+
resp, err := c.HTTPClient.Do(req)
104121
if err != nil {
105122
return 0, err
106123
}

‎tagbox/tagbox.go‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"mime/multipart"
99
"net/http"
1010
"net/url"
11+
"strings"
1112
"time"
1213

1314
"github.com/machinebox/sdk-go/x/boxutil"
@@ -54,7 +55,12 @@ func (c *Client) Info() (*boxutil.Info, error) {
5455
if !u.IsAbs() {
5556
return nil, errors.New("box address must be absolute")
5657
}
57-
resp, err := c.HTTPClient.Get(u.String())
58+
req, err := http.NewRequest("GET", u.String(), nil)
59+
if err != nil {
60+
return nil, err
61+
}
62+
req.Header.Set("Accept", "application/json; charset=utf-8")
63+
resp, err := c.HTTPClient.Do(req)
5864
if err != nil {
5965
return nil, err
6066
}
@@ -87,7 +93,13 @@ func (c *Client) Check(image io.Reader) ([]Tag, error) {
8793
if !u.IsAbs() {
8894
return nil, errors.New("box address must be absolute")
8995
}
90-
resp, err := c.HTTPClient.Post(u.String(), w.FormDataContentType(), &buf)
96+
req, err := http.NewRequest("POST", u.String(), &buf)
97+
if err != nil {
98+
return nil, err
99+
}
100+
req.Header.Set("Accept", "application/json; charset=utf-8")
101+
req.Header.Set("Content-Type", w.FormDataContentType())
102+
resp, err := c.HTTPClient.Do(req)
91103
if err != nil {
92104
return nil, err
93105
}
@@ -108,7 +120,12 @@ func (c *Client) CheckURL(imageURL *url.URL) ([]Tag, error) {
108120
}
109121
form := url.Values{}
110122
form.Set("url", imageURL.String())
111-
resp, err := c.HTTPClient.PostForm(u.String(), form)
123+
req, err := http.NewRequest("POST", u.String(), strings.NewReader(form.Encode()))
124+
if err != nil {
125+
return nil, err
126+
}
127+
req.Header.Set("Accept", "application/json; charset=utf-8")
128+
resp, err := c.HTTPClient.Do(req)
112129
if err != nil {
113130
return nil, err
114131
}

‎textbox/textbox.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ func (c *Client) Info() (*boxutil.Info, error) {
8181
if !u.IsAbs() {
8282
return nil, errors.New("box address must be absolute")
8383
}
84-
resp, err := c.HTTPClient.Get(u.String())
84+
req, err := http.NewRequest("GET", u.String(), nil)
85+
if err != nil {
86+
return nil, err
87+
}
88+
req.Header.Set("Accept", "application/json; charset=utf-8")
89+
resp, err := c.HTTPClient.Do(req)
8590
if err != nil {
8691
return nil, err
8792
}
@@ -111,6 +116,7 @@ func (c *Client) Check(r io.Reader) (*Analysis, error) {
111116
if err != nil {
112117
return nil, err
113118
}
119+
req.Header.Set("Accept", "application/json; charset=utf-8")
114120
resp, err := c.HTTPClient.Do(req)
115121
if err != nil {
116122
return nil, err

0 commit comments

Comments
 (0)