Small improvements and fix tests

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>

Author: mudler

core/launcher/launcher.go renamed to cli/launcher/internal/launcher.go

@@ -60,13 +60,16 @@ type Launcher struct {
 }
 
 // NewLauncher creates a new launcher instance
-func NewLauncher() *Launcher {
+func NewLauncher(ui *LauncherUI, window fyne.Window, app fyne.App) *Launcher {
 	return &Launcher{
 		releaseManager: NewReleaseManager(),
 		config:         &Config{},
 		logBuffer:      &strings.Builder{},
 		statusChannel:  make(chan string, 100),
 		ctx:            context.Background(),
+		ui:             ui,
+		window:         window,
+		app:            app,
 	}
 }
 
@@ -94,6 +97,9 @@ func (l *Launcher) setupLogging() error {
 
 // Initialize sets up the launcher
 func (l *Launcher) Initialize() error {
+	if l.app == nil {
+		return fmt.Errorf("app is nil")
+	}
 	log.Printf("Initializing launcher...")
 
 	// Setup logging
@@ -359,22 +365,10 @@ func (l *Launcher) SetConfig(config *Config) error {
 	return l.saveConfig()
 }
 
-func (l *Launcher) SetUI(ui *LauncherUI) {
-	l.ui = ui
-}
-
 func (l *Launcher) GetUI() *LauncherUI {
 	return l.ui
 }
 
-func (l *Launcher) SetWindow(window fyne.Window) {
-	l.window = window
-}
-
-func (l *Launcher) SetApp(app fyne.App) {
-	l.app = app
-}
-
 func (l *Launcher) SetSystray(systray *SystrayManager) {
 	l.systray = systray
 }

core/launcher/launcher_suite_test.go renamed to cli/launcher/internal/launcher_suite_test.go

@@ -8,7 +8,9 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/mudler/LocalAI/core/launcher"
+	"fyne.io/fyne/v2/app"
+
+	launcher "github.com/mudler/LocalAI/cli/launcher/internal"
 )
 
 var _ = Describe("Launcher", func() {
@@ -22,7 +24,10 @@ var _ = Describe("Launcher", func() {
 		tempDir, err = os.MkdirTemp("", "launcher-test-*")
 		Expect(err).ToNot(HaveOccurred())
 
-		launcherInstance = launcher.NewLauncher()
+		ui := launcher.NewLauncherUI()
+		app := app.NewWithID("com.localai.launcher")
+
+		launcherInstance = launcher.NewLauncher(ui, nil, app)
 	})
 
 	AfterEach(func() {
@@ -31,9 +36,7 @@ var _ = Describe("Launcher", func() {
 
 	Describe("NewLauncher", func() {
 		It("should create a launcher with default configuration", func() {
-			launcher := launcher.NewLauncher()
-			Expect(launcher).ToNot(BeNil())
-			Expect(launcher.GetConfig()).ToNot(BeNil())
+			Expect(launcherInstance.GetConfig()).ToNot(BeNil())
 		})
 	})
 
@@ -45,7 +48,7 @@ var _ = Describe("Launcher", func() {
 			config := launcherInstance.GetConfig()
 			Expect(config.ModelsPath).ToNot(BeEmpty())
 			Expect(config.BackendsPath).ToNot(BeEmpty())
-			Expect(config.Address).To(Equal(":8080"))
+			Expect(config.Address).To(Equal("127.0.0.1:8080"))
 			Expect(config.LogLevel).To(Equal("info"))
 		})
 
@@ -126,7 +129,7 @@ var _ = Describe("Launcher", func() {
 			Expect(err).To(HaveOccurred())
 			// Could be either "not found" or "permission denied" depending on test environment
 			errMsg := err.Error()
-			hasExpectedError := strings.Contains(errMsg, "LocalAI binary not found") ||
+			hasExpectedError := strings.Contains(errMsg, "LocalAI binary") ||
 				strings.Contains(errMsg, "permission denied")
 			Expect(hasExpectedError).To(BeTrue(), "Expected error about binary not found or permission denied, got: %s", errMsg)
 		})
@@ -187,7 +190,11 @@ var _ = Describe("Config", func() {
 		config := &launcher.Config{}
 		Expect(config.EnvironmentVars).To(BeNil())
 
-		launcher := launcher.NewLauncher()
+		ui := launcher.NewLauncherUI()
+		app := app.NewWithID("com.localai.launcher")
+
+		launcher := launcher.NewLauncher(ui, nil, app)
+
 		err := launcher.Initialize()
 		Expect(err).ToNot(HaveOccurred())
 

core/launcher/launcher_test.go renamed to cli/launcher/internal/launcher_test.go

@@ -8,7 +8,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/mudler/LocalAI/core/launcher"
+	launcher "github.com/mudler/LocalAI/cli/launcher/internal"
 )
 
 var _ = Describe("ReleaseManager", func() {
@@ -73,7 +73,7 @@ var _ = Describe("ReleaseManager", func() {
 			Expect(version).To(BeEmpty()) // No binary installed in test
 		})
 
-		It("should return version when binary exists", func() {
+		It("should return empty version when binary exists but no metadata", func() {
 			// Create a fake binary for testing
 			err := os.MkdirAll(rm.BinaryPath, 0755)
 			Expect(err).ToNot(HaveOccurred())
@@ -83,7 +83,7 @@ var _ = Describe("ReleaseManager", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			version := rm.GetInstalledVersion()
-			Expect(version).ToNot(BeEmpty()) // Should return fallback version
+			Expect(version).To(BeEmpty())
 		})
 	})
 

core/launcher/release_manager.go renamed to cli/launcher/internal/release_manager.go

@@ -9,7 +9,7 @@ import (
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/app"
 	"fyne.io/fyne/v2/driver/desktop"
-	coreLauncher "github.com/mudler/LocalAI/core/launcher"
+	coreLauncher "github.com/mudler/LocalAI/cli/launcher/internal"
 )
 
 func main() {
@@ -23,10 +23,7 @@ func main() {
 	ui := coreLauncher.NewLauncherUI()
 
 	// Initialize the launcher with UI context
-	launcher := coreLauncher.NewLauncher()
-	launcher.SetUI(ui)
-	launcher.SetWindow(myWindow)
-	launcher.SetApp(myApp)
+	launcher := coreLauncher.NewLauncher(ui, myWindow, myApp)
 
 	// Setup the UI
 	content := ui.CreateMainUI(launcher)