Merge pull request #5 from invoker

Invoker base

Author: grphil

common/config/config.go

@@ -0,0 +1,49 @@
+package config
+
+import (
+	"os"
+
+	"github.com/xorcare/pointer"
+	"gopkg.in/yaml.v3"
+)
+
+type Config struct {
+	Port int     `yaml:"Port"`
+	Host *string `yaml:"Host,omitempty"` // leave empty for localhost
+
+	LogPath  *string `yaml:"LogPath,omitempty"`
+	LogLevel *int    `yaml:"LogLevel,omitempty"`
+
+	Invoker *InvokerConfig `yaml:"Invoker,omitempty"`
+	// TODO: Add instances here
+
+	DB DBConfig `yaml:"DB"`
+	// if instance is set up on server, leave connection empty
+	MasterConnection  *Connection `yaml:"MasterConnection,omitempty"`
+	StorageConnection *Connection `yaml:"StorageConnection,omitempty"`
+}
+
+func ReadConfig(configPath string) *Config {
+	content, err := os.ReadFile(configPath)
+	if err != nil {
+		panic(err)
+	}
+
+	config := new(Config)
+	err = yaml.Unmarshal(content, config)
+	if err != nil {
+		panic(err)
+	}
+
+	fillInConfig(config)
+
+	return config
+}
+
+func fillInConfig(config *Config) {
+	if config.Host == nil {
+		config.Host = pointer.String("localhost")
+	}
+
+	fillInConnections(config)
+}

common/config/connection.go

@@ -0,0 +1,10 @@
+package config
+
+type Connection struct {
+	Address string `yaml:"Address"`
+	// TODO: Add authentification
+}
+
+func fillInConnections(config *Config) {
+	// TODO: Add auto connection creation if master or storageconn are set up
+}

common/config/db.go

@@ -0,0 +1,5 @@
+package config
+
+type DBConfig struct {
+	Dsn string `yaml:"dsn"`
+}

common/config/invoker.go

@@ -0,0 +1,23 @@
+package config
+
+import "github.com/xorcare/pointer"
+
+type InvokerConfig struct {
+	Instances int  `yaml:"Instances"`
+	QueueSize *int `yaml:"QueueSize,omitempty"` // default is 10
+
+	CacheSize uint64 `yaml:"CacheSize"`
+	CachePath string `yaml:"CachePath"`
+}
+
+func fillInInvokerConfig(config *InvokerConfig) {
+	if config.QueueSize == nil {
+		config.QueueSize = pointer.Int(10)
+	}
+	if len(config.CachePath) == 0 {
+		panic("No invoker cache path specified")
+	}
+	if config.CacheSize == 0 {
+		panic("No invoker cache size specified")
+	}
+}

common/connectors/invokerconn/structs.go

@@ -0,0 +1,21 @@
+package invokerconn
+
+import (
+	"testing_system/common/db/models"
+)
+
+// This will be changed in later commits
+
+const (
+	JobTypeCompile = iota
+	JobTypeTest
+)
+
+type Job struct {
+	SubmitID uint `json:"submitID" binding:"required"`
+	JobType  int  `json:"jobType" binding:"required"`
+	Test     int  `json:"test"`
+
+	Submit  *models.Submission `json:"submit,omitempty"`
+	Problem *models.Problem    `json:"problem,omitempty"`
+}

common/connectors/storageconn/resourcetype_string.go

@@ -0,0 +1,25 @@
+package storageconn
+
+import (
+	"testing_system/common"
+)
+
+type Connector struct {
+	// TODO: Add storage data loader
+}
+
+func NewStorageConnector(ts *common.TestingSystem) *Connector {
+	return nil
+}
+
+func (s *Connector) Download(request Request) *ResponseFiles {
+	return nil
+}
+
+func (s *Connector) Upload(request Request) *Response {
+	return nil
+}
+
+func (s *Connector) Delete(request Request) *Response {
+	return nil
+}

common/connectors/storageconn/storage_connector.go

@@ -0,0 +1,96 @@
+package storageconn
+
+//go:generate stringer -type=ResourceType
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+	"testing_system/lib/logger"
+)
+
+type ResourceType int
+
+const (
+	SourceCode ResourceType = iota
+	CompiledBinary
+	Test
+	Checker
+	Interactor
+	// Will be increased
+)
+
+type Request struct {
+	// Should be always specified
+	Resource ResourceType `json:"resource"`
+
+	// If resource is part of problem, ProblemID is used
+	ProblemID uint64 `json:"problemID"`
+	// If resource is part of submit, SubmitID is used
+	SubmitID uint64 `json:"submitID"`
+	// If resource is a test, TestID should be specified
+	TestID uint64 `json:"testID"`
+
+	// For any download, BaseFolder should be specified. The files with original filenames will be placed there
+	BaseFolder string `json:"-"`
+
+	// For uploads, FilePath or FilePaths should be specified (depending on whether the resource is single-file or not).
+	// Filename will be taken from filename inside the path.
+	FilePath  string   `json:"-"`
+	FilePaths []string `json:"-"`
+}
+
+func (s *Request) FillBaseFolder(parent string) {
+	s.BaseFolder = filepath.Join(parent, s.Resource.String())
+	switch s.Resource {
+	case SourceCode, CompiledBinary:
+		s.BaseFolder = filepath.Join(s.BaseFolder, strconv.FormatUint(s.SubmitID, 10))
+	case Checker, Interactor:
+		s.BaseFolder = filepath.Join(s.BaseFolder, strconv.FormatUint(s.ProblemID, 10))
+	case Test:
+		s.BaseFolder = filepath.Join(s.BaseFolder, fmt.Sprintf("%d-%d", s.SubmitID, s.TestID))
+	default:
+		logger.Panic("Can not fill base folder for storageconn request of type %s", s.Resource)
+	}
+}
+
+type Response struct {
+	R     Request
+	Error error
+}
+
+type ResponseFiles struct {
+	Response
+	fileNames []string
+	Size      uint64
+}
+
+func (r *ResponseFiles) File() (string, bool) {
+	if len(r.fileNames) == 0 {
+		return "", false
+	}
+	return filepath.Join(r.R.BaseFolder, r.fileNames[0]), true
+}
+
+func (r *ResponseFiles) Get(fileName string) (string, bool) {
+	for _, f := range r.fileNames {
+		if fileName == f {
+			return filepath.Join(r.R.BaseFolder, f), true
+		}
+	}
+	return "", false
+}
+
+func (r *ResponseFiles) CleanUp() {
+	if r.Error != nil {
+		return
+	}
+	if len(r.R.BaseFolder) == 0 {
+		return
+	}
+	err := os.RemoveAll(r.R.BaseFolder)
+	if err != nil {
+		logger.Panic("Can not remove resource folder, error: %s", err.Error())
+	}
+}

common/connectors/storageconn/structs.go

@@ -4,10 +4,11 @@ import (
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"log/slog"
-	"testing_system/db/models"
+	"testing_system/common/config"
+	"testing_system/common/db/models"
 )
 
-func NewDb(config Config) (*gorm.DB, error) {
+func NewDB(config config.DBConfig) (*gorm.DB, error) {
 	db, err := gorm.Open(postgres.Open(config.Dsn), &gorm.Config{})
 	if err != nil {
 		slog.Error("Can't open database", "dsn", config.Dsn, "err", err)