Skip to content

fix(go): fixes concurrency issue in Dotprompt instance usage #3713

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 3 commits into from
Oct 14, 2025
+20 −14
Merged

fix(go): fixes concurrency issue in Dotprompt instance usage #3713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2110d5
Return clone of Dotprompt from registry.
apascal07 Oct 14, 2025
0fb76c1
Update prompt.go
apascal07 Oct 14, 2025
f685e6b
Update registry.go
apascal07 Oct 14, 2025
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
14 changes: 9 additions & 5 deletions go/ai/prompt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,16 +296,18 @@ func (p *prompt) buildRequest(ctx context.Context, input any) (*GenerateActionOp
return nil, err
}

dp := p.registry.Dotprompt()

messages := []*Message{}
messages, err = renderSystemPrompt(ctx, p.promptOptions, messages, m, input, p.registry.Dotprompt())
messages, err = renderSystemPrompt(ctx, p.promptOptions, messages, m, input, dp)
if err != nil {
return nil, err
}
messages, err = renderMessages(ctx, p.promptOptions, messages, m, input, p.registry.Dotprompt())
messages, err = renderMessages(ctx, p.promptOptions, messages, m, input, dp)
if err != nil {
return nil, err
}
messages, err = renderUserPrompt(ctx, p.promptOptions, messages, m, input, p.registry.Dotprompt())
messages, err = renderUserPrompt(ctx, p.promptOptions, messages, m, input, dp)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -547,13 +549,15 @@ func LoadPrompt(r api.Registry, dir, filename, namespace string) Prompt {
return nil
}

parsedPrompt, err := r.Dotprompt().Parse(string(source))
dp := r.Dotprompt()

parsedPrompt, err := dp.Parse(string(source))
if err != nil {
slog.Error("Failed to parse file as dotprompt", "file", sourceFile, "error", err)
return nil
}

metadata, err := r.Dotprompt().RenderMetadata(string(source), &parsedPrompt.PromptMetadata)
metadata, err := dp.RenderMetadata(string(source), &parsedPrompt.PromptMetadata)
if err != nil {
slog.Error("Failed to render dotprompt metadata", "file", sourceFile, "error", err)
return nil
Expand Down
2 changes: 1 addition & 1 deletion go/core/api/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ type Registry interface {
// RegisterHelper adds a helper function to the dotprompt instance
RegisterHelper(name string, fn any)

// Dotprompt returns the dotprompt instance.
// Dotprompt returns a clone of the Dotprompt instance.
Dotprompt() *dotprompt.Dotprompt
}
4 changes: 2 additions & 2 deletions go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ retract (

require (
cloud.google.com/go/alloydbconn v1.15.3
cloud.google.com/go/bigquery v1.67.0
cloud.google.com/go/auth v0.16.2
cloud.google.com/go/bigquery v1.67.0
cloud.google.com/go/cloudsqlconn v1.17.2
cloud.google.com/go/firestore v1.18.0
cloud.google.com/go/logging v1.13.0
Expand All @@ -20,7 +20,7 @@ require (
github.com/anthropics/anthropic-sdk-go v1.9.1
github.com/blues/jsonata-go v1.5.4
github.com/goccy/go-yaml v1.17.1
github.com/google/dotprompt/go v0.0.0-20250923103342-a8a91d1dff59
github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/invopop/jsonschema v0.13.0
Expand Down
10 changes: 6 additions & 4 deletions go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/anthropics/anthropic-sdk-go v1.4.0 h1:fU1jKxYbQdQDiEXCxeW5XZRIOwKevn/PMg8Ay1nnUx0=
github.com/anthropics/anthropic-sdk-go v1.4.0/go.mod h1:AapDW22irxK2PSumZiQXYUFvsdQgkwIWlpESweWZI/c=
github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE=
github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA=
github.com/anthropics/anthropic-sdk-go v1.9.1 h1:raRhZKmayVSVZtLpLDd6IsMXvxLeeSU03/2IBTerWlg=
github.com/anthropics/anthropic-sdk-go v1.9.1/go.mod h1:WTz31rIUHUHqai2UslPpw5CwXrQP3geYBioRV4WOLvE=
github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE=
github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA=
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
Expand Down Expand Up @@ -205,14 +205,16 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/dotprompt/go v0.0.0-20250611200215-bb73406b05ca h1:LuQ8KS5N04c37jyaq6jelLdNi0GfI6QJb8lpnYaDW9Y=
github.com/google/dotprompt/go v0.0.0-20250611200215-bb73406b05ca/go.mod h1:dnIk+MSMnipm9uZyPIgptq7I39aDxyjBiaev/OG0W0Y=
github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
github.com/google/dotprompt/go v0.0.0-20250922193017-eeb62744224e h1:AK/O+vHflqzTehlcUBV6pkwZHCWIc8PrpA6xiiRo9d0=
github.com/google/dotprompt/go v0.0.0-20250922193017-eeb62744224e/go.mod h1:k8cjJAQWc//ac/bMnzItyOFbfT01tgRTZGgxELCuxEQ=
github.com/google/dotprompt/go v0.0.0-20250922225138-cb24085a67ed h1:xPu5zXopXdj48LXZqU6DosoL0oT7nbddgTMkjWoyHqQ=
github.com/google/dotprompt/go v0.0.0-20250922225138-cb24085a67ed/go.mod h1:k8cjJAQWc//ac/bMnzItyOFbfT01tgRTZGgxELCuxEQ=
github.com/google/dotprompt/go v0.0.0-20250923103342-a8a91d1dff59 h1:EywQhHXdzYlMKD7Gxl9Ho34c8dQ0meph6FuRN9iENEY=
github.com/google/dotprompt/go v0.0.0-20250923103342-a8a91d1dff59/go.mod h1:k8cjJAQWc//ac/bMnzItyOFbfT01tgRTZGgxELCuxEQ=
github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254 h1:okN800+zMJOGHLJCgry+OGzhhtH6YrjQh1rluHmOacE=
github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254/go.mod h1:k8cjJAQWc//ac/bMnzItyOFbfT01tgRTZGgxELCuxEQ=
github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
Expand Down
4 changes: 2 additions & 2 deletions go/internal/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ func (r *Registry) RegisterHelper(name string, fn any) {
r.dotprompt.Helpers[name] = fn
}

// Dotprompt returns the dotprompt instance.
// Dotprompt returns a clone of the Dotprompt instance.
func (r *Registry) Dotprompt() *dotprompt.Dotprompt {
r.mu.RLock()
defer r.mu.RUnlock()
return r.dotprompt
return r.dotprompt.Clone()
}
Loading