chore: migrate to golangci-lint v2 (#962)

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

.golangci.yml

@@ -1,24 +1,41 @@
+version: "2"
 run:
   timeout: 5m
-
 output:
   formats:
-  - format: colored-line-number
-
+    text:
+      path: stdout
 linters:
-  disable-all: true
+  default: none
   enable:
-  - errcheck
-  - gofmt
-  - gosimple
-  - govet
-  - ineffassign
-  - staticcheck
-  - typecheck
-  - thelper
-  - unused
-  - goimports
-  - whitespace
-  - revive
-  fast: false
+    - errcheck
+    - govet
+    - ineffassign
+    - revive
+    - staticcheck
+    - thelper
+    - unused
+    - whitespace
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+issues:
   max-same-issues: 50
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -22,7 +22,7 @@ smoke: build
 smoke:
 	go test -v -tags='smoke' ./pkg/tests/smoke/...
 
-GOLANGCI_LINT_VERSION ?= v1.60.1
+GOLANGCI_LINT_VERSION ?= v2.1.2
 lint:
 	if ! command -v golangci-lint &> /dev/null; then \
   		echo "Could not find golangci-lint, installing version $(GOLANGCI_LINT_VERSION)."; \

pkg/builtin/builtin.go

@@ -280,8 +280,8 @@ func DefaultModel(name, defaultModel string) (types.Tool, bool) {
 	// Legacy syntax not used anymore
 	name = strings.TrimSuffix(name, "?")
 	t, ok := tools[name]
-	t.Parameters.Name = name
-	t.Parameters.ModelName = defaultModel
+	t.Name = name
+	t.ModelName = defaultModel
 	t.ID = name
 	t.Instructions = "#!" + name
 	return SetDefaults(t), ok

pkg/builtin/defaults.go

@@ -18,8 +18,8 @@ func SetDefaultModel(model string) {
 }
 
 func SetDefaults(tool types.Tool) types.Tool {
-	if tool.Parameters.ModelName == "" {
-		tool.Parameters.ModelName = GetDefaultModel()
+	if tool.ModelName == "" {
+		tool.ModelName = GetDefaultModel()
 	}
 	return tool
 }

pkg/chat/chat.go

@@ -61,7 +61,7 @@ func Start(ctx context.Context, prevState runner.ChatState, chatter Chatter, prg
 		if startInput != "" {
 			input = startInput
 			startInput = ""
-		} else if targetTool := prog.ToolSet[prog.EntryToolID]; !((prevState == nil || prevState == "") && targetTool.Arguments == nil && targetTool.Instructions != "") {
+		} else if targetTool := prog.ToolSet[prog.EntryToolID]; prevState != nil && prevState != "" || targetTool.Arguments != nil || targetTool.Instructions == "" {
 			// The above logic will skip prompting if this is the first loop and the chat expects no args
 			input, ok, err = prompter.Readline()
 			if !ok || err != nil {

pkg/cli/gptscript.go

@@ -366,7 +366,7 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 
 			// If the file is external, then set the SCRIPTS_PATH to the current working directory. Otherwise,
 			// set it to the directory of the script and set the file to the base.
-			if !(strings.HasPrefix(file, "http://") || strings.HasPrefix(file, "https://") || strings.HasPrefix(file, "github.com")) {
+			if !strings.HasPrefix(file, "http://") && !strings.HasPrefix(file, "https://") && !strings.HasPrefix(file, "github.com") {
 				absPathToScript, err := filepath.Abs(file)
 				if err != nil {
 					return fmt.Errorf("cannot determine absolute path to script %s: %v", file, err)
@@ -469,8 +469,8 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 			// Don't use cmd.Context() because then sigint will cancel everything
 			return tui.Run(context.Background(), args[0], tui.RunOptions{
 				ClientOpts: &gptscript2.GlobalOptions{
-					OpenAIAPIKey:         r.OpenAIOptions.APIKey,
-					OpenAIBaseURL:        r.OpenAIOptions.BaseURL,
+					OpenAIAPIKey:         r.APIKey,
+					OpenAIBaseURL:        r.BaseURL,
 					DefaultModel:         r.DefaultModel,
 					DefaultModelProvider: r.DefaultModelProvider,
 				},

pkg/engine/cmd.go

@@ -171,7 +171,7 @@ func (e *Engine) runCommand(ctx Context, tool types.Tool, input string, toolCate
 			// If this is a sub-call, then don't return the error; return the error as a message so that the LLM can retry.
 			return fmt.Sprintf("ERROR: got (%v) while running tool, OUTPUT: %s", err, stdoutAndErr), nil
 		}
-		log.Errorf("failed to run tool [%s] cmd %v: %v", tool.Parameters.Name, cmd.Args, err)
+		log.Errorf("failed to run tool [%s] cmd %v: %v", tool.Name, cmd.Args, err)
 		return "", fmt.Errorf("ERROR: %s: %w", stdoutAndErr, err)
 	}
 

pkg/engine/daemon.go

@@ -175,7 +175,7 @@ func (e *Engine) startDaemon(tool types.Tool) (string, error) {
 		return w.Close()
 	}
 
-	log.Infof("launched [%s][%s] port [%d] %v", tool.Parameters.Name, tool.ID, port, cmd.Args)
+	log.Infof("launched [%s][%s] port [%d] %v", tool.Name, tool.ID, port, cmd.Args)
 	if err := cmd.Start(); err != nil {
 		stop()
 		return url, err
@@ -195,7 +195,7 @@ func (e *Engine) startDaemon(tool types.Tool) (string, error) {
 	go func() {
 		err := cmd.Wait()
 		if err != nil {
-			log.Debugf("daemon exited tool [%s] %v: %v", tool.Parameters.Name, cmd.Args, err)
+			log.Debugf("daemon exited tool [%s] %v: %v", tool.Name, cmd.Args, err)
 		}
 		_ = r.Close()
 		_ = w.Close()

pkg/engine/engine.go

@@ -285,13 +285,13 @@ func (c *Context) WrappedContext(e *Engine) context.Context {
 }
 
 func populateMessageParams(ctx Context, completion *types.CompletionRequest, tool types.Tool) error {
-	completion.Model = tool.Parameters.ModelName
-	completion.MaxTokens = tool.Parameters.MaxTokens
-	completion.JSONResponse = tool.Parameters.JSONResponse
-	completion.Cache = tool.Parameters.Cache
-	completion.Chat = tool.Parameters.Chat
-	completion.Temperature = tool.Parameters.Temperature
-	completion.InternalSystemPrompt = tool.Parameters.InternalPrompt
+	completion.Model = tool.ModelName
+	completion.MaxTokens = tool.MaxTokens
+	completion.JSONResponse = tool.JSONResponse
+	completion.Cache = tool.Cache
+	completion.Chat = tool.Chat
+	completion.Temperature = tool.Temperature
+	completion.InternalSystemPrompt = tool.InternalPrompt
 
 	if tool.Chat && completion.InternalSystemPrompt == nil {
 		completion.InternalSystemPrompt = new(bool)

pkg/engine/http.go

@@ -112,7 +112,7 @@ func (e *Engine) runHTTP(ctx Context, tool types.Tool, input string) (cmdRet *Re
 		}
 	}
 
-	req.Header.Set("X-GPTScript-Tool-Name", tool.Parameters.Name)
+	req.Header.Set("X-GPTScript-Tool-Name", tool.Name)
 
 	if err := json.Unmarshal([]byte(input), &map[string]any{}); err == nil {
 		req.Header.Set("Content-Type", "application/json")