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

devie #17

Merged
merged 2 commits into from
Sep 5, 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
24 changes: 12 additions & 12 deletions chat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func TestCreateChatCompletionStream(t *testing.T) {
context.Background(),
groq.ChatCompletionRequest{
MaxTokens: 5,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Expand All @@ -94,7 +94,7 @@ func TestCreateChatCompletionStream(t *testing.T) {
ID: "1",
Object: "completion",
Created: 1598069254,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
SystemFingerprint: "fp_d9767fc5b9",
Choices: []groq.ChatCompletionStreamChoice{
{
Expand All @@ -109,7 +109,7 @@ func TestCreateChatCompletionStream(t *testing.T) {
ID: "2",
Object: "completion",
Created: 1598069255,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
SystemFingerprint: "fp_d9767fc5b9",
Choices: []groq.ChatCompletionStreamChoice{
{
Expand Down Expand Up @@ -199,7 +199,7 @@ func TestCreateChatCompletionStreamError(t *testing.T) {
context.Background(),
groq.ChatCompletionRequest{
MaxTokens: 5,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Expand Down Expand Up @@ -249,7 +249,7 @@ func TestCreateChatCompletionStreamWithHeaders(t *testing.T) {
context.Background(),
groq.ChatCompletionRequest{
MaxTokens: 5,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Expand Down Expand Up @@ -308,7 +308,7 @@ func TestCreateChatCompletionStreamWithRatelimitHeaders(t *testing.T) {
context.Background(),
groq.ChatCompletionRequest{
MaxTokens: 5,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Expand Down Expand Up @@ -369,7 +369,7 @@ func TestCreateChatCompletionStreamErrorWithDataPrefix(t *testing.T) {
context.Background(),
groq.ChatCompletionRequest{
MaxTokens: 5,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Expand Down Expand Up @@ -417,7 +417,7 @@ func TestCreateChatCompletionStreamRateLimitError(t *testing.T) {
context.Background(),
groq.ChatCompletionRequest{
MaxTokens: 5,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Expand Down Expand Up @@ -468,7 +468,7 @@ func TestCreateChatCompletionStreamStreamOptions(t *testing.T) {
context.Background(),
groq.ChatCompletionRequest{
MaxTokens: 5,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Expand All @@ -488,7 +488,7 @@ func TestCreateChatCompletionStreamStreamOptions(t *testing.T) {
ID: "1",
Object: "completion",
Created: 1598069254,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
SystemFingerprint: "fp_d9767fc5b9",
Choices: []groq.ChatCompletionStreamChoice{
{
Expand All @@ -503,7 +503,7 @@ func TestCreateChatCompletionStreamStreamOptions(t *testing.T) {
ID: "2",
Object: "completion",
Created: 1598069255,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
SystemFingerprint: "fp_d9767fc5b9",
Choices: []groq.ChatCompletionStreamChoice{
{
Expand All @@ -518,7 +518,7 @@ func TestCreateChatCompletionStreamStreamOptions(t *testing.T) {
ID: "3",
Object: "completion",
Created: 1598069256,
Model: groq.Llama3_8b_8192,
Model: groq.Llama38B8192,
SystemFingerprint: "fp_d9767fc5b9",
Choices: []groq.ChatCompletionStreamChoice{},
Usage: &groq.Usage{
Expand Down
28 changes: 28 additions & 0 deletions examples/terminal-chat/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module github.com/conneroisu/groq-go/examples/terminal-chat

go 1.23.0

require (
github.com/charmbracelet/bubbles v0.19.0
github.com/charmbracelet/bubbletea v1.1.0
github.com/charmbracelet/lipgloss v0.13.0
)

require (
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/charmbracelet/x/ansi v0.2.3 // indirect
github.com/charmbracelet/x/term v0.2.0 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.3.8 // indirect
)
43 changes: 43 additions & 0 deletions examples/terminal-chat/go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
github.com/charmbracelet/bubbles v0.19.0 h1:gKZkKXPP6GlDk6EcfujDK19PCQqRjaJZQ7QRERx1UF0=
github.com/charmbracelet/bubbles v0.19.0/go.mod h1:WILteEqZ+krG5c3ntGEMeG99nCupcuIk7V0/zOP0tOA=
github.com/charmbracelet/bubbletea v1.1.0 h1:FjAl9eAL3HBCHenhz/ZPjkKdScmaS5SK69JAK2YJK9c=
github.com/charmbracelet/bubbletea v1.1.0/go.mod h1:9Ogk0HrdbHolIKHdjfFpyXJmiCzGwy+FesYkZr7hYU4=
github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY=
github.com/charmbracelet/x/ansi v0.2.3 h1:VfFN0NUpcjBRd4DnKfRaIRo53KRgey/nhOoEqosGDEY=
github.com/charmbracelet/x/ansi v0.2.3/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
github.com/charmbracelet/x/term v0.2.0 h1:cNB9Ot9q8I711MyZ7myUR5HFWL/lc3OpU8jZ4hwm0x0=
github.com/charmbracelet/x/term v0.2.0/go.mod h1:GVxgxAbjUrmpvIINHIQnJJKpMlHiZ4cktEQCN6GWyF0=
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
170 changes: 170 additions & 0 deletions examples/terminal-chat/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
package main

import (
"context"
"fmt"
"log"
"os"
"strings"

"github.com/charmbracelet/bubbles/textarea"
"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"github.com/conneroisu/groq-go"
)

func main() {
p := tea.NewProgram(
initialModel(),
tea.WithMouseAllMotion(),
tea.WithAltScreen(),
)
if _, err := p.Run(); err != nil {
log.Fatal(err)
}
}

type (
errMsg error
)

type model struct {
groqClient *groq.Client
viewport viewport.Model
messages []string
textarea textarea.Model
senderStyle lipgloss.Style
err error
}

const (
width = 500
height = 10
)

func initialModel() model {
groqClient, err := groq.NewClient(
os.Getenv("GROQ_KEY"),
)
if err != nil {
return model{
err: errMsg(err),
}
}
ta := textarea.New()
ta.Placeholder = "Send a message..."
ta.Focus()
ta.Prompt = "┃ "
ta.CharLimit = 280
ta.SetWidth(500)
ta.SetHeight(10)
ta.FocusedStyle.CursorLine = lipgloss.NewStyle()
ta.ShowLineNumbers = false

vp := viewport.New(width, height)
vp.SetContent(`Welcome to the chat room!
Type a message and press Enter to send.`)

ta.KeyMap.InsertNewline.SetEnabled(false)

return model{
textarea: ta,
messages: []string{},
viewport: vp,
senderStyle: lipgloss.NewStyle().Foreground(lipgloss.Color("5")),
err: nil,
groqClient: groqClient,
}
}

func (m model) Init() tea.Cmd {
return textarea.Blink
}

func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var (
tiCmd tea.Cmd
vpCmd tea.Cmd
)

m.textarea, tiCmd = m.textarea.Update(msg)
m.viewport, vpCmd = m.viewport.Update(msg)

switch msg := msg.(type) {
case tea.KeyMsg:
switch msg.Type {
case tea.KeyCtrlC, tea.KeyEsc:
fmt.Println(m.textarea.Value())
return m, tea.Quit
case tea.KeyDown:
m.textarea.SetValue(m.textarea.Value() + "\n")
m.viewport.LineDown(1)
m.viewport.TotalLineCount()
_ = os.WriteFile("chat.txt", []byte(m.textarea.Value()), 0644)
case tea.KeyEnter:
message := m.textarea.Value()
if strings.TrimSpace(m.textarea.Value()) == "" {
break
}
m.messages = append(
m.messages,
m.senderStyle.Render("You: ")+message,
)
m.viewport.SetContent(strings.Join(m.messages, "\n"))
m.textarea.Reset()
m.viewport.GotoBottom()
re, err := m.groqClient.CreateChatCompletionStream(context.Background(), groq.ChatCompletionRequest{
Model: groq.Llama38B8192,
Messages: []groq.ChatCompletionMessage{
{
Role: groq.ChatMessageRoleUser,
Content: message,
},
},
MaxTokens: 2000,
})
if err != nil {
m.err = errMsg(err)
return m, nil
}
newIx := len(m.messages) - 1
currentCnt := ""
for {
response, err := re.Recv()
if err != nil {
m.err = errMsg(err)
return m, nil
}
if response.Choices[0].FinishReason == groq.FinishReasonStop {
break
}
currentCnt += response.Choices[0].Delta.Content
m.messages[newIx] = m.senderStyle.Render("Groq: ") + currentCnt
m.viewport.SetContent(strings.Join(m.messages, "\n"))
}
}
case tea.MouseAction:
val := tea.MouseAction(msg)
if val == 4 {
m.viewport.LineUp(1)
return m, nil
} else if val == 5 {
m.viewport.LineDown(1)
return m, nil
}
case errMsg:
m.err = msg
return m, nil
}

return m, tea.Batch(tiCmd, vpCmd)
}

func (m model) View() string {
return fmt.Sprintf(
"%s\n\n%s",
m.viewport.View(),
m.textarea.View(),
) + "\n\n"
}
17 changes: 15 additions & 2 deletions go.work.sum
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
github.com/charmbracelet/x/input v0.1.0/go.mod h1:ZZwaBxPF7IG8gWWzPUVqHEtWhc1+HXJPNuerJGRGZ28=
github.com/charmbracelet/x/windows v0.1.0/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
Loading
Loading