chore: refactor called function name (#95)

henomis · Jul 10, 2023 · ee3df70 · ee3df70
1 parent 2e691a1
commit ee3df70
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/examples/chat/functions/main.go b/examples/chat/functions/main.go
@@ -1,23 +1,23 @@
 package main
 
 import (
+	"bufio"
 	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"os"
 
 	"github.com/henomis/lingoose/chat"
 	"github.com/henomis/lingoose/llm/openai"
 	"github.com/henomis/lingoose/prompt"
 )
 
 func main() {
-	// fmt.Printf("What's your name?\n> ")
-	// reader := bufio.NewReader(os.Stdin)
-	// name, _ := reader.ReadString('\n')
-
-	name := "simone"
+	fmt.Printf("What's your name?\n> ")
+	reader := bufio.NewReader(os.Stdin)
+	name, _ := reader.ReadString('\n')
 
 	llmChat := chat.New(
 
@@ -41,25 +41,26 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	// fmt.Printf("\n%s", response)
-	_ = response
+
+	if llmOpenAI.CalledFunctionName() == nil {
+		fmt.Printf("expected called function name to be set")
+		return
+	}
 
 	llmChat.AddPromptMessages(
 		[]chat.PromptMessage{
 			{
 				Type:   chat.MessageTypeFunction,
 				Prompt: prompt.New(response),
-				Name:   llmOpenAI.LastFunctionCallName(),
+				Name:   llmOpenAI.CalledFunctionName(),
 			},
 		},
 	)
 
-	response, err = llmOpenAI.Chat(context.Background(), llmChat)
+	_, err = llmOpenAI.Chat(context.Background(), llmChat)
 	if err != nil {
 		panic(err)
 	}
-	_ = response
-	// fmt.Printf("\n%s", response)
 
 }
 

diff --git a/llm/openai/function.go b/llm/openai/function.go
@@ -181,7 +181,7 @@ func (o *openAI) functionCall(response openai.ChatCompletionResponse) (string, e
 		return "", fmt.Errorf("%s: %w", ErrOpenAIChat, err)
 	}
 
-	o.lastFunctionCalledName = fn.Name
+	o.calledFunctionName = &fn.Name
 
 	return resultAsJSON, nil
 }
diff --git a/llm/openai/openai.go b/llm/openai/openai.go
@@ -69,7 +69,7 @@ type openAI struct {
 	usageCallback          OpenAIUsageCallback
 	functions              map[string]Function
 	functionsMaxIterations uint
-	lastFunctionCalledName string
+	calledFunctionName     *string
 }
 
 func New(model Model, temperature float32, maxTokens int, verbose bool) *openAI {
@@ -127,8 +127,8 @@ func (o *openAI) WithFunctionCallMaxIterations(maxIterations uint) *openAI {
 	return o
 }
 
-func (o *openAI) LastFunctionCallName() *string {
-	return &o.lastFunctionCalledName
+func (o *openAI) CalledFunctionName() *string {
+	return o.calledFunctionName
 }
 
 func NewCompletion() *openAI {
@@ -275,6 +275,7 @@ func (o *openAI) Chat(ctx context.Context, prompt *chat.Chat) (string, error) {
 
 	content := response.Choices[0].Message.Content
 
+	o.calledFunctionName = nil
 	if response.Choices[0].FinishReason == "function_call" && len(o.functions) > 0 {
 		content, err = o.functionCall(response)
 		if err != nil {