minor improvements

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

Author: mudler

core/http/elements/gallery.go

@@ -106,20 +106,20 @@ func cardSpan(text, icon string) elem.Node {
 func ListModels(models []*gallery.GalleryModel, installing *xsync.SyncedMap[string, string]) string {
 	//StartProgressBar(uid, "0")
 	modelsElements := []elem.Node{}
-	span := func(s string) elem.Node {
-		return elem.Span(
-			attrs.Props{
-				"class": "float-right inline-block bg-green-500 text-white py-1 px-3 rounded-full text-xs",
-			},
-			elem.Text(s),
-		)
-	}
+	// span := func(s string) elem.Node {
+	// 	return elem.Span(
+	// 		attrs.Props{
+	// 			"class": "float-right inline-block bg-green-500 text-white py-1 px-3 rounded-full text-xs",
+	// 		},
+	// 		elem.Text(s),
+	// 	)
+	// }
 	deleteButton := func(m *gallery.GalleryModel) elem.Node {
 		return elem.Button(
 			attrs.Props{
 				"data-twe-ripple-init":  "",
 				"data-twe-ripple-color": "light",
-				"class":                 "float-right inline-block rounded bg-primary px-6 pb-2.5 mb-3 pt-2.5 text-xs font-medium uppercase leading-normal text-white shadow-primary-3 transition duration-150 ease-in-out hover:bg-primary-accent-300 hover:shadow-primary-2 focus:bg-primary-accent-300 focus:shadow-primary-2 focus:outline-none focus:ring-0 active:bg-primary-600 active:shadow-primary-2 dark:shadow-black/30 dark:hover:shadow-dark-strong dark:focus:shadow-dark-strong dark:active:shadow-dark-strong",
+				"class":                 "float-right inline-block rounded bg-red-800 px-6 pb-2.5 mb-3 pt-2.5 text-xs font-medium uppercase leading-normal text-white shadow-primary-3 transition duration-150 ease-in-out hover:bg-red-accent-300 hover:shadow-red-2 focus:bg-red-accent-300 focus:shadow-primary-2 focus:outline-none focus:ring-0 active:bg-red-600 active:shadow-primary-2 dark:shadow-black/30 dark:hover:shadow-dark-strong dark:focus:shadow-dark-strong dark:active:shadow-dark-strong",
 				"hx-swap":               "outerHTML",
 				// post the Model ID as param
 				"hx-post": "/browse/delete/model/" + m.Name,
@@ -224,10 +224,11 @@ func ListModels(models []*gallery.GalleryModel, installing *xsync.SyncedMap[stri
 					elem.Raw(StartProgressBar(installing.Get(galleryID), "0", "Installing")),
 				), // Otherwise, show install button (if not installed) or display "Installed"
 				elem.If(m.Installed,
-					elem.Node(elem.Div(
-						attrs.Props{},
-						span("Installed"), deleteButton(m),
-					)),
+					//elem.Node(elem.Div(
+					//		attrs.Props{},
+					//	span("Installed"), deleteButton(m),
+					//	)),
+					deleteButton(m),
 					installButton(m),
 				),
 			),

pkg/gallery/gallery.go

@@ -1,6 +1,7 @@
 package gallery
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -193,6 +194,7 @@ func DeleteModelFromSystem(basePath string, name string, additionalFiles []strin
 
 	galleryFile := filepath.Join(basePath, galleryFileName(name))
 
+	var err error
 	// Delete all the files associated to the model
 	// read the model config
 	galleryconfig, err := ReadConfigFile(galleryFile)
@@ -205,20 +207,26 @@ func DeleteModelFromSystem(basePath string, name string, additionalFiles []strin
 		for _, f := range galleryconfig.Files {
 			fullPath := filepath.Join(basePath, f.Filename)
 			log.Debug().Msgf("Removing file %s", fullPath)
-			if err := os.Remove(fullPath); err != nil {
-				return fmt.Errorf("failed to remove file %s: %w", f.Filename, err)
+			if e := os.Remove(fullPath); e != nil {
+				err = errors.Join(err, fmt.Errorf("failed to remove file %s: %w", f.Filename, e))
 			}
 		}
 	}
 
 	for _, f := range additionalFiles {
 		fullPath := filepath.Join(filepath.Join(basePath, f))
 		log.Debug().Msgf("Removing additional file %s", fullPath)
-		if err := os.Remove(fullPath); err != nil {
-			return fmt.Errorf("failed to remove file %s: %w", f, err)
+		if e := os.Remove(fullPath); e != nil {
+			err = errors.Join(err, fmt.Errorf("failed to remove file %s: %w", f, e))
 		}
 	}
 
+	log.Debug().Msgf("Removing model config file %s", configFile)
+
 	// Delete the model config file
-	return os.RemoveAll(configFile)
+	if e := os.Remove(configFile); e != nil {
+		err = errors.Join(err, fmt.Errorf("failed to remove file %s: %w", configFile, e))
+	}
+
+	return err
 }