From 8ffe9527e292f409b91e1b58eba823fbc7fd7df1 Mon Sep 17 00:00:00 2001 From: Aavash Shrestha Date: Sat, 15 Mar 2025 12:38:16 +0100 Subject: [PATCH] support thread deletion --- go.mod | 8 ++--- go.sum | 48 ------------------------------ internal/ui/components/list.go | 19 +++++++++++- internal/ui/handlers.go | 54 ++++++++++++++++++++++------------ internal/ui/model.go | 2 ++ 5 files changed, 57 insertions(+), 74 deletions(-) diff --git a/go.mod b/go.mod index 35e16f4..762709b 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,18 @@ module github.com/aavshr/panda go 1.23 require ( + github.com/adrg/xdg v0.5.0 github.com/charmbracelet/bubbles v0.18.0 github.com/charmbracelet/bubbletea v0.25.0 github.com/charmbracelet/lipgloss v0.9.1 github.com/jmoiron/sqlx v1.3.5 github.com/matoous/go-nanoid/v2 v2.1.0 github.com/mattn/go-sqlite3 v1.14.22 + github.com/sashabaranov/go-openai v1.28.2 golang.org/x/term v0.23.0 ) require ( - github.com/adrg/xdg v0.5.0 // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/containerd/console v1.0.4 // indirect @@ -27,11 +28,6 @@ require ( github.com/muesli/termenv v0.15.2 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f // indirect - github.com/sashabaranov/go-openai v1.28.2 // indirect - golang.design/x/clipboard v0.7.0 // indirect - golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect - golang.org/x/image v0.6.0 // indirect - golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.23.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/go.sum b/go.sum index de47d0f..b3ac195 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY= github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= @@ -57,62 +56,15 @@ github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAV github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.design/x/clipboard v0.7.0 h1:4Je8M/ys9AJumVnl8m+rZnIvstSnYj1fvzqYrU3TXvo= -golang.design/x/clipboard v0.7.0/go.mod h1:PQIvqYO9GP29yINEfsEn5zSQKAz3UgXmZKzDA6dnq2E= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4= -golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c h1:Gk61ECugwEHL6IiyyNLXNzmu8XslmRP2dS0xjIYhbb4= -golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/ui/components/list.go b/internal/ui/components/list.go index 9fd64c8..3f0b559 100644 --- a/internal/ui/components/list.go +++ b/internal/ui/components/list.go @@ -17,6 +17,10 @@ type ListSelectMsg struct { Index int } +type ListDeleteMsg struct { + Index int +} + func ListEnterCmd(selectedIndex int) func() tea.Msg { return func() tea.Msg { return ListEnterMsg{ @@ -33,6 +37,14 @@ func ListSelectCmd(selectedIndex int) func() tea.Msg { } } +func ListDeleteCmd(selectedIndex int) func() tea.Msg { + return func() tea.Msg { + return ListDeleteMsg{ + Index: selectedIndex, + } + } +} + type ListModel struct { inner list.Model } @@ -112,7 +124,12 @@ func (m *ListModel) Update(msg tea.Msg) (ListModel, tea.Cmd) { case tea.KeyEnter: index := m.inner.Index() if index >= 0 { - return *m, ListEnterCmd(m.inner.Index()) + return *m, ListEnterCmd(index) + } + case tea.KeyCtrlD: + index := m.inner.Index() + if index >= 0 { + return *m, ListDeleteCmd(index) } } if key.Matches(msg, m.inner.KeyMap.CursorUp) || key.Matches(msg, m.inner.KeyMap.CursorDown) { diff --git a/internal/ui/handlers.go b/internal/ui/handlers.go index bbfaaec..6a1e92c 100644 --- a/internal/ui/handlers.go +++ b/internal/ui/handlers.go @@ -14,7 +14,6 @@ import ( "github.com/aavshr/panda/internal/ui/styles" "github.com/aavshr/panda/internal/utils" tea "github.com/charmbracelet/bubbletea" - "golang.design/x/clipboard" ) func (m *Model) handleKeyMsg(keyMsg tea.KeyMsg) (tea.Model, tea.Cmd) { @@ -193,35 +192,52 @@ func (m *Model) handleListEnterMsg(msg components.ListEnterMsg) tea.Cmd { } m.setSelectedComponent(components.ComponentMessages) m.setFocusedComponent(components.ComponentMessages) - case components.ComponentMessages: - // TODO: how to convey to the user that the message is copied or there was an error - if err := clipboard.Init(); err == nil { - if msg.Index >= len(m.messages) { - return m.cmdError(fmt.Errorf("invalid message index")) - } - message := m.messages[msg.Index].Content - clipboard.Write(clipboard.FmtText, []byte(message)) - } } return nil } +func (m *Model) selectActiveThread(index int) error { + m.setActiveThreadIndex(index) + + if len(m.threads) == 0 || index >= len(m.threads) { + return fmt.Errorf("invalid thread index") + } + threadId := m.threads[index].ID + messages, err := m.store.ListMessagesByThreadIDPaginated(threadId, 0, m.conf.MessagesLimit) + if err != nil { + return fmt.Errorf("store.ListMessagesByThreadIDPaginated: %w", err) + } + m.setMessages(messages) + return nil +} + func (m *Model) handleListSelectMsg(msg components.ListSelectMsg) tea.Cmd { switch m.focusedComponent { case components.ComponentHistory: - m.setActiveThreadIndex(msg.Index) + if err := m.selectActiveThread(msg.Index); err != nil { + return m.cmdError(err) + } + } + return nil +} - if len(m.threads) == 0 || msg.Index >= len(m.threads) { - return m.cmdError(fmt.Errorf("invalid thread index")) +func (m *Model) handleListDeleteMsg(msg components.ListDeleteMsg) tea.Cmd { + switch m.focusedComponent { + case components.ComponentHistory: + // first item is always for new thread so no deletion + if msg.Index == 0 { + return nil } - threadId := m.threads[msg.Index].ID - messages, err := m.store.ListMessagesByThreadIDPaginated(threadId, 0, m.conf.MessagesLimit) - if err != nil { + if err := m.store.DeleteThread(m.threads[msg.Index].ID); err != nil { + return m.cmdError(err) + } + m.setThreads(append(m.threads[:msg.Index], m.threads[msg.Index+1:]...)) + if msg.Index >= len(m.threads) { + msg.Index = len(m.threads) - 1 + } + if err := m.selectActiveThread(msg.Index); err != nil { return m.cmdError(err) } - m.setMessages(messages) - // TODO: how should we handle selecting a message? - case components.ComponentMessages: } return nil } diff --git a/internal/ui/model.go b/internal/ui/model.go index 504aed8..124dcd9 100644 --- a/internal/ui/model.go +++ b/internal/ui/model.go @@ -259,6 +259,8 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { cmd = m.handleListEnterMsg(msg) case components.ListSelectMsg: cmd = m.handleListSelectMsg(msg) + case components.ListDeleteMsg: + cmd = m.handleListDeleteMsg(msg) case ForwardChatCompletionStreamMsg: cmd = m.handleForwardChatCompletionStreamMsg(msg) case error: