From d5ab5a8e7ccd980d160374485e98ba4598dda3a7 Mon Sep 17 00:00:00 2001 From: Adrien Date: Wed, 22 May 2024 20:06:07 +0200 Subject: [PATCH] Fix usage --- RequestAnthropic.go | 5 +++-- RequestGoogle.go | 5 +++-- RequestGroq.go | 5 +++-- RequestMistral.go | 5 +++-- RequestOpenai.go | 10 +++++++--- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/RequestAnthropic.go b/RequestAnthropic.go index 6f212e5..bc1d744 100644 --- a/RequestAnthropic.go +++ b/RequestAnthropic.go @@ -165,11 +165,12 @@ func RequestAnthropic(model string, messages []Message, maxTokens int, temperatu var usedModelInfo ModelInfo edgeClient.QuerySingle(edgeCtx, ` - Select ModelInfo { + SELECT ModelInfo { inputPrice, outputPrice } - FILTER .name = $0 + FILTER .modelID = $0 + LIMIT 1 `, &usedModelInfo, model) var inputCost float32 = float32(chatCompletionResponse.Usage.InputTokens) * usedModelInfo.InputPrice diff --git a/RequestGoogle.go b/RequestGoogle.go index 0252f2c..78efb40 100644 --- a/RequestGoogle.go +++ b/RequestGoogle.go @@ -172,11 +172,12 @@ func RequestGoogle(model string, messages []Message, temperature float64) (Opena var usedModelInfo ModelInfo edgeClient.QuerySingle(edgeCtx, ` - Select ModelInfo { + SELECT ModelInfo { inputPrice, outputPrice } - Filter ModelInfo.model = $0 + FILTER .modelID = $0 + LIMIT 1 `, &usedModelInfo, model) var inputCost float32 = float32(chatCompletionResponse.Usage.PromptTokens) * usedModelInfo.InputPrice diff --git a/RequestGroq.go b/RequestGroq.go index 4343ae4..0edbb11 100644 --- a/RequestGroq.go +++ b/RequestGroq.go @@ -163,11 +163,12 @@ func RequestGroq(model string, messages []Message, temperature float64) (GroqCha var usedModelInfo ModelInfo edgeClient.QuerySingle(edgeCtx, ` - Select ModelInfo { + SELECT ModelInfo { inputPrice, outputPrice } - Filter ModelInfo.model = $0 + FILTER .modelID = $0 + LIMIT 1 `, &usedModelInfo, model) var inputCost float32 = float32(chatCompletionResponse.Usage.PromptTokens) * usedModelInfo.InputPrice diff --git a/RequestMistral.go b/RequestMistral.go index cbc1b95..92f4147 100644 --- a/RequestMistral.go +++ b/RequestMistral.go @@ -170,11 +170,12 @@ func RequestMistral(model string, messages []Message, temperature float64) (Mist var usedModelInfo ModelInfo edgeClient.QuerySingle(edgeCtx, ` - Select ModelInfo { + SELECT ModelInfo { inputPrice, outputPrice } - Filter ModelInfo.model = $0 + FILTER .modelID = $0 + LIMIT 1 `, &usedModelInfo, model) var inputCost float32 = float32(chatCompletionResponse.Usage.PromptTokens) * usedModelInfo.InputPrice diff --git a/RequestOpenai.go b/RequestOpenai.go index 72fa3df..65cbb57 100644 --- a/RequestOpenai.go +++ b/RequestOpenai.go @@ -162,13 +162,17 @@ func RequestOpenai(model string, messages []Message, temperature float64) (Opena } var usedModelInfo ModelInfo - edgeClient.QuerySingle(edgeCtx, ` - Select ModelInfo { + err = edgeClient.QuerySingle(edgeCtx, ` + SELECT ModelInfo { inputPrice, outputPrice } - Filter ModelInfo.model = $0 + FILTER .modelID = $0 + LIMIT 1 `, &usedModelInfo, model) + if err != nil { + return OpenaiChatCompletionResponse{}, fmt.Errorf("error getting model info: %w", err) + } var inputCost float32 = float32(chatCompletionResponse.Usage.PromptTokens) * usedModelInfo.InputPrice var outputCost float32 = float32(chatCompletionResponse.Usage.CompletionTokens) * usedModelInfo.OutputPrice