Skip to content
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.

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

ansys gpt send token count #91

Merged
merged 1 commit into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions pkg/externalfunctions/ansysgpt.go
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func AnsysGPTPerformLLMRequest(finalQuery string, history []sharedtypes.Historic
streamChannel := make(chan string, 400)

// Start a goroutine to transfer the data from the response channel to the stream channel
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, 0, 0, "", false, "")
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, "", 0, 0, "", "", false, "")

// Return the stream channel
return "", &streamChannel
Expand Down Expand Up @@ -685,10 +685,12 @@ func AisPerformLLMFinalRequest(systemTemplate string,
prohibitedWords []string,
errorList1 []string,
errorList2 []string,
tokenCountEndpoint string,
previousInputTokenCount int,
previousOutputTokenCount int,
tokenCountModelName string,
isStream bool) (message string, stream *chan string) {
isStream bool,
userEmail string) (message string, stream *chan string) {

logging.Log.Debugf(internalstates.Ctx, "Performing LLM final request")

Expand Down Expand Up @@ -777,7 +779,7 @@ func AisPerformLLMFinalRequest(systemTemplate string,
totalInputTokenCount := previousInputTokenCount + inputTokenCount

// Start a goroutine to transfer the data from the response channel to the stream channel.
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, true, totalInputTokenCount, previousOutputTokenCount, tokenCountModelName, true, contextString)
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, true, tokenCountEndpoint, totalInputTokenCount, previousOutputTokenCount, tokenCountModelName, userEmail, true, contextString)

return "", &streamChannel
}
8 changes: 4 additions & 4 deletions pkg/externalfunctions/llmhandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ func PerformGeneralRequest(input string, history []sharedtypes.HistoricMessage,
streamChannel := make(chan string, 400)

// Start a goroutine to transfer the data from the response channel to the stream channel
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, 0, 0, "", false, "")
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, "", 0, 0, "", "", false, "")

// Return the stream channel
return "", &streamChannel
Expand Down Expand Up @@ -313,7 +313,7 @@ func PerformGeneralRequestWithImages(input string, history []sharedtypes.Histori
streamChannel := make(chan string, 400)

// Start a goroutine to transfer the data from the response channel to the stream channel
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, 0, 0, "", false, "")
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, "", 0, 0, "", "", false, "")

// Return the stream channel
return "", &streamChannel
Expand Down Expand Up @@ -371,7 +371,7 @@ func PerformGeneralRequestSpecificModel(input string, history []sharedtypes.Hist
streamChannel := make(chan string, 400)

// Start a goroutine to transfer the data from the response channel to the stream channel
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, 0, 0, "", false, "")
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, "", 0, 0, "", "", false, "")

// Return the stream channel
return "", &streamChannel
Expand Down Expand Up @@ -427,7 +427,7 @@ func PerformCodeLLMRequest(input string, history []sharedtypes.HistoricMessage,
streamChannel := make(chan string, 400)

// Start a goroutine to transfer the data from the response channel to the stream channel
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, validateCode, false, 0, 0, "", false, "")
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, validateCode, false, "", 0, 0, "", "", false, "")

