Skip to content

fix: don't start SDK server if URL opt is provided #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2024
Merged

fix: don't start SDK server if URL opt is provided #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 21 additions & 34 deletions gptscript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"fmt"
"io"
"log/slog"
"net/url"
"os"
"os/exec"
"path/filepath"
Expand All @@ -34,49 +33,27 @@ type GPTScript struct {

func NewGPTScript(opts ...GlobalOptions) (*GPTScript, error) {
opt := completeGlobalOptions(opts...)
lock.Lock()
defer lock.Unlock()
gptscriptCount++

if serverURL == "" {
serverURL = opt.URL
if serverURL == "" {
serverURL = os.Getenv("GPTSCRIPT_URL")
}
}

if opt.Env == nil {
opt.Env = os.Environ()
}

opt.Env = append(opt.Env, opt.toEnv()...)

if serverProcessCancel == nil && os.Getenv("GPTSCRIPT_URL") == "" {
if serverURL != "" {
u, err := url.Parse(serverURL)
if err != nil {
return nil, fmt.Errorf("failed to parse server URL: %w", err)
}
lock.Lock()
defer lock.Unlock()
gptscriptCount++

// If the server URL has a path, then this implies that the server is already running.
// In that case, we don't need to start the server.
if u.Path != "" && u.Path != "/" {
opt.URL = serverURL
if !strings.HasPrefix(opt.URL, "http://") && !strings.HasPrefix(opt.URL, "https://") {
opt.URL = "http://" + opt.URL
}

opt.Env = append(opt.Env, "GPTSCRIPT_URL="+opt.URL)
return &GPTScript{
globalOpts: opt,
}, nil
}
}
startSDK := serverProcess == nil && serverURL == "" && opt.URL == ""
if serverURL == "" {
serverURL = os.Getenv("GPTSCRIPT_URL")
startSDK = startSDK && serverURL == ""
}

if startSDK {
ctx, cancel := context.WithCancel(context.Background())
in, _ := io.Pipe()

serverProcess = exec.CommandContext(ctx, getCommand(), "sys.sdkserver", "--listen-address", strings.TrimPrefix(serverURL, "http://"))
serverProcess = exec.CommandContext(ctx, getCommand(), "sys.sdkserver", "--listen-address", "127.0.0.1:0")
serverProcess.Env = opt.Env[:]

serverProcess.Stdin = in
Expand Down Expand Up @@ -118,13 +95,23 @@ func NewGPTScript(opts ...GlobalOptions) (*GPTScript, error) {
serverURL = strings.TrimSpace(serverURL)
}

opt.URL = serverURL
if opt.URL == "" {
opt.URL = serverURL
}

if !strings.HasPrefix(opt.URL, "http://") && !strings.HasPrefix(opt.URL, "https://") {
opt.URL = "http://" + opt.URL
}

opt.Env = append(opt.Env, "GPTSCRIPT_URL="+opt.URL)

if opt.Token == "" {
opt.Token = os.Getenv("GPTSCRIPT_TOKEN")
}
if opt.Token != "" {
opt.Env = append(opt.Env, "GPTSCRIPT_TOKEN="+opt.Token)
}

return &GPTScript{
globalOpts: opt,
}, nil
Expand Down