Changed Expiration type and added GetModel and DeleteModel

Author: matryer

suggestionbox/suggestionbox_model.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"path"
 	"strings"
-	"time"
 
 	"github.com/pkg/errors"
 )
@@ -66,8 +66,8 @@ func NewChoice(id string, features ...Feature) Choice {
 
 // ModelOptions describes the behaviours of a Model.
 type ModelOptions struct {
-	// Expiration is the time to wait for the reward before it expires.
-	Expiration time.Duration `json:"expiration,omitempty"`
+	// ExpirationSeconds is the number of seconds to wait for the reward before it expires.
+	ExpirationSeconds int `json:"expiration_seconds,omitempty"`
 
 	// Epsilon enables proportionate exploiting vs exploring ratio.
 	Epsilon float64 `json:"epsilon,omitempty"`
@@ -81,6 +81,83 @@ type ModelOptions struct {
 	Skipgrams int `json:"skipgrams,omitempty"`
 }
 
+// GetModel gets a Model by its ID.
+func (c *Client) GetModel(ctx context.Context, modelID string) (Model, error) {
+	var model Model
+	u, err := url.Parse(c.addr + "/" + path.Join("suggestionbox", "models", modelID))
+	if err != nil {
+		return model, err
+	}
+	if !u.IsAbs() {
+		return model, errors.New("box address must be absolute")
+	}
+	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+	if err != nil {
+		return model, err
+	}
+	req = req.WithContext(ctx)
+	req.Header.Set("Accept", "application/json; charset=utf-8")
+	req.Header.Set("Content-Type", "application/json; charset=utf-8")
+	resp, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return model, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return model, errors.New(resp.Status)
+	}
+	var response struct {
+		Success bool
+		Error   string
+		Model
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
+		return model, errors.Wrap(err, "decoding response")
+	}
+	if !response.Success {
+		return model, ErrSuggestionbox(response.Error)
+	}
+	return response.Model, nil
+}
+
+// DeleteModel gets a Model by its ID.
+func (c *Client) DeleteModel(ctx context.Context, modelID string) error {
+	u, err := url.Parse(c.addr + "/" + path.Join("suggestionbox", "models", modelID))
+	if err != nil {
+		return err
+	}
+	if !u.IsAbs() {
+		return errors.New("box address must be absolute")
+	}
+	req, err := http.NewRequest(http.MethodDelete, u.String(), nil)
+	if err != nil {
+		return err
+	}
+	req = req.WithContext(ctx)
+	req.Header.Set("Accept", "application/json; charset=utf-8")
+	req.Header.Set("Content-Type", "application/json; charset=utf-8")
+	resp, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return errors.New(resp.Status)
+	}
+	var response struct {
+		Success bool
+		Error   string
+		Model
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
+		return errors.Wrap(err, "decoding response")
+	}
+	if !response.Success {
+		return ErrSuggestionbox(response.Error)
+	}
+	return nil
+}
+
 // CreateModel creates the Model in Suggestionbox.
 // If no ID is set, one will be assigned in the return Model.
 func (c *Client) CreateModel(ctx context.Context, model Model) (Model, error) {

suggestionbox/suggestionbox_model_test.go

@@ -45,6 +45,53 @@ func TestCreateModel(t *testing.T) {
 	is.Equal(outModel.ID, "1") // outModel.ID
 }
 
+func TestGetModel(t *testing.T) {
+	is := is.New(t)
+	var apiCalls int
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		apiCalls++
+		is.Equal(r.Method, http.MethodGet)
+		is.Equal(r.URL.Path, "/suggestionbox/models/model1")
+		is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
+		model := suggestionbox.Model{
+			ID: "model1",
+		}
+		is.NoErr(json.NewEncoder(w).Encode(struct {
+			suggestionbox.Model
+			Success bool `json:"success"`
+		}{
+			Success: true,
+			Model:   model,
+		}))
+	}))
+	defer srv.Close()
+	sb := suggestionbox.New(srv.URL)
+	outModel, err := sb.GetModel(context.Background(), "model1")
+	is.NoErr(err)
+	is.Equal(apiCalls, 1)           // apiCalls
+	is.Equal(outModel.ID, "model1") // outModel.ID
+}
+
+func TestDeleteModel(t *testing.T) {
+	is := is.New(t)
+	var apiCalls int
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		apiCalls++
+		is.Equal(r.Method, http.MethodDelete)
+		is.Equal(r.URL.Path, "/suggestionbox/models/model1")
+		is.NoErr(json.NewEncoder(w).Encode(struct {
+			Success bool `json:"success"`
+		}{
+			Success: true,
+		}))
+	}))
+	defer srv.Close()
+	sb := suggestionbox.New(srv.URL)
+	err := sb.DeleteModel(context.Background(), "model1")
+	is.NoErr(err)
+	is.Equal(apiCalls, 1) // apiCalls
+}
+
 func TestNewModel(t *testing.T) {
 	is := is.New(t)