sandbox: Make updated resource path configurable

Signed-off-by: Piotr Stankiewicz <[email protected]>

Author: Piotr Stankiewicz

pkg/inference/backends/llamacpp/llamacpp.go

@@ -171,6 +171,7 @@ func (l *llamaCpp) Run(ctx context.Context, socket, model string, mode inference
 			command.Stdout = serverLogStream
 			command.Stderr = out
 		},
+		l.updatedServerStoragePath,
 		filepath.Join(binPath, "com.docker.llama-server"),
 		args...,
 	)

pkg/sandbox/sandbox_darwin.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"os/user"
+	"path/filepath"
 	"strings"
 )
 
@@ -78,8 +79,8 @@ const ConfigurationLlamaCpp = `(version 1)
     (subpath "/usr")
     (subpath "/System")
     (regex #"Docker\.app/Contents/Resources/model-runner")
-    (subpath "[HOMEDIR]/.docker/bin/inference")
-    (subpath "[HOMEDIR]/.docker/bin/lib"))
+    (subpath "[UPDATEDBINPATH]")
+    (subpath "[UPDATEDLIBPATH]"))
 (allow file-write*
     (literal "/dev/null")
     (subpath "/private/var")
@@ -116,7 +117,7 @@ func (s *sandbox) Close() error {
 // configuration, for which a pre-defined value should be used. The modifier
 // function allows for an optional callback (which may be nil) to configure the
 // command before it is started.
-func Create(ctx context.Context, configuration string, modifier func(*exec.Cmd), name string, arg ...string) (Sandbox, error) {
+func Create(ctx context.Context, configuration string, modifier func(*exec.Cmd), updatedBinPath, name string, arg ...string) (Sandbox, error) {
 	// Look up the user's home directory.
 	currentUser, err := user.Current()
 	if err != nil {
@@ -133,6 +134,8 @@ func Create(ctx context.Context, configuration string, modifier func(*exec.Cmd),
 	// text/template if this gets any more complex.
 	profile := strings.ReplaceAll(configuration, "[HOMEDIR]", currentUser.HomeDir)
 	profile = strings.ReplaceAll(profile, "[WORKDIR]", currentDirectory)
+	profile = strings.ReplaceAll(profile, "[UPDATEDBINPATH]", updatedBinPath)
+	profile = strings.ReplaceAll(profile, "[UPDATEDLIBPATH]", filepath.Join(filepath.Dir(updatedBinPath), "lib"))
 
 	// Create a subcontext we can use to regulate the process lifetime.
 	ctx, cancel := context.WithCancel(ctx)

pkg/sandbox/sandbox_other.go

@@ -36,7 +36,7 @@ func (s *sandbox) Close() error {
 // configuration, for which a pre-defined value should be used. The modifier
 // function allows for an optional callback (which may be nil) to configure the
 // command before it is started.
-func Create(ctx context.Context, configuration string, modifier func(*exec.Cmd), name string, arg ...string) (Sandbox, error) {
+func Create(ctx context.Context, configuration string, modifier func(*exec.Cmd), updatedBinPath, name string, arg ...string) (Sandbox, error) {
 	// Create a subcontext we can use to regulate the process lifetime.
 	ctx, cancel := context.WithCancel(ctx)
 

pkg/sandbox/sandbox_test.go

@@ -10,9 +10,9 @@ func TestSandbox(t *testing.T) {
 	var sandbox Sandbox
 	var err error
 	if runtime.GOOS == "windows" {
-		sandbox, err = Create(t.Context(), ConfigurationLlamaCpp, nil, "go", "version")
+		sandbox, err = Create(t.Context(), ConfigurationLlamaCpp, nil, "/some/path/bin", "go", "version")
 	} else {
-		sandbox, err = Create(t.Context(), ConfigurationLlamaCpp, nil, "date")
+		sandbox, err = Create(t.Context(), ConfigurationLlamaCpp, nil, "/some/path/bin", "date")
 	}
 	if err != nil {
 		t.Fatal("unable to create sandboxed process:", err)

pkg/sandbox/sandbox_windows.go

@@ -65,7 +65,7 @@ func (s *sandbox) Close() error {
 // configuration, for which a pre-defined value should be used. The modifier
 // function allows for an optional callback (which may be nil) to configure the
 // command before it is started.
-func Create(ctx context.Context, configuration string, modifier func(*exec.Cmd), name string, arg ...string) (Sandbox, error) {
+func Create(ctx context.Context, configuration string, modifier func(*exec.Cmd), updatedBinPath, name string, arg ...string) (Sandbox, error) {
 	// Parse the configuration and configure limits.
 	limits := []winjob.Limit{winjob.WithKillOnJobClose()}
 	tokens := limitTokenMatcher.FindAllString(configuration, -1)