X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/1c1771140063b1b4aa5d508ced1b285e773fce04..6f7eda727e519ae43d7d35195cbe412a2725abd7:/responses.go

diff --git a/responses.go b/responses.go
index f887e6d..cdc1558 100644
--- a/responses.go
+++ b/responses.go
@@ -10,16 +10,27 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 	"time"
 )
 
 const (
+	// chatgptURL is the Responses endpoint of the ChatGPT backend.
+	chatgptURL = "https://chatgpt.com/backend-api/codex/responses"
+
+	// apiURL is the Responses endpoint of the OpenAI API.
+	apiURL = "https://api.openai.com/v1/responses"
+
 	// quotaPrefix starts the names of the quota headers of the ChatGPT
 	// backend, in canonical form.
 	quotaPrefix = "X-Codex-"
 
+	// turnStateHeader is an x-codex-* header that holds an opaque state of
+	// the backend, not quota.
+	turnStateHeader = "X-Codex-Turn-State"
+
 	// errorBytes is the most bytes of an error response that go into the
 	// error.
 	errorBytes = 4096
@@ -50,7 +61,6 @@ type Client struct {
 	cacheKey string
 	usage    *usageLog
 	http     *http.Client
-	clock    func() time.Time
 }
 
 // Request is one model call. Input holds the input items in order, such as
@@ -145,6 +155,23 @@ type outputItem struct {
 	} `json:"content"`
 }
 
+// modelEndpoint returns the URL and the authorizer of the endpoint in config.
+// The ChatGPT backend uses the token file in dir. The OpenAI API uses the key in
+// OPENAI_API_KEY, and there is no fallback from one to the other. All clients
+// share the authorizer, so one refresh runs at a time.
+func modelEndpoint(config Config, dir string) (string, authorizer, error) {
+	if config.Endpoint == endpointAPI {
+		key := os.Getenv("OPENAI_API_KEY")
+		if key == "" {
+			return "", nil, errors.New("endpoint api needs OPENAI_API_KEY")
+		}
+
+		return apiURL, apiKey(key), nil
+	}
+
+	return chatgptURL, newChatGPTAuth(filepath.Join(dir, tokenFileName), authIssuer), nil
+}
+
 // newClient returns a client for the Responses endpoint at url. It records
 // each call in the usage file at usagePath.
 func newClient(url string, auth authorizer, cacheKey, usagePath string) *Client {
@@ -155,8 +182,7 @@ func newClient(url string, auth authorizer, cacheKey, usagePath string) *Client
 		usage: &usageLog{
 			path: usagePath,
 		},
-		http:  &http.Client{},
-		clock: time.Now,
+		http: &http.Client{},
 	}
 }
 
@@ -192,7 +218,7 @@ func (c *Client) Create(ctx context.Context, request Request) (Response, error)
 	}
 
 	record := usageRecord{
-		Date:  c.clock().Format(time.RFC3339Nano),
+		Date:  time.Now().Format(time.RFC3339Nano),
 		Model: request.Model,
 	}
 
@@ -240,7 +266,8 @@ type usageLog struct {
 }
 
 // usageRecord is one line of usage.jsonl. Status is the HTTP status, or 0 when
-// no response came. Quota holds the x-codex-* headers of the response.
+// no response came. Quota holds the x-codex-* headers of the response, without
+// the turn state.
 type usageRecord struct {
 	Date         string            `json:"date"`
 	Model        string            `json:"model"`
@@ -309,11 +336,12 @@ func userMessage(texts ...string) any {
 	}
 }
 
-// quotaHeaders returns the x-codex-* headers, with lowercase names.
+// quotaHeaders returns the x-codex-* headers, with lowercase names, without the
+// turn state.
 func quotaHeaders(header http.Header) map[string]string {
 	var quota map[string]string
 	for name, values := range header {
-		if !strings.HasPrefix(name, quotaPrefix) || len(values) == 0 {
+		if !strings.HasPrefix(name, quotaPrefix) || name == turnStateHeader || len(values) == 0 {
 			continue
 		}