Fail if no importer matches

Signed-off-by: Ettore Di Giacinto <[email protected]>

Author: mudler

core/gallery/importers/importers.go

@@ -2,6 +2,7 @@ package importers
 
 import (
 	"encoding/json"
+	"fmt"
 	"os"
 	"strings"
 
@@ -101,14 +102,19 @@ func DiscoverModelConfig(uri string, preferences json.RawMessage) (gallery.Model
 		Preferences: preferences,
 	}
 
+	importerMatched := false
 	for _, importer := range defaultImporters {
 		if importer.Match(details) {
+			importerMatched = true
 			modelConfig, err = importer.Import(details)
 			if err != nil {
 				continue
 			}
 			break
 		}
 	}
+	if !importerMatched {
+		return gallery.ModelConfig{}, fmt.Errorf("no importer matched for %s", uri)
+	}
 	return modelConfig, nil
 }

core/gallery/importers/llama-cpp.go

@@ -11,6 +11,7 @@ import (
 	"github.com/mudler/LocalAI/core/schema"
 	"github.com/mudler/LocalAI/pkg/downloader"
 	"github.com/mudler/LocalAI/pkg/functions"
+	"github.com/rs/zerolog/log"
 	"go.yaml.in/yaml/v2"
 )
 
@@ -21,12 +22,18 @@ type LlamaCPPImporter struct{}
 func (i *LlamaCPPImporter) Match(details Details) bool {
 	preferences, err := details.Preferences.MarshalJSON()
 	if err != nil {
+		log.Error().Err(err).Msg("failed to marshal preferences")
 		return false
 	}
+
 	preferencesMap := make(map[string]any)
-	err = json.Unmarshal(preferences, &preferencesMap)
-	if err != nil {
-		return false
+
+	if len(preferences) > 0 {
+		err = json.Unmarshal(preferences, &preferencesMap)
+		if err != nil {
+			log.Error().Err(err).Msg("failed to unmarshal preferences")
+			return false
+		}
 	}
 
 	uri := downloader.URI(details.URI)
@@ -39,10 +46,6 @@ func (i *LlamaCPPImporter) Match(details Details) bool {
 		return true
 	}
 
-	if uri.LooksLikeURL() && strings.HasSuffix(details.URI, ".gguf") {
-		return true
-	}
-
 	if uri.LooksLikeOCI() {
 		return true
 	}
@@ -59,6 +62,9 @@ func (i *LlamaCPPImporter) Match(details Details) bool {
 }
 
 func (i *LlamaCPPImporter) Import(details Details) (gallery.ModelConfig, error) {
+
+	log.Debug().Str("uri", details.URI).Msg("llama.cpp importer matched")
+
 	preferences, err := details.Preferences.MarshalJSON()
 	if err != nil {
 		return gallery.ModelConfig{}, err