Mathis/llamactl
1
0
Fork 0
mirror of https://github.com/lordmathis/llamactl.git synced 2025-11-06 00:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename config and instance struct to avoid awkward naming

Browse Source
This commit is contained in:
Matúš Námešný
2025-08-04 19:30:50 +02:00
parent 6a7a9a2d09
commit 2abe9c282e
9 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/config/config.go
View File

@@ -10,8 +10,8 @@ import (
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
// Config represents the configuration for llamactl // AppConfig represents the configuration for llamactl
type Config struct { type AppConfig struct {
Server ServerConfig `yaml:"server"` Server ServerConfig `yaml:"server"`
Instances InstancesConfig `yaml:"instances"` Instances InstancesConfig `yaml:"instances"`
Auth AuthConfig `yaml:"auth"` Auth AuthConfig `yaml:"auth"`
@@ -85,9 +85,9 @@ type AuthConfig struct {
// 1. Hardcoded defaults // 1. Hardcoded defaults
// 2. Config file // 2. Config file
// 3. Environment variables // 3. Environment variables
func LoadConfig(configPath string) (Config, error) { func LoadConfig(configPath string) (AppConfig, error) {
// 1. Start with defaults // 1. Start with defaults
cfg := Config{ cfg := AppConfig{
Server: ServerConfig{ Server: ServerConfig{
Host: "0.0.0.0", Host: "0.0.0.0",
Port: 8080, Port: 8080,
@@ -126,7 +126,7 @@ func LoadConfig(configPath string) (Config, error) {
} }
// loadConfigFile attempts to load config from file with fallback locations // loadConfigFile attempts to load config from file with fallback locations
func loadConfigFile(cfg *Config, configPath string) error { func loadConfigFile(cfg *AppConfig, configPath string) error {
var configLocations []string var configLocations []string
// If specific config path provided, use only that // If specific config path provided, use only that
@@ -150,7 +150,7 @@ func loadConfigFile(cfg *Config, configPath string) error {
} }
// loadEnvVars overrides config with environment variables // loadEnvVars overrides config with environment variables
func loadEnvVars(cfg *Config) { func loadEnvVars(cfg *AppConfig) {
// Server config // Server config
if host := os.Getenv("LLAMACTL_HOST"); host != "" { if host := os.Getenv("LLAMACTL_HOST"); host != "" {
cfg.Server.Host = host cfg.Server.Host = host

10
pkg/config/config_test.go
View File

@@ -271,31 +271,31 @@ func TestLoadConfig_EnvironmentVariableTypes(t *testing.T) {
testCases := []struct { testCases := []struct {
envVar string envVar string
envValue string envValue string
checkFn func(*config.Config) bool checkFn func(*config.AppConfig) bool
desc string desc string
}{ }{
{ {
envVar: "LLAMACTL_PORT", envVar: "LLAMACTL_PORT",
envValue: "invalid-port", envValue: "invalid-port",
checkFn: func(c *config.Config) bool { return c.Server.Port == 8080 }, // Should keep default checkFn: func(c *config.AppConfig) bool { return c.Server.Port == 8080 }, // Should keep default
desc: "invalid port number should keep default", desc: "invalid port number should keep default",
}, },
{ {
envVar: "LLAMACTL_MAX_INSTANCES", envVar: "LLAMACTL_MAX_INSTANCES",
envValue: "not-a-number", envValue: "not-a-number",
checkFn: func(c *config.Config) bool { return c.Instances.MaxInstances == -1 }, // Should keep default checkFn: func(c *config.AppConfig) bool { return c.Instances.MaxInstances == -1 }, // Should keep default
desc: "invalid max instances should keep default", desc: "invalid max instances should keep default",
}, },
{ {
envVar: "LLAMACTL_DEFAULT_AUTO_RESTART", envVar: "LLAMACTL_DEFAULT_AUTO_RESTART",
envValue: "invalid-bool", envValue: "invalid-bool",
checkFn: func(c *config.Config) bool { return c.Instances.DefaultAutoRestart == true }, // Should keep default checkFn: func(c *config.AppConfig) bool { return c.Instances.DefaultAutoRestart == true }, // Should keep default
desc: "invalid boolean should keep default", desc: "invalid boolean should keep default",
}, },
{ {
envVar: "LLAMACTL_INSTANCE_PORT_RANGE", envVar: "LLAMACTL_INSTANCE_PORT_RANGE",
envValue: "invalid-range", envValue: "invalid-range",
checkFn: func(c *config.Config) bool { return c.Instances.PortRange == [2]int{8000, 9000} }, // Should keep default checkFn: func(c *config.AppConfig) bool { return c.Instances.PortRange == [2]int{8000, 9000} }, // Should keep default
desc: "invalid port range should keep default", desc: "invalid port range should keep default",
}, },
} }

18
pkg/instance/instance.go
View File

@@ -55,8 +55,8 @@ func (c *CreateInstanceOptions) UnmarshalJSON(data []byte) error {
return nil return nil
} }
// Instance represents a running instance of the llama server // Process represents a running instance of the llama server
type Instance struct { type Process struct {
Name string `json:"name"` Name string `json:"name"`
options *CreateInstanceOptions `json:"-"` options *CreateInstanceOptions `json:"-"`
globalSettings *config.InstancesConfig globalSettings *config.InstancesConfig
@@ -145,7 +145,7 @@ func applyDefaultOptions(options *CreateInstanceOptions, globalSettings *config.
} }
// NewInstance creates a new instance with the given name, log path, and options // NewInstance creates a new instance with the given name, log path, and options
func NewInstance(name string, globalSettings *config.InstancesConfig, options *CreateInstanceOptions) *Instance { func NewInstance(name string, globalSettings *config.InstancesConfig, options *CreateInstanceOptions) *Process {
// Validate and copy options // Validate and copy options
optionsCopy := validateAndCopyOptions(name, options) optionsCopy := validateAndCopyOptions(name, options)
// Apply defaults // Apply defaults
@@ -153,7 +153,7 @@ func NewInstance(name string, globalSettings *config.InstancesConfig, options *C
// Create the instance logger // Create the instance logger
logger := NewInstanceLogger(name, globalSettings.LogsDir) logger := NewInstanceLogger(name, globalSettings.LogsDir)
return &Instance{ return &Process{
Name: name, Name: name,
options: optionsCopy, options: optionsCopy,
globalSettings: globalSettings, globalSettings: globalSettings,
@@ -165,13 +165,13 @@ func NewInstance(name string, globalSettings *config.InstancesConfig, options *C
} }
} }
func (i *Instance) GetOptions() *CreateInstanceOptions { func (i *Process) GetOptions() *CreateInstanceOptions {
i.mu.RLock() i.mu.RLock()
defer i.mu.RUnlock() defer i.mu.RUnlock()
return i.options return i.options
} }
func (i *Instance) SetOptions(options *CreateInstanceOptions) { func (i *Process) SetOptions(options *CreateInstanceOptions) {
i.mu.Lock() i.mu.Lock()
defer i.mu.Unlock() defer i.mu.Unlock()
@@ -190,7 +190,7 @@ func (i *Instance) SetOptions(options *CreateInstanceOptions) {
} }
// GetProxy returns the reverse proxy for this instance, creating it if needed // GetProxy returns the reverse proxy for this instance, creating it if needed
func (i *Instance) GetProxy() (*httputil.ReverseProxy, error) { func (i *Process) GetProxy() (*httputil.ReverseProxy, error) {
i.mu.Lock() i.mu.Lock()
defer i.mu.Unlock() defer i.mu.Unlock()
@@ -227,7 +227,7 @@ func (i *Instance) GetProxy() (*httputil.ReverseProxy, error) {
} }
// MarshalJSON implements json.Marshaler for Instance // MarshalJSON implements json.Marshaler for Instance
func (i *Instance) MarshalJSON() ([]byte, error) { func (i *Process) MarshalJSON() ([]byte, error) {
// Use read lock since we're only reading data // Use read lock since we're only reading data
i.mu.RLock() i.mu.RLock()
defer i.mu.RUnlock() defer i.mu.RUnlock()
@@ -249,7 +249,7 @@ func (i *Instance) MarshalJSON() ([]byte, error) {
} }
// UnmarshalJSON implements json.Unmarshaler for Instance // UnmarshalJSON implements json.Unmarshaler for Instance
func (i *Instance) UnmarshalJSON(data []byte) error { func (i *Process) UnmarshalJSON(data []byte) error {
// Create a temporary struct for unmarshalling // Create a temporary struct for unmarshalling
temp := struct { temp := struct {
Name string `json:"name"` Name string `json:"name"`

6
pkg/instance/instance_test.go
View File

@@ -286,7 +286,7 @@ func TestUnmarshalJSON(t *testing.T) {
} }
}` }`
var inst instance.Instance var inst instance.Process
err := json.Unmarshal([]byte(jsonData), &inst) err := json.Unmarshal([]byte(jsonData), &inst)
if err != nil { if err != nil {
t.Fatalf("JSON unmarshal failed: %v", err) t.Fatalf("JSON unmarshal failed: %v", err)
@@ -326,7 +326,7 @@ func TestUnmarshalJSON_PartialOptions(t *testing.T) {
} }
}` }`
var inst instance.Instance var inst instance.Process
err := json.Unmarshal([]byte(jsonData), &inst) err := json.Unmarshal([]byte(jsonData), &inst)
if err != nil { if err != nil {
t.Fatalf("JSON unmarshal failed: %v", err) t.Fatalf("JSON unmarshal failed: %v", err)
@@ -350,7 +350,7 @@ func TestUnmarshalJSON_NoOptions(t *testing.T) {
"running": false "running": false
}` }`
var inst instance.Instance var inst instance.Process
err := json.Unmarshal([]byte(jsonData), &inst) err := json.Unmarshal([]byte(jsonData), &inst)
if err != nil { if err != nil {
t.Fatalf("JSON unmarshal failed: %v", err) t.Fatalf("JSON unmarshal failed: %v", err)

10
pkg/instance/lifecycle.go
View File

@@ -11,7 +11,7 @@ import (
) )
// Start starts the llama server instance and returns an error if it fails. // Start starts the llama server instance and returns an error if it fails.
func (i *Instance) Start() error { func (i *Process) Start() error {
i.mu.Lock() i.mu.Lock()
defer i.mu.Unlock() defer i.mu.Unlock()
@@ -75,7 +75,7 @@ func (i *Instance) Start() error {
} }
// Stop terminates the subprocess // Stop terminates the subprocess
func (i *Instance) Stop() error { func (i *Process) Stop() error {
i.mu.Lock() i.mu.Lock()
if !i.Running { if !i.Running {
@@ -140,7 +140,7 @@ func (i *Instance) Stop() error {
return nil return nil
} }
func (i *Instance) monitorProcess() { func (i *Process) monitorProcess() {
defer func() { defer func() {
i.mu.Lock() i.mu.Lock()
if i.monitorDone != nil { if i.monitorDone != nil {
@@ -181,7 +181,7 @@ func (i *Instance) monitorProcess() {
} }
// handleRestart manages the restart process while holding the lock // handleRestart manages the restart process while holding the lock
func (i *Instance) handleRestart() { func (i *Process) handleRestart() {
// Validate restart conditions and get safe parameters // Validate restart conditions and get safe parameters
shouldRestart, maxRestarts, restartDelay := i.validateRestartConditions() shouldRestart, maxRestarts, restartDelay := i.validateRestartConditions()
if !shouldRestart { if !shouldRestart {
@@ -223,7 +223,7 @@ func (i *Instance) handleRestart() {
} }
// validateRestartConditions checks if the instance should be restarted and returns the parameters // validateRestartConditions checks if the instance should be restarted and returns the parameters
func (i *Instance) validateRestartConditions() (shouldRestart bool, maxRestarts int, restartDelay int) { func (i *Process) validateRestartConditions() (shouldRestart bool, maxRestarts int, restartDelay int) {
if i.options == nil { if i.options == nil {
log.Printf("Instance %s not restarting: options are nil", i.Name) log.Printf("Instance %s not restarting: options are nil", i.Name)
return false, 0, 0 return false, 0, 0

2
pkg/instance/logging.go
View File

@@ -52,7 +52,7 @@ func (i *InstanceLogger) Create() error {
} }
// GetLogs retrieves the last n lines of logs from the instance // GetLogs retrieves the last n lines of logs from the instance
func (i *Instance) GetLogs(num_lines int) (string, error) { func (i *Process) GetLogs(num_lines int) (string, error) {
i.mu.RLock() i.mu.RLock()
logFileName := i.logger.logFilePath logFileName := i.logger.logFilePath
i.mu.RUnlock() i.mu.RUnlock()

42
pkg/manager/manager.go
View File

@@ -15,21 +15,21 @@ import (
// InstanceManager defines the interface for managing instances of the llama server. // InstanceManager defines the interface for managing instances of the llama server.
type InstanceManager interface { type InstanceManager interface {
ListInstances() ([]*instance.Instance, error) ListInstances() ([]*instance.Process, error)
CreateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Instance, error) CreateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Process, error)
GetInstance(name string) (*instance.Instance, error) GetInstance(name string) (*instance.Process, error)
UpdateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Instance, error) UpdateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Process, error)
DeleteInstance(name string) error DeleteInstance(name string) error
StartInstance(name string) (*instance.Instance, error) StartInstance(name string) (*instance.Process, error)
StopInstance(name string) (*instance.Instance, error) StopInstance(name string) (*instance.Process, error)
RestartInstance(name string) (*instance.Instance, error) RestartInstance(name string) (*instance.Process, error)
GetInstanceLogs(name string) (string, error) GetInstanceLogs(name string) (string, error)
Shutdown() Shutdown()
} }
type instanceManager struct { type instanceManager struct {
mu sync.RWMutex mu sync.RWMutex
instances map[string]*instance.Instance instances map[string]*instance.Process
ports map[int]bool ports map[int]bool
instancesConfig config.InstancesConfig instancesConfig config.InstancesConfig
} }
@@ -37,7 +37,7 @@ type instanceManager struct {
// NewInstanceManager creates a new instance of InstanceManager. // NewInstanceManager creates a new instance of InstanceManager.
func NewInstanceManager(instancesConfig config.InstancesConfig) InstanceManager { func NewInstanceManager(instancesConfig config.InstancesConfig) InstanceManager {
im := &instanceManager{ im := &instanceManager{
instances: make(map[string]*instance.Instance), instances: make(map[string]*instance.Process),
ports: make(map[int]bool), ports: make(map[int]bool),
instancesConfig: instancesConfig, instancesConfig: instancesConfig,
} }
@@ -50,11 +50,11 @@ func NewInstanceManager(instancesConfig config.InstancesConfig) InstanceManager
} }
// ListInstances returns a list of all instances managed by the instance manager. // ListInstances returns a list of all instances managed by the instance manager.
func (im *instanceManager) ListInstances() ([]*instance.Instance, error) { func (im *instanceManager) ListInstances() ([]*instance.Process, error) {
im.mu.RLock() im.mu.RLock()
defer im.mu.RUnlock() defer im.mu.RUnlock()
instances := make([]*instance.Instance, 0, len(im.instances)) instances := make([]*instance.Process, 0, len(im.instances))
for _, inst := range im.instances { for _, inst := range im.instances {
instances = append(instances, inst) instances = append(instances, inst)
} }
@@ -63,7 +63,7 @@ func (im *instanceManager) ListInstances() ([]*instance.Instance, error) {
// CreateInstance creates a new instance with the given options and returns it. // CreateInstance creates a new instance with the given options and returns it.
// The instance is initially in a "stopped" state. // The instance is initially in a "stopped" state.
func (im *instanceManager) CreateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Instance, error) { func (im *instanceManager) CreateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Process, error) {
if options == nil { if options == nil {
return nil, fmt.Errorf("instance options cannot be nil") return nil, fmt.Errorf("instance options cannot be nil")
} }
@@ -117,7 +117,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.CreateI
} }
// GetInstance retrieves an instance by its name. // GetInstance retrieves an instance by its name.
func (im *instanceManager) GetInstance(name string) (*instance.Instance, error) { func (im *instanceManager) GetInstance(name string) (*instance.Process, error) {
im.mu.RLock() im.mu.RLock()
defer im.mu.RUnlock() defer im.mu.RUnlock()
@@ -130,7 +130,7 @@ func (im *instanceManager) GetInstance(name string) (*instance.Instance, error)
// UpdateInstance updates the options of an existing instance and returns it. // UpdateInstance updates the options of an existing instance and returns it.
// If the instance is running, it will be restarted to apply the new options. // If the instance is running, it will be restarted to apply the new options.
func (im *instanceManager) UpdateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Instance, error) { func (im *instanceManager) UpdateInstance(name string, options *instance.CreateInstanceOptions) (*instance.Process, error) {
im.mu.RLock() im.mu.RLock()
instance, exists := im.instances[name] instance, exists := im.instances[name]
im.mu.RUnlock() im.mu.RUnlock()
@@ -205,7 +205,7 @@ func (im *instanceManager) DeleteInstance(name string) error {
// StartInstance starts a stopped instance and returns it. // StartInstance starts a stopped instance and returns it.
// If the instance is already running, it returns an error. // If the instance is already running, it returns an error.
func (im *instanceManager) StartInstance(name string) (*instance.Instance, error) { func (im *instanceManager) StartInstance(name string) (*instance.Process, error) {
im.mu.RLock() im.mu.RLock()
instance, exists := im.instances[name] instance, exists := im.instances[name]
im.mu.RUnlock() im.mu.RUnlock()
@@ -232,7 +232,7 @@ func (im *instanceManager) StartInstance(name string) (*instance.Instance, error
} }
// StopInstance stops a running instance and returns it. // StopInstance stops a running instance and returns it.
func (im *instanceManager) StopInstance(name string) (*instance.Instance, error) { func (im *instanceManager) StopInstance(name string) (*instance.Process, error) {
im.mu.RLock() im.mu.RLock()
instance, exists := im.instances[name] instance, exists := im.instances[name]
im.mu.RUnlock() im.mu.RUnlock()
@@ -259,7 +259,7 @@ func (im *instanceManager) StopInstance(name string) (*instance.Instance, error)
} }
// RestartInstance stops and then starts an instance, returning the updated instance. // RestartInstance stops and then starts an instance, returning the updated instance.
func (im *instanceManager) RestartInstance(name string) (*instance.Instance, error) { func (im *instanceManager) RestartInstance(name string) (*instance.Process, error) {
instance, err := im.StopInstance(name) instance, err := im.StopInstance(name)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -295,7 +295,7 @@ func (im *instanceManager) getNextAvailablePort() (int, error) {
} }
// persistInstance saves an instance to its JSON file // persistInstance saves an instance to its JSON file
func (im *instanceManager) persistInstance(instance *instance.Instance) error { func (im *instanceManager) persistInstance(instance *instance.Process) error {
if im.instancesConfig.InstancesDir == "" { if im.instancesConfig.InstancesDir == "" {
return nil // Persistence disabled return nil // Persistence disabled
} }
@@ -336,7 +336,7 @@ func (im *instanceManager) Shutdown() {
continue continue
} }
go func(name string, inst *instance.Instance) { go func(name string, inst *instance.Process) {
defer wg.Done() defer wg.Done()
fmt.Printf("Stopping instance %s...\n", name) fmt.Printf("Stopping instance %s...\n", name)
// Attempt to stop the instance gracefully // Attempt to stop the instance gracefully
@@ -400,7 +400,7 @@ func (im *instanceManager) loadInstance(name, path string) error {
return fmt.Errorf("failed to read instance file: %w", err) return fmt.Errorf("failed to read instance file: %w", err)
} }
var persistedInstance instance.Instance var persistedInstance instance.Process
if err := json.Unmarshal(data, &persistedInstance); err != nil { if err := json.Unmarshal(data, &persistedInstance); err != nil {
return fmt.Errorf("failed to unmarshal instance: %w", err) return fmt.Errorf("failed to unmarshal instance: %w", err)
} }
@@ -433,7 +433,7 @@ func (im *instanceManager) loadInstance(name, path string) error {
// autoStartInstances starts instances that were running when persisted and have auto-restart enabled // autoStartInstances starts instances that were running when persisted and have auto-restart enabled
func (im *instanceManager) autoStartInstances() { func (im *instanceManager) autoStartInstances() {
im.mu.RLock() im.mu.RLock()
var instancesToStart []*instance.Instance var instancesToStart []*instance.Process
for _, inst := range im.instances { for _, inst := range im.instances {
if inst.Running && // Was running when persisted if inst.Running && // Was running when persisted
inst.GetOptions() != nil && inst.GetOptions() != nil &&

2
pkg/manager/manager_test.go
View File

@@ -687,7 +687,7 @@ func TestPersistence_InstancesLoadedFromDisk(t *testing.T) {
} }
// Check instances by name // Check instances by name
instancesByName := make(map[string]*instance.Instance) instancesByName := make(map[string]*instance.Process)
for _, inst := range instances { for _, inst := range instances {
instancesByName[inst.Name] = inst instancesByName[inst.Name] = inst
} }

4
pkg/server/handlers.go
View File

@@ -18,10 +18,10 @@ import (
type Handler struct { type Handler struct {
InstanceManager manager.InstanceManager InstanceManager manager.InstanceManager
cfg config.Config cfg config.AppConfig
} }
func NewHandler(im manager.InstanceManager, cfg config.Config) *Handler { func NewHandler(im manager.InstanceManager, cfg config.AppConfig) *Handler {
return &Handler{ return &Handler{
InstanceManager: im, InstanceManager: im,
cfg: cfg, cfg: cfg,