Implement Docker command handling for Llama, MLX, and vLLM backends

This commit is contained in:
2025-09-24 21:31:58 +02:00
parent 72d2a601c8
commit 76ac93bedc
4 changed files with 222 additions and 16 deletions

View File

@@ -1,7 +1,11 @@
package mlx
import (
"context"
"fmt"
"llamactl/pkg/backends"
"llamactl/pkg/config"
"os/exec"
)
type MlxServerOptions struct {
@@ -36,6 +40,56 @@ func (o *MlxServerOptions) BuildCommandArgs() []string {
return backends.BuildCommandArgs(o, multipleFlags)
}
// BuildCommandArgsWithDocker converts to command line arguments,
// handling Docker transformations if needed
func (o *MlxServerOptions) BuildCommandArgsWithDocker(dockerImage string) []string {
args := o.BuildCommandArgs()
// No special Docker transformations needed for MLX
return args
}
// BuildCommand creates the complete command for execution, handling Docker vs native execution
func (o *MlxServerOptions) BuildCommand(ctx context.Context, backendConfig *config.BackendSettings) (*exec.Cmd, error) {
// Build instance-specific arguments using backend functions
var instanceArgs []string
if backendConfig.Docker != nil && backendConfig.Docker.Enabled {
// Use Docker-aware argument building
instanceArgs = o.BuildCommandArgsWithDocker(backendConfig.Docker.Image)
} else {
// Use regular argument building for native execution
instanceArgs = o.BuildCommandArgs()
}
// Combine backend args with instance args
finalArgs := append(backendConfig.Args, instanceArgs...)
// Choose Docker vs Native execution
if backendConfig.Docker != nil && backendConfig.Docker.Enabled {
return buildDockerCommand(ctx, backendConfig, finalArgs)
} else {
return exec.CommandContext(ctx, backendConfig.Command, finalArgs...), nil
}
}
// buildDockerCommand builds a Docker command with the specified configuration and arguments
func buildDockerCommand(ctx context.Context, backendConfig *config.BackendSettings, args []string) (*exec.Cmd, error) {
// Start with configured Docker arguments (should include "run", "--rm", etc.)
dockerArgs := make([]string, len(backendConfig.Docker.Args))
copy(dockerArgs, backendConfig.Docker.Args)
// Add environment variables
for key, value := range backendConfig.Docker.Environment {
dockerArgs = append(dockerArgs, "-e", fmt.Sprintf("%s=%s", key, value))
}
// Add image and container arguments
dockerArgs = append(dockerArgs, backendConfig.Docker.Image)
dockerArgs = append(dockerArgs, args...)
return exec.CommandContext(ctx, "docker", dockerArgs...), nil
}
// ParseMlxCommand parses a mlx_lm.server command string into MlxServerOptions
// Supports multiple formats:
// 1. Full command: "mlx_lm.server --model model/path"