// Return the stream channel
return "", &streamChannel
Expand Down
81 changes: 78 additions & 3 deletions pkg/externalfunctions/privatefunctions.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ func transferDatafromResponseToStreamChannel(
streamChannel *chan string,
validateCode bool,
sendTokenCount bool,
tokenCountEndpoint string,
previousInputTokenCount int,
previousOutputTokenCount int,
tokenCountModelName string,
userEmail string,
sendContex bool,
contex string) {

Expand Down Expand Up @@ -81,10 +83,21 @@ func transferDatafromResponseToStreamChannel(
// send the error message to the stream channel and exit function
*streamChannel <- fmt.Sprintf("$&$error$&$:$&$Error getting token count: %v$&$", err)
}

// calculate the total token count
totalInputTokenCount := previousInputTokenCount
totalOuputTokenCount := previousOutputTokenCount + outputTokenCount

// append the token count message to the final message
finalMessage += fmt.Sprintf("$&$input_token_count$&$:$&$%d$&$;$&$output_token_count$&$:$&$%d$&$;", previousInputTokenCount, totalOuputTokenCount)
// send the token count to the token count endpoint
err = sendTokenCountToEndpoint(userEmail, tokenCountEndpoint, totalInputTokenCount, totalOuputTokenCount)
if err != nil {
logging.Log.Errorf(internalstates.Ctx, "Error sending token count: %v\n", err)
// send the error message to the stream channel and exit function
*streamChannel <- fmt.Sprintf("$&$error$&$:$&$Error in updating token count: %v$&$", err)
} else {
// append the token count message to the final message
finalMessage += fmt.Sprintf("$&$input_token_count$&$:$&$%d$&$;$&$output_token_count$&$:$&$%d$&$;", totalInputTokenCount, totalOuputTokenCount)
}
}

// check for contex
Expand Down Expand Up @@ -131,6 +144,68 @@ func transferDatafromResponseToStreamChannel(
}
}

// sendTokenCount sends the token count to the token count endpoint
//
// Parameters:
// - userEmail: the email of the user
// - tokenCountEndpoint: the endpoint to send the token count to
// - inputTokenCount: the number of input tokens
// - ouputTokenCount: the number of output tokens
//
// Returns:
// - err: an error if the request fails
func sendTokenCountToEndpoint(userEmail string, tokenCountEndpoint string, inputTokenCount int, ouputTokenCount int) (err error) {
defer func() {
r := recover()
if r != nil {
err = fmt.Errorf("panic in sendTokenCount: %v", r)
}
}()

// verify that endpoint is filled
if tokenCountEndpoint == "" {
return fmt.Errorf("no token count endpoint provided")
}

// Create the request
requestBody := TokenCountUpdateRequest{
Email: userEmail,
InputToken: inputTokenCount,
OutputToken: ouputTokenCount,
Plattform: "Allie",
}

// Convert payload to JSON
jsonData, err := json.Marshal(requestBody)
if err != nil {
return fmt.Errorf("error marshalling JSON: %v", err)
}

// Create a new HTTP request
request, err := http.NewRequest("POST", tokenCountEndpoint, bytes.NewBuffer(jsonData))
if err != nil {
return fmt.Errorf("error creating request: %v", err)
}

// Set headers
request.Header.Set("Content-Type", "application/json")

// Create an HTTP client and make the request
client := &http.Client{}
resp, err := client.Do(request)
if err != nil {
return fmt.Errorf("error making request: %v", err)
}
defer resp.Body.Close()

// Check the response status
if resp.StatusCode != 200 {
return fmt.Errorf("response status unequal 200: %v", resp.Status)
}

return nil
}

// sendChatRequestNoHistory sends a chat request to LLM without history
//
// Parameters:
Expand Down Expand Up @@ -1502,7 +1577,7 @@ func performGeneralRequest(input string, history []sharedtypes.HistoricMessage,
streamChannel := make(chan string, 400)

// Start a goroutine to transfer the data from the response channel to the stream channel.
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, 0, 0, "", false, "")
go transferDatafromResponseToStreamChannel(&responseChannel, &streamChannel, false, false, "", 0, 0, "", "", false, "")

// Return the stream channel.
return "", &streamChannel, nil
Expand Down
7 changes: 7 additions & 0 deletions pkg/externalfunctions/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,10 @@ type DataExtractionSplitterServiceRequest struct {
type DataExtractionSplitterServiceResponse struct {
Chunks []string `json:"chunks"`
}

type TokenCountUpdateRequest struct {
Email string `json:"email"`
InputToken int `json:"input_token"`
OutputToken int `json:"output_token"`
Plattform string `json:"plattform"`
}