Skip to content

chore: when normalizing the tool name drop /tool.gpt if you can #361

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 1 commit into from
May 15, 2024
Merged

chore: when normalizing the tool name drop /tool.gpt if you can #361

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
23 changes: 18 additions & 5 deletions pkg/types/toolname.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ func ToolNormalizer(tool string) string {

parts := strings.Split(lastTool, "/")
tool = parts[len(parts)-1]
if parts[len(parts)-1] == "tool.gpt" && len(parts) > 1 && len(parts[len(parts)-2]) > 2 {
tool = parts[len(parts)-2]
}
if strings.HasSuffix(tool, system.Suffix) {
tool = strings.TrimSuffix(tool, filepath.Ext(tool))
}
Expand All @@ -38,16 +41,26 @@ func ToolNormalizer(tool string) string {

tool = invalidChars.ReplaceAllString(tool, "_")

var result []string
for i, part := range strings.Split(tool, "_") {
var (
result []string
appended bool
)
for _, part := range strings.Split(tool, "_") {
lower := strings.ToLower(part)
if i != 0 && len(lower) > 0 {
if appended && len(lower) > 0 {
lower = strings.ToTitle(lower[0:1]) + lower[1:]
}
result = append(result, lower)
if lower != "" {
result = append(result, lower)
appended = true
}
}

return strings.Join(result, "")
final := strings.Join(result, "")
if final == "" {
return "tool"
}
return final
}

func SplitToolRef(targetToolName string) (toolName, subTool string) {
Expand Down
5 changes: 5 additions & 0 deletions pkg/types/toolname_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ func TestToolNormalizer(t *testing.T) {
autogold.Expect("barList").Equal(t, ToolNormalizer("bar_list from ./foo.gpt"))
autogold.Expect("write").Equal(t, ToolNormalizer("sys.write"))
autogold.Expect("gpt4VVision").Equal(t, ToolNormalizer("github.com/gptscript-ai/gpt4-v-vision"))
autogold.Expect("foo").Equal(t, ToolNormalizer("./foo/tool.gpt"))
autogold.Expect("tool").Equal(t, ToolNormalizer("./tool.gpt"))
autogold.Expect("tool").Equal(t, ToolNormalizer(".a/tool.gpt"))
autogold.Expect("ab").Equal(t, ToolNormalizer(".ab/tool.gpt"))
autogold.Expect("tool").Equal(t, ToolNormalizer(".../tool.gpt"))
}

func TestParse(t *testing.T) {
Expand Down