feat: move error package to Garcon project

Author: 0uep

.dockerignore

@@ -1,7 +1,6 @@
 *
 !conf
 !event
-!gie
 !go.mod
 !go.sum
 !goinfer.go

README.md

@@ -370,7 +370,6 @@ groups:
 - GUFF files discovery: `Search()` in [`models.go`](go/conf/models.go)
 - Graceful shutdown handling: `handleShutdown()` in [`goinfer.go`](go/goinfer.go)
 - API-key authentication per service: `configureAPIKeyAuth()` in [`router.go`](go/infer/router.go)
-- Comprehensive error handling: `gie` package in [`errors.go`](go/gie/errors.go)
 
 ## API endpoints
 

conf/conf.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/LynxAIeu/goinfer/gie"
+	"github.com/LynxAIeu/garcon/gerr"
 	"github.com/LynxAIeu/goinfer/proxy/config"
 	"github.com/goccy/go-yaml"
 )
@@ -148,26 +148,26 @@ func (cfg *Cfg) validate(noAPIKey bool) error {
 	for dir := range strings.SplitSeq(cfg.ModelsDir, ":") {
 		info, er := os.Stat(dir)
 		if errors.Is(er, fs.ErrNotExist) {
-			return gie.New(gie.ConfigErr, "Verify GI_MODELS_DIR or 'models_dir' in "+GoinferINI, "does not exist", dir)
+			return gerr.New(gerr.ConfigErr, "Verify GI_MODELS_DIR or 'models_dir' in "+GoinferINI, "does not exist", dir)
 		}
 		if er != nil {
-			return gie.Wrap(er, gie.ConfigErr, "Verify GI_MODELS_DIR or 'models_dir' in "+GoinferINI, "problem with", dir)
+			return gerr.Wrap(er, gerr.ConfigErr, "Verify GI_MODELS_DIR or 'models_dir' in "+GoinferINI, "problem with", dir)
 		}
 		if !info.IsDir() {
-			return gie.New(gie.ConfigErr, "Verify GI_MODELS_DIR or 'models_dir' in "+GoinferINI, "must be a directory", dir)
+			return gerr.New(gerr.ConfigErr, "Verify GI_MODELS_DIR or 'models_dir' in "+GoinferINI, "must be a directory", dir)
 		}
 	}
 
 	// GI_LLAMA_EXE
 	info, err := os.Stat(cfg.Llama.Exe)
 	if errors.Is(err, fs.ErrNotExist) {
-		return gie.New(gie.ConfigErr, "GI_LLAMA_EXE or 'exe' in goinfer.ini: file does not exist", "exe", cfg.Llama.Exe)
+		return gerr.New(gerr.ConfigErr, "GI_LLAMA_EXE or 'exe' in goinfer.ini: file does not exist", "exe", cfg.Llama.Exe)
 	}
 	if err != nil {
-		return gie.Wrap(err, gie.ConfigErr, "GI_MODELS_DIR or 'models_dir' in goinfer.ini", "exe", cfg.Llama.Exe)
+		return gerr.Wrap(err, gerr.ConfigErr, "GI_MODELS_DIR or 'models_dir' in goinfer.ini", "exe", cfg.Llama.Exe)
 	}
 	if info.IsDir() {
-		return gie.New(gie.ConfigErr, "GI_LLAMA_EXE or 'exe' in goinfer.ini: must be a file, not a directory", "exe", cfg.Llama.Exe)
+		return gerr.New(gerr.ConfigErr, "GI_LLAMA_EXE or 'exe' in goinfer.ini: must be a file, not a directory", "exe", cfg.Llama.Exe)
 	}
 
 	// API key
@@ -176,7 +176,7 @@ func (cfg *Cfg) validate(noAPIKey bool) error {
 		return nil
 	}
 	if cfg.APIKey == "" || strings.Contains(cfg.APIKey, "Please") {
-		return gie.New(gie.ConfigErr, "API key not set, please set your private API key")
+		return gerr.New(gerr.ConfigErr, "API key not set, please set your private API key")
 	}
 	if cfg.APIKey == debugAPIKey {
 		slog.Warn("API key is DEBUG => security threat")
@@ -197,7 +197,7 @@ func (cfg *Cfg) validateAddr() error {
 	if slices.Contains(badPorts, port) {
 		const msg = "Chrome/Firefox block the bad ports"
 		slog.Error(msg, "port", port, "reference", "https://fetch.spec.whatwg.org/#port-blocking")
-		return gie.New(gie.ConfigErr, msg, "port", port, "reference", "https://fetch.spec.whatwg.org/#port-blocking")
+		return gerr.New(gerr.ConfigErr, msg, "port", port, "reference", "https://fetch.spec.whatwg.org/#port-blocking")
 	}
 	return nil
 }

conf/files.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/LynxAIeu/goinfer/gie"
+	"github.com/LynxAIeu/garcon/gerr"
 )
 
 type Root struct {
@@ -43,7 +43,7 @@ func (r *Root) RelativePath(fullPath string) (string, error) {
 		return "", err
 	}
 	if !filepath.IsLocal(relativePath) {
-		return "", gie.New(gie.Invalid, "not local", "full", fullPath, "root", r.Path)
+		return "", gerr.New(gerr.Invalid, "not local", "full", fullPath, "root", r.Path)
 	}
 	return filepath.Clean(relativePath), err
 }
@@ -433,7 +433,7 @@ func (cfg *Cfg) ValidateSwap() error {
 	if len(cfg.Swap.Models) == 0 {
 		n := len(cfg.getInfo())
 		if n == 0 {
-			return gie.New(gie.ConfigErr, "No *.gguf files found", "dir", cfg.ModelsDir)
+			return gerr.New(gerr.ConfigErr, "No *.gguf files found", "dir", cfg.ModelsDir)
 		}
 		slog.Warn("No model configured => Restart Goinfer to refresh llama-swap.yml", "models", n)
 		return nil
@@ -477,7 +477,7 @@ func verify(root Root, path string) (int64, error) {
 	// is empty?
 	size := info.Size()
 	if size < 1000 {
-		return 0, gie.New(gie.ConfigErr, "Model file is empty (or too small)", "path", path, "size", size)
+		return 0, gerr.New(gerr.ConfigErr, "Model file is empty (or too small)", "path", path, "size", size)
 	}
 
 	// Check if the file is readable
@@ -503,7 +503,7 @@ func verify(root Root, path string) (int64, error) {
 
 	if path[pos-len(first):pos] != first {
 		slog.Debug("KO Model file is part of a series, but only the first one is referenced", "path", path)
-		return 0, gie.New(gie.ConfigErr, "Model file is part of a series, but only the first one is referenced, file="+path)
+		return 0, gerr.New(gerr.ConfigErr, "Model file is part of a series, but only the first one is referenced, file="+path)
 	}
 
 	slog.Debug("OK Model file is the first of a series", "path", path)

conf/goinferini.go

@@ -16,7 +16,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/LynxAIeu/goinfer/gie"
+	"github.com/LynxAIeu/garcon/gerr"
 	"github.com/pelletier/go-toml/v2"
 )
 
@@ -28,7 +28,7 @@ const GoinferINI = "goinfer.ini"
 func ReadGoinferINI(noAPIKey bool, extra, start string) (*Cfg, error) {
 	data, err := os.ReadFile(GoinferINI)
 	if err != nil {
-		err = gie.Wrap(err, gie.ConfigErr, "Cannot read", "file", GoinferINI)
+		err = gerr.Wrap(err, gerr.ConfigErr, "Cannot read", "file", GoinferINI)
 		slog.Warn("Skip " + GoinferINI + " => Use default settings and env. vars")
 	}
 
@@ -112,7 +112,7 @@ func (cfg *Cfg) genGoinferINI(debug, noAPIKey bool) ([]byte, error) {
 
 	data, er := toml.Marshal(cfg)
 	if er != nil {
-		er = gie.Wrap(err, gie.ConfigErr, "failed to toml.Marshal", "cfg", cfg)
+		er = gerr.Wrap(err, gerr.ConfigErr, "failed to toml.Marshal", "cfg", cfg)
 		if err != nil {
 			return data, errors.Join(err, er)
 		}
@@ -124,12 +124,12 @@ func (cfg *Cfg) genGoinferINI(debug, noAPIKey bool) ([]byte, error) {
 // load the configuration file (if filename not empty).
 func (cfg *Cfg) parse(fileData []byte) error {
 	if len(fileData) == 0 {
-		return gie.New(gie.ConfigErr, "empty", "file", GoinferINI)
+		return gerr.New(gerr.ConfigErr, "empty", "file", GoinferINI)
 	}
 
 	err := toml.Unmarshal(fileData, &cfg)
 	if err != nil {
-		return gie.Wrap(err, gie.ConfigErr, "Failed to toml.Unmarshal", "invalid TOML", string(fileData))
+		return gerr.Wrap(err, gerr.ConfigErr, "Failed to toml.Unmarshal", "invalid TOML", string(fileData))
 	}
 
 	return nil
@@ -241,13 +241,13 @@ func writeWithHeader(path, header string, body []byte) (bool, error) {
 		_ = os.Remove(backup) // removing it because write protected
 		err = os.Rename(path, backup)
 		if err != nil {
-			return false, gie.Wrap(err, gie.ConfigErr, "failed to backup", "file", path, "backup", backup)
+			return false, gerr.Wrap(err, gerr.ConfigErr, "failed to backup", "file", path, "backup", backup)
 		}
 	}
 
 	err = os.WriteFile(path, data, 0o400) // read only
 	if err != nil {
-		return false, gie.Wrap(err, gie.ConfigErr, "failed to write", "file", path)
+		return false, gerr.Wrap(err, gerr.ConfigErr, "failed to write", "file", path)
 	}
 
 	return true, nil

conf/info.go

@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/LynxAIeu/goinfer/gie"
+	"github.com/LynxAIeu/garcon/gerr"
 )
 
 type (
@@ -203,9 +203,9 @@ func (cfg *Cfg) search(params map[string]ModelParams, shells *[]*ModelInfo, root
 		switch {
 		case err != nil:
 			if dir == nil {
-				return gie.Wrap(err, gie.NotFound, "filepath.WalkDir")
+				return gerr.Wrap(err, gerr.NotFound, "filepath.WalkDir")
 			}
-			return gie.Wrap(err, gie.NotFound, "filepath.WalkDir", "dir", dir.Name())
+			return gerr.Wrap(err, gerr.NotFound, "filepath.WalkDir", "dir", dir.Name())
 		case dir.IsDir():
 			// => step into this directory
 		case filepath.Base(path) == paramsYML:
@@ -227,7 +227,7 @@ func (cfg *Cfg) search(params map[string]ModelParams, shells *[]*ModelInfo, root
 func keepParams(params map[string]ModelParams, root, path string) error {
 	data, err := os.ReadFile(filepath.Clean(path))
 	if err != nil {
-		return gie.Wrap(err, gie.ConfigErr, "os.ReadFile", "file", path)
+		return gerr.Wrap(err, gerr.ConfigErr, "os.ReadFile", "file", path)
 	}
 
 	if len(data) == 0 {
@@ -240,7 +240,7 @@ func keepParams(params map[string]ModelParams, root, path string) error {
 	var mp map[string]ModelParams
 	err = json.Unmarshal(data, &mp)
 	if err != nil {
-		return gie.Wrap(err, gie.ConfigErr, "json.Unmarshal", "file", path, "100FirsBytes", string(data[:100]))
+		return gerr.Wrap(err, gerr.ConfigErr, "json.Unmarshal", "file", path, "100FirsBytes", string(data[:100]))
 	}
 
 	for name, p := range mp {

conf/llamaswapyml.go

@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/LynxAIeu/goinfer/gie"
+	"github.com/LynxAIeu/garcon/gerr"
 	"github.com/LynxAIeu/goinfer/proxy/config"
 	"github.com/goccy/go-yaml"
 )
@@ -98,7 +98,7 @@ func (cfg *Cfg) GenLlamaSwapYAML(verbose, debug bool) ([]byte, error) {
 
 	yml, er := yaml.Marshal(&cfg.Swap)
 	if er != nil {
-		return nil, gie.Wrap(er, gie.ConfigErr, "failed to marshal the llama-swap config")
+		return nil, gerr.Wrap(er, gerr.ConfigErr, "failed to marshal the llama-swap config")
 	}
 
 	return yml, nil