Skip to content

fix: reading tool from stdin using 'gptscript -' #216

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
ibuildthecloud merged 2 commits into from
Apr 4, 2024
Merged

fix: reading tool from stdin using 'gptscript -' #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49ba5ef
fix: reading tool from stdin using 'gptscript -'
ibuildthecloud Apr 4, 2024
6712734
feat: add GPTSCRIPT_INTERNAL_OPENAI_STREAMING=false to disable streaming
ibuildthecloud Apr 4, 2024
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
5 changes: 1 addition & 4 deletions pkg/cli/gptscript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,7 @@ func (r *GPTScript) readProgram(ctx context.Context, args []string) (prg types.P
if err != nil {
return prg, err
}
prg, err = loader.ProgramFromSource(ctx, string(data), r.SubTool)
if err != nil {
return prg, err
}
return loader.ProgramFromSource(ctx, string(data), r.SubTool)
}

return loader.Program(ctx, args[0], r.SubTool)
Expand Down
35 changes: 31 additions & 4 deletions pkg/openai/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,8 @@ func (c *Client) fromCache(ctx context.Context, messageRequest types.CompletionR

func toToolCall(call types.CompletionToolCall) openai.ToolCall {
return openai.ToolCall{
Index: call.Index,
ID: call.ID,
Type: openai.ToolTypeFunction,
ID: call.ID,
Type: openai.ToolTypeFunction,
Function: openai.FunctionCall{
Name: call.Function.Name,
Arguments: call.Function.Arguments,
Expand Down Expand Up @@ -471,7 +470,7 @@ func (c *Client) store(ctx context.Context, key string, responses []openai.ChatC

func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest, transactionID string, partial chan<- types.CompletionStatus) (responses []openai.ChatCompletionStreamResponse, _ error) {
cacheKey := c.cacheKey(request)
request.Stream = true
request.Stream = os.Getenv("GPTSCRIPT_INTERNAL_OPENAI_STREAMING") != "false"

partial <- types.CompletionStatus{
CompletionID: transactionID,
Expand All @@ -482,6 +481,34 @@ func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest,
}

slog.Debug("calling openai", "message", request.Messages)

if !request.Stream {
resp, err := c.c.CreateChatCompletion(ctx, request)
if err != nil {
return nil, err
}
return []openai.ChatCompletionStreamResponse{
{
ID: resp.ID,
Object: resp.Object,
Created: resp.Created,
Model: resp.Model,
Choices: []openai.ChatCompletionStreamChoice{
{
Index: resp.Choices[0].Index,
Delta: openai.ChatCompletionStreamChoiceDelta{
Content: resp.Choices[0].Message.Content,
Role: resp.Choices[0].Message.Role,
FunctionCall: resp.Choices[0].Message.FunctionCall,
ToolCalls: resp.Choices[0].Message.ToolCalls,
},
FinishReason: resp.Choices[0].FinishReason,
},
},
},
}, nil
}

stream, err := c.c.CreateChatCompletionStream(ctx, request)
if err != nil {
return nil, err
Expand Down