Merge pull request #1 from mikekavouras/input-arg-vs-builder

josebalius · web-flow · commit 31a228c18ad7 · 2023-08-13T09:43:57.000-04:00
Pass input instead of *builder
diff --git a/builder.go b/builder.go
@@ -26,9 +26,9 @@ func newBuilder[T any](t promptType, input string) (*builder[T], error) {
 	var pb promptBuilder
 	switch t {
 	case promptUserRequest:
-		pb = newUserRequest[T](b)
+		pb = newUserRequest[T](input)
 	case promptProgram:
-		pb = newProgram[T](b)
+		pb = newProgram[T](input)
 	default:
 		return nil, fmt.Errorf("unknown prompt type %s", t)
 	}
diff --git a/program.go b/program.go
@@ -24,12 +24,12 @@ indentation and no properties with the value undefined:`
 )
 
 type program[T any] struct {
-	builder *builder[T]
+	input string
 	built   string
 }
 
-func newProgram[T any](b *builder[T]) *program[T] {
-	return &program[T]{builder: b}
+func newProgram[T any](i string) *program[T] {
+  return &program[T]{input: i}
 }
 
 func (b *program[T]) string() (string, error) {
@@ -61,7 +61,7 @@ func (b *program[T]) string() (string, error) {
 func (b *program[T]) prompt() string {
 	var sb strings.Builder
 	sb.WriteString(newline("The following is a user request:"))
-	sb.WriteString(newline(b.builder.input))
+	sb.WriteString(newline(b.input))
 	sb.WriteString(newline(programPromptInstructions))
 
 	return sb.String()
diff --git a/typechat_test.go b/typechat_test.go
@@ -7,11 +7,11 @@ import (
 )
 
 type mockModelClient struct {
-	response []byte
+	response string
 	err      error
 }
 
-func (m mockModelClient) Do(ctx context.Context, prompt string) ([]byte, error) {
+func (m mockModelClient) Do(ctx context.Context, prompt string) (response string, err error) {
 	return m.response, m.err
 }
 
@@ -23,7 +23,7 @@ func TestTypeChat(t *testing.T) {
 	t.Run("it should generate the prompt and return the result", func(t *testing.T) {
 		ctx := context.Background()
 		m := mockModelClient{
-			response: []byte(`{"sentiment": "positive"}`),
+			response: `{"sentiment": "positive"}`,
 		}
 		p := NewPrompt[Result](m, "That game was awesome!")
 		result, err := p.Execute(ctx)
@@ -72,10 +72,10 @@ func TestTypeChat(t *testing.T) {
 			t.Errorf("Expected no error, got %v", err)
 		}
 		m := mockModelClient{
-			response: b,
+			response: string(b),
 		}
 		p := NewPrompt[API](m, "")
-		result, err := p.ExecuteProgram(ctx)
+		result, err := p.CreateProgram(ctx)
 		if err != nil {
 			t.Errorf("Expected no error, got %v", err)
 		}
diff --git a/user_request.go b/user_request.go
@@ -15,12 +15,12 @@ indentation and no properties with the value undefined:`
 )
 
 type userRequest[T any] struct {
-	builder *builder[T]
+	input string
 	built   string
 }
 
-func newUserRequest[T any](b *builder[T]) *userRequest[T] {
-	return &userRequest[T]{builder: b}
+func newUserRequest[T any](i string) *userRequest[T] {
+  return &userRequest[T]{input: i}
 }
 
 func (b *userRequest[T]) string() (string, error) {
@@ -45,7 +45,7 @@ func (b *userRequest[T]) string() (string, error) {
 func (b *userRequest[T]) prompt() string {
 	var sb strings.Builder
 	sb.WriteString(newline("The following is a user request:"))
-	sb.WriteString(newline(b.builder.input))
+	sb.WriteString(newline(b.input))
 	sb.WriteString(newline(userRequestPromptInstructions))
 
 	return sb.String()

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type mockModelClient struct {`
`10`		`- response []byte`
	`10`	`+ response string`
`11`	`11`	`err error`
`12`	`12`	`}`
`13`	`13`
`14`		`-func (m mockModelClient) Do(ctx context.Context, prompt string) ([]byte, error) {`
	`14`	`+func (m mockModelClient) Do(ctx context.Context, prompt string) (response string, err error) {`
`15`	`15`	`return m.response, m.err`
`16`	`16`	`}`
`17`	`17`
`@@ -23,7 +23,7 @@ func TestTypeChat(t *testing.T) {`
`23`	`23`	`t.Run("it should generate the prompt and return the result", func(t *testing.T) {`
`24`	`24`	`ctx := context.Background()`
`25`	`25`	`m := mockModelClient{`
`26`		- response: []byte(`{"sentiment": "positive"}`),
	`26`	+ response: `{"sentiment": "positive"}`,
`27`	`27`	`}`
`28`	`28`	`p := NewPrompt[Result](m, "That game was awesome!")`
`29`	`29`	`result, err := p.Execute(ctx)`
`@@ -72,10 +72,10 @@ func TestTypeChat(t *testing.T) {`
`72`	`72`	`t.Errorf("Expected no error, got %v", err)`
`73`	`73`	`}`
`74`	`74`	`m := mockModelClient{`
`75`		`- response: b,`
	`75`	`+ response: string(b),`
`76`	`76`	`}`
`77`	`77`	`p := NewPrompt[API](m, "")`
`78`		`- result, err := p.ExecuteProgram(ctx)`
	`78`	`+ result, err := p.CreateProgram(ctx)`
`79`	`79`	`if err != nil {`
`80`	`80`	`t.Errorf("Expected no error, got %v", err)`
`81`	`81`	`}`