wip

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

pkg/chatgpt/auth.go

@@ -9,6 +9,7 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"log/slog"
@@ -104,7 +105,7 @@ func Login(ctx context.Context) (*Token, error) {
 
 		// Verify state
 		if r.URL.Query().Get("state") != state {
-			resultCh <- callbackResult{err: fmt.Errorf("state mismatch")}
+			resultCh <- callbackResult{err: errors.New("state mismatch")}
 			http.Error(w, "State mismatch", http.StatusBadRequest)
 			return
 		}
@@ -119,7 +120,7 @@ func Login(ctx context.Context) (*Token, error) {
 
 		code := r.URL.Query().Get("code")
 		if code == "" {
-			resultCh <- callbackResult{err: fmt.Errorf("no authorization code received")}
+			resultCh <- callbackResult{err: errors.New("no authorization code received")}
 			http.Error(w, "No code received", http.StatusBadRequest)
 			return
 		}
@@ -206,7 +207,7 @@ func RefreshAccessToken(ctx context.Context, refreshToken string) (*Token, error
 
 	// Exchange the new id_token for an API key
 	if refreshResp.IDToken == "" {
-		return nil, fmt.Errorf("refresh response did not include an id_token")
+		return nil, errors.New("refresh response did not include an id_token")
 	}
 
 	apiKey, err := exchangeForAPIKey(ctx, refreshResp.IDToken)

pkg/chatgpt/provider.go

@@ -2,6 +2,7 @@ package chatgpt
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"sync"
@@ -61,15 +62,15 @@ func (p *Provider) resolveToken(ctx context.Context) (string, error) {
 			return "", fmt.Errorf("failed to load ChatGPT token: %w", err)
 		}
 		if token == nil {
-			return "", fmt.Errorf("not logged in to ChatGPT - run 'cagent login chatgpt' first")
+			return "", errors.New("not logged in to ChatGPT - run 'cagent login chatgpt' first")
 		}
 		p.token = token
 	}
 
 	// Refresh if expired
 	if p.token.IsExpired() {
 		if p.token.RefreshToken == "" {
-			return "", fmt.Errorf("ChatGPT token expired - run 'cagent login chatgpt' to re-authenticate")
+			return "", errors.New("ChatGPT token expired - run 'cagent login chatgpt' to re-authenticate")
 		}
 
 		newToken, err := RefreshAccessToken(ctx, p.token.RefreshToken)

pkg/config/examples_test.go

@@ -56,7 +56,7 @@ func TestParseExamples(t *testing.T) {
 				require.NotEmpty(t, model.Provider)
 				require.NotEmpty(t, model.Model)
 				// Skip providers that don't have entries in models.dev
-				if model.Provider == "dmr" {
+				if model.Provider == "dmr" || model.Provider == "chatgpt" {
 					continue
 				}
 				// Skip models with routing rules - they use multiple providers