Skip to content

chore: support sending ToolDefs as JSON in sdkserver #440

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
thedadams merged 1 commit into from
Jun 5, 2024
Merged

chore: support sending ToolDefs as JSON in sdkserver #440

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions pkg/sdkserver/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (s *server) listTools(w http.ResponseWriter, r *http.Request) {
} else if reqObject.File != "" {
prg, err = loader.Program(r.Context(), reqObject.File, reqObject.SubTool, loader.Options{Cache: s.client.Cache})
} else {
prg, err = loader.ProgramFromSource(r.Context(), reqObject.ToolDef.String(), reqObject.SubTool, loader.Options{Cache: s.client.Cache})
prg, err = loader.ProgramFromSource(r.Context(), reqObject.ToolDefs.String(), reqObject.SubTool, loader.Options{Cache: s.client.Cache})
}
if err != nil {
writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to load program: %w", err))
Expand Down Expand Up @@ -178,7 +178,7 @@ func (s *server) execHandler(w http.ResponseWriter, r *http.Request) {

logger.Debugf("executing tool: %+v", reqObject)
var (
def fmt.Stringer = &reqObject.ToolDef
def fmt.Stringer = &reqObject.ToolDefs
programLoader loaderFunc = loader.ProgramFromSource
)
if reqObject.Content != "" {
Expand Down
19 changes: 17 additions & 2 deletions pkg/sdkserver/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sdkserver

import (
"maps"
"strings"
"time"

"github.com/gptscript-ai/gptscript/pkg/cache"
Expand All @@ -25,12 +26,26 @@ const (
Prompt runner.EventType = "prompt"
)

type toolDefs []types.ToolDef

func (t toolDefs) String() string {
s := new(strings.Builder)
for i, tool := range t {
s.WriteString(tool.String())
if i != len(t)-1 {
s.WriteString("\n\n---\n\n")
}
}

return s.String()
}

type toolOrFileRequest struct {
cache.Options `json:",inline"`
types.ToolDef `json:",inline"`
content `json:",inline"`
file `json:",inline"`
cache.Options `json:",inline"`

ToolDefs toolDefs `json:"toolDefs,inline"`
SubTool string `json:"subTool"`
Input string `json:"input"`
ChatState string `json:"chatState"`
Expand Down