mirror of
https://github.com/mudler/LocalAI.git
synced 2026-06-26 01:16:58 -04:00
feat(backends): make PreferDevelopmentBackends install the development image as primary
When LOCALAI_PREFER_DEV_BACKENDS is set, install the -development image as the primary backend URI (keeping the released image reachable as the first fallback), instead of only reaching development as a download fallback when the released image is missing. This lets an operator force backends built from the development branch — e.g. to pick up a fix already on master before a release. Threads PreferDevelopmentBackends through SystemState so InstallBackend can see it, and reuses the same development-URI convention as the existing failure-path fallback (released tag -> branch tag + dev suffix). The unexported developmentURI helper is covered by a Ginkgo spec. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
This commit is contained in:
@@ -203,6 +203,7 @@ func (r *RunCMD) Run(ctx *cliContext.Context) error {
|
||||
system.WithBackendImagesReleaseTag(r.BackendImagesReleaseTag),
|
||||
system.WithBackendImagesBranchTag(r.BackendImagesBranchTag),
|
||||
system.WithBackendDevSuffix(r.BackendDevSuffix),
|
||||
system.WithPreferDevelopmentBackends(r.PreferDevelopmentBackends),
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -59,6 +59,22 @@ func getFallbackTagValues(systemState *system.SystemState) (latestTag, masterTag
|
||||
return latestTag, masterTag, devSuffix
|
||||
}
|
||||
|
||||
// developmentURI returns the development image URI for a released backend URI by
|
||||
// swapping the released tag for the branch tag (e.g.
|
||||
// latest-metal-darwin-arm64-llama-cpp -> master-metal-darwin-arm64-llama-cpp).
|
||||
// The branch image tracks development. ok is false when uri has no released tag
|
||||
// to swap or already uses the branch tag.
|
||||
func developmentURI(uri, latestTag, masterTag string) (string, bool) {
|
||||
if strings.Contains(uri, masterTag+"-") {
|
||||
return "", false
|
||||
}
|
||||
branchURI := strings.Replace(uri, latestTag+"-", masterTag+"-", 1)
|
||||
if branchURI == uri {
|
||||
return "", false
|
||||
}
|
||||
return branchURI, true
|
||||
}
|
||||
|
||||
// backendCandidate represents an installed concrete backend option for a given alias
|
||||
type backendCandidate struct {
|
||||
name string
|
||||
@@ -295,15 +311,28 @@ func InstallBackend(ctx context.Context, systemState *system.SystemState, modelL
|
||||
return fmt.Errorf("backend %q: %w", config.Name, optsErr)
|
||||
}
|
||||
|
||||
uri := downloader.URI(config.URI)
|
||||
// PreferDevelopmentBackends installs the development image as the primary URI,
|
||||
// keeping the released image reachable as the first fallback — instead of only
|
||||
// reaching development when the released image is missing.
|
||||
primaryURI := string(config.URI)
|
||||
mirrors := config.Mirrors
|
||||
if systemState.PreferDevelopmentBackends {
|
||||
if devURI, ok := developmentURI(string(config.URI), latestTag, masterTag); ok {
|
||||
xlog.Info("PreferDevelopmentBackends: installing development image first", "development", devURI, "released", config.URI)
|
||||
primaryURI = devURI
|
||||
mirrors = append([]string{string(config.URI)}, config.Mirrors...)
|
||||
}
|
||||
}
|
||||
|
||||
uri := downloader.URI(primaryURI)
|
||||
// Check if it is a directory
|
||||
if uri.LooksLikeDir() {
|
||||
// It is a directory, we just copy it over in the backend folder
|
||||
if err := cp.Copy(config.URI, backendPath); err != nil {
|
||||
if err := cp.Copy(string(uri), backendPath); err != nil {
|
||||
return fmt.Errorf("failed copying: %w", err)
|
||||
}
|
||||
} else {
|
||||
xlog.Debug("Downloading backend", "uri", config.URI, "backendPath", backendPath)
|
||||
xlog.Debug("Downloading backend", "uri", primaryURI, "backendPath", backendPath)
|
||||
if err := uri.DownloadFileWithContext(ctx, backendPath, config.SHA256, 1, 1, downloadStatus, downloadOpts...); err != nil {
|
||||
xlog.Debug("Backend download failed, trying fallback", "backendPath", backendPath, "error", err)
|
||||
|
||||
@@ -316,8 +345,9 @@ func InstallBackend(ctx context.Context, systemState *system.SystemState, modelL
|
||||
}
|
||||
|
||||
success := false
|
||||
// Try to download from mirrors
|
||||
for _, mirror := range config.Mirrors {
|
||||
// Try to download from mirrors (when development is preferred, the
|
||||
// released image is prepended here as the first fallback).
|
||||
for _, mirror := range mirrors {
|
||||
// Check for cancellation before trying next mirror
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
|
||||
26
core/gallery/backends_devuri_test.go
Normal file
26
core/gallery/backends_devuri_test.go
Normal file
@@ -0,0 +1,26 @@
|
||||
package gallery
|
||||
|
||||
import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
)
|
||||
|
||||
var _ = Describe("developmentURI", func() {
|
||||
const latest, master = "latest", "master"
|
||||
|
||||
It("rewrites a released image to its branch (development) image", func() {
|
||||
got, ok := developmentURI("quay.io/go-skynet/local-ai-backends:latest-metal-darwin-arm64-llama-cpp", latest, master)
|
||||
Expect(ok).To(BeTrue())
|
||||
Expect(got).To(Equal("quay.io/go-skynet/local-ai-backends:master-metal-darwin-arm64-llama-cpp"))
|
||||
})
|
||||
|
||||
It("leaves an image already on the branch tag untouched", func() {
|
||||
_, ok := developmentURI("quay.io/go-skynet/local-ai-backends:master-metal-darwin-arm64-llama-cpp", latest, master)
|
||||
Expect(ok).To(BeFalse())
|
||||
})
|
||||
|
||||
It("returns ok=false when there is no released tag to swap", func() {
|
||||
_, ok := developmentURI("oci://localhost/custom-backend:edge", latest, master)
|
||||
Expect(ok).To(BeFalse())
|
||||
})
|
||||
})
|
||||
@@ -26,6 +26,10 @@ type SystemState struct {
|
||||
BackendImagesReleaseTag string
|
||||
BackendImagesBranchTag string
|
||||
BackendDevSuffix string
|
||||
// PreferDevelopmentBackends installs the development image as the primary
|
||||
// backend URI (the released image becomes a fallback) rather than only using
|
||||
// development as a download fallback when the released image is missing.
|
||||
PreferDevelopmentBackends bool
|
||||
}
|
||||
|
||||
type SystemStateOptions func(*SystemState)
|
||||
@@ -66,6 +70,12 @@ func WithBackendDevSuffix(suffix string) SystemStateOptions {
|
||||
}
|
||||
}
|
||||
|
||||
func WithPreferDevelopmentBackends(prefer bool) SystemStateOptions {
|
||||
return func(s *SystemState) {
|
||||
s.PreferDevelopmentBackends = prefer
|
||||
}
|
||||
}
|
||||
|
||||
func GetSystemState(opts ...SystemStateOptions) (*SystemState, error) {
|
||||
state := &SystemState{}
|
||||
for _, opt := range opts {
|
||||
|
||||
Reference in New Issue
Block a user