Skip to content

Commit 5ef2fe2

Browse files
apascal07apascal07
committed
Fixed registry instances.
1 parent e3c14a5 commit 5ef2fe2

File tree

5 files changed

+26
-98
lines changed

5 files changed

+26
-98
lines changed

‎go/ai/action_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func TestGenerateAction(t *testing.T) {
9191
t.Run(tc.Name, func(t *testing.T) {
9292
ctx := context.Background()
9393

94-
r, err := registry.New()
95-
if err != nil {
96-
t.Fatalf("failed to create registry: %v", err)
97-
}
94+
r := registry.New()
9895
ConfigureFormats(r)
9996

10097
pm := defineProgrammableModel(r)

‎go/ai/evaluator_test.go‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,11 @@ var testRequest = EvaluatorRequest{
8888
}
8989

9090
func TestSimpleEvaluator(t *testing.T) {
91-
r, err := registry.New()
92-
if err != nil {
93-
t.Fatal(err)
94-
}
91+
r := registry.New()
9592

96-
evalAction := DefineEvaluator(r, "test/testEvaluator", &evalOpts, testEvalFunc)
97-
if err != nil {
98-
t.Fatal(err)
99-
}
93+
evaluator := DefineEvaluator(r, "test/testEvaluator", &evalOpts, testEvalFunc)
10094

101-
resp, err := evalAction.Evaluate(context.Background(), &testRequest)
95+
resp, err := evaluator.Evaluate(context.Background(), &testRequest)
10296
if err != nil {
10397
t.Fatal(err)
10498
}
@@ -121,20 +115,14 @@ func TestSimpleEvaluator(t *testing.T) {
121115
}
122116

123117
func TestOptionsRequired(t *testing.T) {
124-
r, err := registry.New()
125-
if err != nil {
126-
t.Fatal(err)
127-
}
118+
r := registry.New()
128119

129120
_ = DefineEvaluator(r, "test/testEvaluator", &evalOpts, testEvalFunc)
130121
_ = DefineBatchEvaluator(r, "test/testBatchEvaluator", &evalOpts, testBatchEvalFunc)
131122
}
132123

133124
func TestFailingEvaluator(t *testing.T) {
134-
r, err := registry.New()
135-
if err != nil {
136-
t.Fatal(err)
137-
}
125+
r := registry.New()
138126

139127
evalAction := DefineEvaluator(r, "test/testEvaluator", &evalOpts, testFailingEvalFunc)
140128

@@ -152,10 +140,7 @@ func TestFailingEvaluator(t *testing.T) {
152140
}
153141

154142
func TestLookupEvaluator(t *testing.T) {
155-
r, err := registry.New()
156-
if err != nil {
157-
t.Fatal(err)
158-
}
143+
r := registry.New()
159144

160145
evalAction := DefineEvaluator(r, "test/testEvaluator", &evalOpts, testEvalFunc)
161146
batchEvalAction := DefineBatchEvaluator(r, "test/testBatchEvaluator", &evalOpts, testBatchEvalFunc)
@@ -169,10 +154,7 @@ func TestLookupEvaluator(t *testing.T) {
169154
}
170155

171156
func TestEvaluate(t *testing.T) {
172-
r, err := registry.New()
173-
if err != nil {
174-
t.Fatal(err)
175-
}
157+
r := registry.New()
176158

177159
evalAction := DefineEvaluator(r, "test/testEvaluator", &evalOpts, testEvalFunc)
178160

@@ -199,10 +181,7 @@ func TestEvaluate(t *testing.T) {
199181
}
200182

201183
func TestBatchEvaluator(t *testing.T) {
202-
r, err := registry.New()
203-
if err != nil {
204-
t.Fatal(err)
205-
}
184+
r := registry.New()
206185

207186
evalAction := DefineBatchEvaluator(r, "test/testBatchEvaluator", &evalOpts, testBatchEvalFunc)
208187

‎go/ai/generate_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type StructuredResponse struct {
3333
Location string
3434
}
3535

36-
var r, _ = registry.New()
36+
var r = registry.New()
3737

3838
func init() {
3939
// Set up default formats

‎go/ai/prompt.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,7 @@ func loadPromptDir(r *registry.Registry, dir string, namespace string) error {
498498
slog.Error("Failed to read partial file", "error", err)
499499
continue
500500
}
501-
if err = r.DefinePartial(partialName, string(source)); err != nil {
502-
return err
503-
}
501+
r.DefinePartial(partialName, string(source))
504502
slog.Debug("Registered Dotprompt partial", "name", partialName, "file", path)
505503
} else {
506504
if _, err := LoadPrompt(r, dir, filename, namespace); err != nil {

‎go/ai/prompt_test.go‎

Lines changed: 15 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,7 @@ func TestOutputFormat(t *testing.T) {
7070
}
7171
for _, test := range tests {
7272
t.Run(test.name, func(t *testing.T) {
73-
reg, err := registry.New()
74-
if err != nil {
75-
t.Fatal(err)
76-
}
73+
reg := registry.New()
7774

7875
if test.output == nil {
7976
DefinePrompt(
@@ -94,10 +91,7 @@ func TestOutputFormat(t *testing.T) {
9491
}
9592

9693
func TestInputFormat(t *testing.T) {
97-
reg, err := registry.New()
98-
if err != nil {
99-
t.Fatal(err)
100-
}
94+
reg := registry.New()
10195

10296
type hello struct {
10397
Name string `json:"name"`
@@ -222,10 +216,7 @@ func definePromptModel(reg *registry.Registry) Model {
222216
}
223217

224218
func TestValidPrompt(t *testing.T) {
225-
reg, err := registry.New()
226-
if err != nil {
227-
t.Fatal(err)
228-
}
219+
reg := registry.New()
229220

230221
ConfigureFormats(reg)
231222

@@ -595,10 +586,7 @@ func testGenerate(ctx context.Context, req *ModelRequest, cb func(context.Contex
595586
}
596587

597588
func TestOptionsPatternExecute(t *testing.T) {
598-
reg, err := registry.New()
599-
if err != nil {
600-
t.Fatal(err)
601-
}
589+
reg := registry.New()
602590

603591
ConfigureFormats(reg)
604592

@@ -649,10 +637,8 @@ func TestOptionsPatternExecute(t *testing.T) {
649637
}
650638

651639
func TestDefaultsOverride(t *testing.T) {
652-
reg, err := registry.New()
653-
if err != nil {
654-
t.Fatal(err)
655-
}
640+
reg := registry.New()
641+
656642
// Set up default formats
657643
ConfigureFormats(reg)
658644

@@ -832,10 +818,7 @@ Hello, {{name}}!
832818
}
833819

834820
// Initialize a mock registry
835-
reg, err := registry.New()
836-
if err != nil {
837-
t.Fatalf("Failed to create registry: %v", err)
838-
}
821+
reg := registry.New()
839822

840823
// Call loadPrompt
841824
LoadPrompt(reg, tempDir, "example.prompt", "test-namespace")
@@ -865,10 +848,7 @@ Hello, {{name}}!
865848

866849
func TestLoadPrompt_FileNotFound(t *testing.T) {
867850
// Initialize a mock registry
868-
reg, err := registry.New()
869-
if err != nil {
870-
t.Fatalf("Failed to create registry: %v", err)
871-
}
851+
reg := registry.New()
872852

873853
// Call loadPrompt with a non-existent file
874854
LoadPrompt(reg, "./nonexistent", "missing.prompt", "test-namespace")
@@ -893,10 +873,7 @@ func TestLoadPrompt_InvalidPromptFile(t *testing.T) {
893873
}
894874

895875
// Initialize a mock registry
896-
reg, err := registry.New()
897-
if err != nil {
898-
t.Fatalf("Failed to create registry: %v", err)
899-
}
876+
reg := registry.New()
900877

901878
// Call loadPrompt
902879
LoadPrompt(reg, tempDir, "invalid.prompt", "test-namespace")
@@ -927,10 +904,7 @@ Hello, {{name}}!
927904
}
928905

929906
// Initialize a mock registry
930-
reg, err := registry.New()
931-
if err != nil {
932-
t.Fatalf("Failed to create registry: %v", err)
933-
}
907+
reg := registry.New()
934908

935909
// Call loadPrompt
936910
LoadPrompt(reg, tempDir, "example.variant.prompt", "test-namespace")
@@ -985,10 +959,7 @@ Hello, {{name}}!
985959
}
986960

987961
// Initialize a mock registry
988-
reg, err := registry.New()
989-
if err != nil {
990-
t.Fatalf("Failed to create registry: %v", err)
991-
}
962+
reg := registry.New()
992963

993964
// Call LoadPromptFolder
994965
LoadPromptDir(reg, tempDir, "test-namespace")
@@ -1027,32 +998,15 @@ func TestLoadPromptFolder_DirectoryNotFound(t *testing.T) {
1027998
// and using both partials and helpers.
1028999
func TestDefinePartialAndHelper(t *testing.T) {
10291000
// Initialize a mock registry
1030-
reg, err := registry.New()
1031-
if err != nil {
1032-
t.Fatalf("Failed to create registry: %v", err)
1033-
}
1001+
reg := registry.New()
10341002
ConfigureFormats(reg)
10351003

10361004
model := definePromptModel(reg)
10371005

1038-
if err = reg.DefinePartial("header", "Welcome {{name}}!"); err != nil {
1039-
t.Fatalf("Failed to define partial: %v", err)
1040-
}
1041-
if err = reg.DefineHelper("uppercase", func(s string) string {
1006+
reg.DefinePartial("header", "Welcome {{name}}!")
1007+
reg.DefineHelper("uppercase", func(s string) string {
10421008
return strings.ToUpper(s)
1043-
}); err != nil {
1044-
t.Fatalf("Failed to define helper: %v", err)
1045-
}
1046-
1047-
// Duplicate partial and helper definitions should return an error
1048-
if err = reg.DefinePartial("header", "Welcome {{name}}!"); err == nil {
1049-
t.Fatalf("Expected error defining partial with duplicate name")
1050-
}
1051-
if err = reg.DefineHelper("uppercase", func(s string) string {
1052-
return ""
1053-
}); err == nil {
1054-
t.Fatalf("Expected error defining helper with duplicate name")
1055-
}
1009+
})
10561010

10571011
p := DefinePrompt(reg, "test", WithPrompt(`{{> header}} {{uppercase greeting}}`), WithModel(model))
10581012

0 commit comments

Comments
 (0)