Skip to content

Commit 7ec975a

Browse files
committed
fix: don't overwrite prompt URL if it is already set
Signed-off-by: Donnie Adams <[email protected]>
1 parent 18a74f0 commit 7ec975a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

pkg/sdkserver/routes.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"io"
88
"net/http"
99
"os"
10+
"slices"
1011
"sort"
1112
"strings"
1213
"sync"
@@ -162,8 +163,11 @@ func (s *server) execHandler(w http.ResponseWriter, r *http.Request) {
162163
reqObject.ChatState = "null"
163164
}
164165

165-
// Append a prompt URL for this run.
166-
reqObject.Env = append(reqObject.Env, fmt.Sprintf("%s=http://%s/prompt/%s", types.PromptURLEnvVar, s.address, runID))
166+
reqObject.Env = append(os.Environ(), reqObject.Env...)
167+
if !slices.Contains(reqObject.Env, types.PromptURLEnvVar) {
168+
// Append a prompt URL for this run.
169+
reqObject.Env = append(reqObject.Env, fmt.Sprintf("%s=http://%s/prompt/%s", types.PromptURLEnvVar, s.address, runID))
170+
}
167171

168172
logger.Debugf("executing tool: %+v", reqObject)
169173
var (
@@ -179,7 +183,7 @@ func (s *server) execHandler(w http.ResponseWriter, r *http.Request) {
179183

180184
opts := &gptscript.Options{
181185
Cache: reqObject.Options,
182-
Env: append(os.Environ(), reqObject.Env...),
186+
Env: reqObject.Env,
183187
Workspace: reqObject.Workspace,
184188
CredentialContext: reqObject.CredentialContext,
185189
Runner: runner.Options{

0 commit comments

Comments
 (0)