comparing a3804f0d3e9bdaf2910d201d0885afe7472fa4a7 and hailey/nervana-topics on hailey.at/photocopy

+1 -1

handle_create.go

···

       137
       137
        
       			ctx, cancel := context.WithTimeout(ctx, 5*time.Second)

     

       138
       138
        
       			defer cancel()

     

       139
       139
        
       

     

       140
       140
       -
       			nervanaItems, err := p.makeNervanaRequest(ctx, rec.Text)

     

       140
       140
       +
       			nervanaItems, err := p.nervanaClient.MakeRequest(ctx, rec.Text)

     

       141
       141
        
       			if err != nil {

     

       142
       142
        
       				p.logger.Error("error making nervana items request", "error", err)

     

       143
       143
        
       				return

+24 -7

nervana.go nervana/client.go

···

       1
       1
       -
       package photocopy

     

       1
       1
       +
       package nervana

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"bytes"

     
···

       7
       7
        
       	"fmt"

     

       8
       8
        
       	"io"

     

       9
       9
        
       	"net/http"

     

       10
       10
       +
       	"time"

     

       10
       11
        
       )

     

       11
       12
        
       

     

       13
       13
       +
       type Client struct {

     

       14
       14
       +
       	cli      *http.Client

     

       15
       15
       +
       	endpoint string

     

       16
       16
       +
       	apiKey   string

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       func NewClient(endpoint string, apiKey string) *Client {

     

       20
       20
       +
       	return &Client{

     

       21
       21
       +
       		cli: &http.Client{

     

       22
       22
       +
       			Timeout: 5 * time.Second,

     

       23
       23
       +
       		},

     

       24
       24
       +
       		endpoint: endpoint,

     

       25
       25
       +
       		apiKey:   apiKey,

     

       26
       26
       +
       	}

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       12
       29
        
       type NervanaItem struct {

     

       13
       30
        
       	Text        string `json:"text"`

     

       14
       31
        
       	Label       string `json:"label"`

     
···

       16
       33
        
       	Description string `json:"description"`

     

       17
       34
        
       }

     

       18
       35
        
       

     

       19
       19
       -
       func (p *Photocopy) newNervanaRequest(ctx context.Context, text string) (*http.Request, error) {

     

       36
       36
       +
       func (c *Client) newRequest(ctx context.Context, text string) (*http.Request, error) {

     

       20
       37
        
       	payload := map[string]string{

     

       21
       38
        
       		"text":     text,

     

       22
       39
        
       		"language": "en",

     
···

       27
       44
        
       		return nil, err

     

       28
       45
        
       	}

     

       29
       46
        
       

     

       30
       30
       -
       	req, err := http.NewRequestWithContext(ctx, "POST", p.nervanaEndpoint, bytes.NewReader(b))

     

       47
       47
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", c.endpoint, bytes.NewReader(b))

     

       31
       48
        
       

     

       32
       32
       -
       	req.Header.Set("Authorization", "Bearer "+p.nervanaApiKey)

     

       49
       49
       +
       	req.Header.Set("Authorization", "Bearer "+c.apiKey)

     

       33
       50
        
       

     

       34
       51
        
       	return req, err

     

       35
       52
        
       }

     

       36
       53
        
       

     

       37
       37
       -
       func (p *Photocopy) makeNervanaRequest(ctx context.Context, text string) ([]NervanaItem, error) {

     

       38
       38
       -
       	req, err := p.newNervanaRequest(ctx, text)

     

       54
       54
       +
       func (c *Client) MakeRequest(ctx context.Context, text string) ([]NervanaItem, error) {

     

       55
       55
       +
       	req, err := c.newRequest(ctx, text)

     

       39
       56
        
       	if err != nil {

     

       40
       57
        
       		return nil, err

     

       41
       58
        
       	}

     

       42
       59
        
       

     

       43
       43
       -
       	resp, err := p.nervanaClient.Do(req)

     

       60
       60
       +
       	resp, err := c.cli.Do(req)

     

       44
       61
        
       	if err != nil {

     

       45
       62
        
       		return nil, err

     

       46
       63
        
       	}

+3 -6

photocopy.go

···

       11
       11
        
       	"github.com/ClickHouse/clickhouse-go/v2"

     

       12
       12
        
       	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"

     

       13
       13
        
       	"github.com/haileyok/photocopy/clickhouse_inserter"

     

       14
       14
       +
       	"github.com/haileyok/photocopy/nervana"

     

       14
       15
        
       	"github.com/prometheus/client_golang/prometheus"

     

       15
       16
        
       	"github.com/prometheus/client_golang/prometheus/promauto"

     

       16
       17
        
       	"github.com/prometheus/client_golang/prometheus/promhttp"

     
···

       33
       34
        
       

     

       34
       35
        
       	conn driver.Conn

     

       35
       36
        
       

     

       36
       36
       -
       	nervanaClient   *http.Client

     

       37
       37
       +
       	nervanaClient   *nervana.Client

     

       37
       38
        
       	nervanaEndpoint string

     

       38
       39
        
       	nervanaApiKey   string

     

       39
       40
        
       }

     
···

       212
       213
        
       	p.plcScraper = plcs

     

       213
       214
        
       

     

       214
       215
        
       	if args.NervanaApiKey != "" && args.NervanaEndpoint != "" {

     

       215
       215
       -
       		p.nervanaClient = &http.Client{

     

       216
       216
       -
       			Timeout: 5 * time.Second,

     

       217
       217
       -
       		}

     

       218
       218
       -
       		p.nervanaEndpoint = args.NervanaEndpoint

     

       219
       219
       -
       		p.nervanaApiKey = args.NervanaApiKey

     

       216
       216
       +
       		p.nervanaClient = nervana.NewClient(args.NervanaEndpoint, args.NervanaApiKey)

     

       220
       217
        
       	}

     

       221
       218
        
       

     

       222
       219
        
       	return p, nil

Compare changes