comparing 2b7ee08ec72727c295fbf95cd2953b6206507421 and main on hailey.at/photocopy

+5 -2

handle_create.go

···

       4
       4
        
       	"bytes"

     

       5
       5
        
       	"context"

     

       6
       6
        
       	"fmt"

     

       7
       7
       +
       	"slices"

     

       7
       8
        
       	"strings"

     

       8
       9
        
       	"time"

     

       9
       10
        
       

     
···

       130
       131
        
       		return err

     

       131
       132
        
       	}

     

       132
       133
        
       

     

       133
       133
       -
       	if rec.Text != "" && p.nervanaClient != nil {

     

       134
       134
       +
       	isEn := slices.Contains(rec.Langs, "en")

     

       135
       135
       +
       	if rec.Text != "" && rec.Reply == nil && isEn && p.nervanaClient != nil {

     

       134
       136
        
       		go func(ctx context.Context, rec bsky.FeedPost, did, rkey string) {

     

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

     

       136
       138
        
       			defer cancel()

     

       137
       139
        
       

     

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

     

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

     

       139
       141
        
       			if err != nil {

     

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

     

       141
       143
        
       				return

     
···

       150
       152
        
       					EntityId:    ni.EntityId,

     

       151
       153
        
       					Description: ni.Description,

     

       152
       154
        
       					Topic:       "",

     

       155
       155
       +
       					CreatedAt:   time.Now(),

     

       153
       156
        
       				}

     

       154
       157
        
       				p.inserters.labelsInserter.Insert(ctx, postLabel)

     

       155
       158
        
       			}

+77

nervana/client.go

···

       1
       1
       +
       package nervana

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"bytes"

     

       5
       5
       +
       	"context"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"fmt"

     

       8
       8
       +
       	"io"

     

       9
       9
       +
       	"net/http"

     

       10
       10
       +
       	"time"

     

       11
       11
       +
       )

     

       12
       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
       +
       

     

       29
       29
       +
       type NervanaItem struct {

     

       30
       30
       +
       	Text        string `json:"text"`

     

       31
       31
       +
       	Label       string `json:"label"`

     

       32
       32
       +
       	EntityId    string `json:"entityId"`

     

       33
       33
       +
       	Description string `json:"description"`

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

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

     

       37
       37
       +
       	payload := map[string]string{

     

       38
       38
       +
       		"text":     text,

     

       39
       39
       +
       		"language": "en",

     

       40
       40
       +
       	}

     

       41
       41
       +
       

     

       42
       42
       +
       	b, err := json.Marshal(payload)

     

       43
       43
       +
       	if err != nil {

     

       44
       44
       +
       		return nil, err

     

       45
       45
       +
       	}

     

       46
       46
       +
       

     

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

     

       48
       48
       +
       

     

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

     

       50
       50
       +
       

     

       51
       51
       +
       	return req, err

     

       52
       52
       +
       }

     

       53
       53
       +
       

     

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

     

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

     

       56
       56
       +
       	if err != nil {

     

       57
       57
       +
       		return nil, err

     

       58
       58
       +
       	}

     

       59
       59
       +
       

     

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

     

       61
       61
       +
       	if err != nil {

     

       62
       62
       +
       		return nil, err

     

       63
       63
       +
       	}

     

       64
       64
       +
       	defer resp.Body.Close()

     

       65
       65
       +
       

     

       66
       66
       +
       	if resp.StatusCode != 200 {

     

       67
       67
       +
       		io.Copy(io.Discard, resp.Body)

     

       68
       68
       +
       		return nil, fmt.Errorf("received non-200 response code: %d", resp.StatusCode)

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	var nervanaResp []NervanaItem

     

       72
       72
       +
       	if err := json.NewDecoder(resp.Body).Decode(&nervanaResp); err != nil {

     

       73
       73
       +
       		return nil, err

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       76
       76
       +
       	return nervanaResp, nil

     

       77
       77
       +
       }

-60

nervana.go

···

       1
       1
       -
       package photocopy

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"bytes"

     

       5
       5
       -
       	"context"

     

       6
       6
       -
       	"encoding/json"

     

       7
       7
       -
       	"fmt"

     

       8
       8
       -
       	"io"

     

       9
       9
       -
       	"net/http"

     

       10
       10
       -
       )

     

       11
       11
       -
       

     

       12
       12
       -
       type NervanaItem struct {

     

       13
       13
       -
       	Text        string `json:"text"`

     

       14
       14
       -
       	Label       string `json:"label"`

     

       15
       15
       -
       	EntityId    string `json:"entityId"`

     

       16
       16
       -
       	Description string `json:"description"`

     

       17
       17
       -
       }

     

       18
       18
       -
       

     

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

     

       20
       20
       -
       	payload := map[string]string{

     

       21
       21
       -
       		"text":     text,

     

       22
       22
       -
       		"language": "en",

     

       23
       23
       -
       	}

     

       24
       24
       -
       

     

       25
       25
       -
       	b, err := json.Marshal(payload)

     

       26
       26
       -
       	if err != nil {

     

       27
       27
       -
       		return nil, err

     

       28
       28
       -
       	}

     

       29
       29
       -
       

     

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

     

       31
       31
       -
       

     

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

     

       33
       33
       -
       

     

       34
       34
       -
       	return req, err

     

       35
       35
       -
       }

     

       36
       36
       -
       

     

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

     

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

     

       39
       39
       -
       	if err != nil {

     

       40
       40
       -
       		return nil, err

     

       41
       41
       -
       	}

     

       42
       42
       -
       

     

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

     

       44
       44
       -
       	if err != nil {

     

       45
       45
       -
       		return nil, err

     

       46
       46
       -
       	}

     

       47
       47
       -
       	defer resp.Body.Close()

     

       48
       48
       -
       

     

       49
       49
       -
       	if resp.StatusCode != 200 {

     

       50
       50
       -
       		io.Copy(io.Discard, resp.Body)

     

       51
       51
       -
       		return nil, fmt.Errorf("received non-200 response code: %d", resp.StatusCode)

     

       52
       52
       -
       	}

     

       53
       53
       -
       

     

       54
       54
       -
       	var nervanaResp []NervanaItem

     

       55
       55
       -
       	if err := json.NewDecoder(resp.Body).Decode(&nervanaResp); err != nil {

     

       56
       56
       -
       		return nil, err

     

       57
       57
       -
       	}

     

       58
       58
       -
       

     

       59
       59
       -
       	return nervanaResp, nil

     

       60
       60
       -
       }

+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