Skip to content

fix: make --events-stream-to work with chat #400

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.

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
May 30, 2024
Merged
Changes from all commits
Commits
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
68 changes: 43 additions & 25 deletions pkg/monitor/fd.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"strconv"
"strings"
"sync"
"sync/atomic"
"time"

"github.com/gptscript-ai/gptscript/pkg/runner"
Expand All @@ -23,8 +22,10 @@ type Event struct {
}

type fileFactory struct {
fileName string
file *os.File
runningCount atomic.Int32
lock sync.Mutex
runningCount int
}

// NewFileFactory creates a new monitor factory that writes events to the location specified.
Expand All @@ -33,33 +34,23 @@ type fileFactory struct {
// 2. a file name
// 3. a named pipe in the form "\\.\pipe\my-pipe"
func NewFileFactory(loc string) (runner.MonitorFactory, error) {
var (
file *os.File
err error
)

if strings.HasPrefix(loc, "fd://") {
fd, err := strconv.Atoi(strings.TrimPrefix(loc, "fd://"))
if err != nil {
return nil, err
}

file = os.NewFile(uintptr(fd), "events")
} else {
file, err = os.OpenFile(loc, os.O_WRONLY|os.O_CREATE, 0644)
if err != nil {
return nil, err
}
}

return &fileFactory{
file: file,
runningCount: atomic.Int32{},
fileName: loc,
}, nil
}

func (s *fileFactory) Start(_ context.Context, prg *types.Program, env []string, input string) (runner.Monitor, error) {
s.runningCount.Add(1)
s.lock.Lock()
s.runningCount++
if s.runningCount == 1 {
if err := s.openFile(); err != nil {
s.runningCount--
s.lock.Unlock()
return nil, err
}
}
s.lock.Unlock()

fd := &fd{
prj: prg,
env: env,
Expand All @@ -80,13 +71,40 @@ func (s *fileFactory) Start(_ context.Context, prg *types.Program, env []string,
}

func (s *fileFactory) close() {
if count := s.runningCount.Add(-1); count == 0 {
s.lock.Lock()
defer s.lock.Unlock()

s.runningCount--
if s.runningCount == 0 {
if err := s.file.Close(); err != nil {
log.Errorf("error closing monitor file: %v", err)
}
}
}

func (s *fileFactory) openFile() error {
var (
err error
file *os.File
)
if strings.HasPrefix(s.fileName, "fd://") {
fd, err := strconv.Atoi(strings.TrimPrefix(s.fileName, "fd://"))
if err != nil {
return err
}

file = os.NewFile(uintptr(fd), "events")
} else {
file, err = os.OpenFile(s.fileName, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
if err != nil {
return err
}
}

s.file = file
return nil
}

type fd struct {
prj *types.Program
env []string
Expand Down