commit baeaadbf2829e5dfa102657d0ac994f51b8a40db · kot.pink/core

+17 -4

spindle/db/db.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
       -
       import "database/sql"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"database/sql"

     

       5
       5
       +
       

     

       6
       6
       +
       	_ "github.com/mattn/go-sqlite3"

     

       7
       7
       +
       )

     

       4
       8
        
       

     

       5
       9
        
       type DB struct {

     

       6
       10
        
       	*sql.DB

     
···

       27
       31
        
       		);

     

       28
       32
        
       

     

       29
       33
        
       		create table if not exists pipelines (

     

       30
       30
       -
       			rkey text not null,

     

       31
       31
       -
       			pipeline text not null, -- json

     

       32
       32
       -
       			primary key rkey

     

       34
       34
       +
       			at_uri text not null,

     

       35
       35
       +
       			status text not null,

     

       36
       36
       +
       

     

       37
       37
       +
       			-- only set if status is 'failed'

     

       38
       38
       +
       			error text,

     

       39
       39
       +
       			exit_code integer,

     

       40
       40
       +
       

     

       41
       41
       +
       			started_at timestamp not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       42
       42
       +
       			updated_at timestamp not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       43
       43
       +
       			finished_at timestamp,

     

       44
       44
       +
       

     

       45
       45
       +
       			primary key (at_uri)

     

       33
       46
        
       		);

     

       34
       47
        
       	`)

     

       35
       48
        
       	if err != nil {

+124 -34

spindle/db/pipelines.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       +
       	"time"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       8
       8
       +
       	"tangled.sh/tangled.sh/core/knotserver/notifier"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       type PipelineStatus string

     

       12
       12
       +
       

     

       13
       13
       +
       var (

     

       14
       14
       +
       	PipelinePending   PipelineStatus = "pending"

     

       15
       15
       +
       	PipelineRunning   PipelineStatus = "running"

     

       16
       16
       +
       	PipelineFailed    PipelineStatus = "failed"

     

       17
       17
       +
       	PipelineTimeout   PipelineStatus = "timeout"

     

       18
       18
       +
       	PipelineCancelled PipelineStatus = "cancelled"

     

       19
       19
       +
       	PipelineSuccess   PipelineStatus = "success"

     

       5
       20
        
       )

     

       6
       21
        
       

     

       7
       22
        
       type Pipeline struct {

     

       8
       8
       -
       	Rkey         string

     

       9
       9
       -
       	PipelineJson string

     

       23
       23
       +
       	Rkey   string         `json:"rkey"`

     

       24
       24
       +
       	Knot   string         `json:"knot"`

     

       25
       25
       +
       	Status PipelineStatus `json:"status"`

     

       26
       26
       +
       

     

       27
       27
       +
       	// only if Failed

     

       28
       28
       +
       	Error    string `json:"error"`

     

       29
       29
       +
       	ExitCode int    `json:"exit_code"`

     

       30
       30
       +
       

     

       31
       31
       +
       	StartedAt  time.Time `json:"started_at"`

     

       32
       32
       +
       	UpdatedAt  time.Time `json:"updated_at"`

     

       33
       33
       +
       	FinishedAt time.Time `json:"finished_at"`

     

       10
       34
        
       }

     

       11
       35
        
       

     

       12
       12
       -
       func (d *DB) InsertPipeline(pipeline Pipeline) error {

     

       13
       13
       -
       	_, err := d.Exec(

     

       14
       14
       -
       		`insert into pipelines (rkey, nsid, event) values (?, ?, ?)`,

     

       15
       15
       -
       		pipeline.Rkey,

     

       16
       16
       -
       		pipeline.PipelineJson,

     

       17
       17
       -
       	)

     

       36
       36
       +
       func (p Pipeline) AsRecord() *tangled.PipelineStatus {

     

       37
       37
       +
       	exitCode64 := int64(p.ExitCode)

     

       38
       38
       +
       	finishedAt := p.FinishedAt.String()

     

       39
       39
       +
       

     

       40
       40
       +
       	return &tangled.PipelineStatus{

     

       41
       41
       +
       		Pipeline: fmt.Sprintf("at://%s/%s", p.Knot, p.Rkey),

     

       42
       42
       +
       		Status:   string(p.Status),

     

       43
       43
       +
       

     

       44
       44
       +
       		ExitCode: &exitCode64,

     

       45
       45
       +
       		Error:    &p.Error,

     

       46
       46
       +
       

     

       47
       47
       +
       		StartedAt:  p.StartedAt.String(),

     

       48
       48
       +
       		UpdatedAt:  p.UpdatedAt.String(),

     

       49
       49
       +
       		FinishedAt: &finishedAt,

     

       50
       50
       +
       	}

     

       51
       51
       +
       }

     

       18
       52
        
       

     

       19
       19
       -
       	return err

     

       53
       53
       +
       func pipelineAtUri(rkey, knot string) string {

     

       54
       54
       +
       	return fmt.Sprintf("at://%s/did:web:%s/%s", tangled.PipelineStatusNSID, knot, rkey)

     

       20
       55
        
       }

     

       21
       56
        
       

     

       22
       22
       -
       func (d *DB) GetPipeline(rkey, cursor string) (Pipeline, error) {

     

       23
       23
       -
       	whereClause := "where rkey = ?"

     

       24
       24
       -
       	args := []any{rkey}

     

       57
       57
       +
       func (db *DB) CreatePipeline(rkey, knot string, n *notifier.Notifier) error {

     

       58
       58
       +
       	_, err := db.Exec(`

     

       59
       59
       +
       		insert into pipelines (at_uri, status)

     

       60
       60
       +
       		values (?, ?)

     

       61
       61
       +
       	`, pipelineAtUri(rkey, knot), PipelinePending)

     

       25
       62
        
       

     

       26
       26
       -
       	if cursor != "" {

     

       27
       27
       -
       		whereClause += " and rkey > ?"

     

       28
       28
       -
       		args = append(args, cursor)

     

       63
       63
       +
       	if err != nil {

     

       64
       64
       +
       		return err

     

       29
       65
        
       	}

     

       66
       66
       +
       	n.NotifyAll()

     

       67
       67
       +
       	return nil

     

       68
       68
       +
       }

     

       30
       69
        
       

     

       31
       31
       -
       	query := fmt.Sprintf(`

     

       32
       32
       -
       		select rkey, pipeline

     

       33
       33
       -
       		from pipelines

     

       34
       34
       -
       		%s

     

       35
       35
       -
       		limit 1

     

       36
       36
       -
       	`, whereClause)

     

       70
       70
       +
       func (db *DB) MarkPipelineRunning(rkey, knot string, n *notifier.Notifier) error {

     

       71
       71
       +
       	_, err := db.Exec(`

     

       72
       72
       +
       			update pipelines

     

       73
       73
       +
       			set status = ?, updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')

     

       74
       74
       +
       			where at_uri = ?

     

       75
       75
       +
       		`, PipelineRunning, pipelineAtUri(rkey, knot))

     

       37
       76
        
       

     

       38
       38
       -
       	row := d.QueryRow(query, args...)

     

       77
       77
       +
       	if err != nil {

     

       78
       78
       +
       		return err

     

       79
       79
       +
       	}

     

       80
       80
       +
       	n.NotifyAll()

     

       81
       81
       +
       	return nil

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       func (db *DB) MarkPipelineFailed(rkey, knot string, exitCode int, errorMsg string, n *notifier.Notifier) error {

     

       85
       85
       +
       	_, err := db.Exec(`

     

       86
       86
       +
       		update pipelines

     

       87
       87
       +
       		set status = ?,

     

       88
       88
       +
       		    exit_code = ?,

     

       89
       89
       +
       		    error = ?,

     

       90
       90
       +
       		    updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now'),

     

       91
       91
       +
       		    finished_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')

     

       92
       92
       +
       		where at_uri = ?

     

       93
       93
       +
       	`, PipelineFailed, exitCode, errorMsg, pipelineAtUri(rkey, knot))

     

       94
       94
       +
       	if err != nil {

     

       95
       95
       +
       		return err

     

       96
       96
       +
       	}

     

       97
       97
       +
       	n.NotifyAll()

     

       98
       98
       +
       	return nil

     

       99
       99
       +
       }

     

       100
       100
       +
       

     

       101
       101
       +
       func (db *DB) MarkPipelineTimeout(rkey, knot string, n *notifier.Notifier) error {

     

       102
       102
       +
       	_, err := db.Exec(`

     

       103
       103
       +
       			update pipelines

     

       104
       104
       +
       			set status = ?, updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')

     

       105
       105
       +
       			where at_uri = ?

     

       106
       106
       +
       		`, PipelineTimeout, pipelineAtUri(rkey, knot))

     

       107
       107
       +
       	if err != nil {

     

       108
       108
       +
       		return err

     

       109
       109
       +
       	}

     

       110
       110
       +
       	n.NotifyAll()

     

       111
       111
       +
       	return nil

     

       112
       112
       +
       }

     

       113
       113
       +
       

     

       114
       114
       +
       func (db *DB) MarkPipelineSuccess(rkey, knot string, n *notifier.Notifier) error {

     

       115
       115
       +
       	_, err := db.Exec(`

     

       116
       116
       +
       			update pipelines

     

       117
       117
       +
       			set status = ?, updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now'),

     

       118
       118
       +
       			finished_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')

     

       119
       119
       +
       			where at_uri = ?

     

       120
       120
       +
       		`, PipelineSuccess, pipelineAtUri(rkey, knot))

     

       39
       121
        
       

     

       40
       40
       -
       	var p Pipeline

     

       41
       41
       -
       	err := row.Scan(&p.Rkey, &p.PipelineJson)

     

       42
       122
        
       	if err != nil {

     

       43
       43
       -
       		return Pipeline{}, err

     

       123
       123
       +
       		return err

     

       44
       124
        
       	}

     

       125
       125
       +
       	n.NotifyAll()

     

       126
       126
       +
       	return nil

     

       127
       127
       +
       }

     

       45
       128
        
       

     

       46
       46
       -
       	return p, nil

     

       129
       129
       +
       func (db *DB) GetPipeline(rkey, knot string) (Pipeline, error) {

     

       130
       130
       +
       	var p Pipeline

     

       131
       131
       +
       	err := db.QueryRow(`

     

       132
       132
       +
       		select rkey, status, error, exit_code, started_at, updated_at, finished_at

     

       133
       133
       +
       		from pipelines

     

       134
       134
       +
       		where at_uri = ?

     

       135
       135
       +
       	`, pipelineAtUri(rkey, knot)).Scan(&p.Rkey, &p.Status, &p.Error, &p.ExitCode, &p.StartedAt, &p.UpdatedAt, &p.FinishedAt)

     

       136
       136
       +
       	return p, err

     

       47
       137
        
       }

     

       48
       138
        
       

     

       49
       49
       -
       func (d *DB) GetPipelines(cursor string) ([]Pipeline, error) {

     

       139
       139
       +
       func (db *DB) GetPipelines(cursor string) ([]Pipeline, error) {

     

       50
       140
        
       	whereClause := ""

     

       51
       141
        
       	args := []any{}

     

       52
       142
        
       	if cursor != "" {

     
···

       55
       145
        
       	}

     

       56
       146
        
       

     

       57
       147
        
       	query := fmt.Sprintf(`

     

       58
       58
       -
       		select rkey, nsid, pipeline

     

       148
       148
       +
       		select rkey, status, error, exit_code, started_at, updated_at, finished_at

     

       59
       149
        
       		from pipelines

     

       60
       150
        
       		%s

     

       61
       151
        
       		order by rkey asc

     

       62
       152
        
       		limit 100

     

       63
       153
        
       	`, whereClause)

     

       64
       154
        
       

     

       65
       65
       -
       	rows, err := d.Query(query, args...)

     

       155
       155
       +
       	rows, err := db.Query(query, args...)

     

       66
       156
        
       	if err != nil {

     

       67
       157
        
       		return nil, err

     

       68
       158
        
       	}

     

       69
       159
        
       	defer rows.Close()

     

       70
       160
        
       

     

       71
       71
       -
       	var evts []Pipeline

     

       161
       161
       +
       	var pipelines []Pipeline

     

       72
       162
        
       	for rows.Next() {

     

       73
       73
       -
       		var ev Pipeline

     

       74
       74
       -
       		rows.Scan(&ev.Rkey, &ev.PipelineJson)

     

       75
       75
       -
       		evts = append(evts, ev)

     

       163
       163
       +
       		var p Pipeline

     

       164
       164
       +
       		rows.Scan(&p.Rkey, &p.Status, &p.Error, &p.ExitCode, &p.StartedAt, &p.UpdatedAt, &p.FinishedAt)

     

       165
       165
       +
       		pipelines = append(pipelines, p)

     

       76
       166
        
       	}

     

       77
       167
        
       

     

       78
       168
        
       	if err := rows.Err(); err != nil {

     

       79
       169
        
       		return nil, err

     

       80
       170
        
       	}

     

       81
       171
        
       

     

       82
       82
       -
       	return evts, nil

     

       172
       172
       +
       	return pipelines, nil

     

       83
       173
        
       }