Merge pull request #110 from JunNishimura/#107

update finish behaviour for hey command
JunNishimura · Sep 2, 2023 · e599891 · e599891
2 parents 2ec341e + 74f9ee8
commit e599891
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/ui/cmd/hey/model.go b/ui/cmd/hey/model.go
@@ -79,6 +79,7 @@ type Model struct {
 	spotifyClient    *spotify.Client
 	openaiClient     *openai.Client
 	questionIndex    int
+	questionDone     bool
 	functionCall     any
 	chatCompMessages []openai.ChatCompletionMessage
 	functions        []openai.FunctionDefinition

diff --git a/ui/cmd/hey/update.go b/ui/cmd/hey/update.go
@@ -25,6 +25,9 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "ctrl+c", "q":
 			return m, tea.Quit
 		case "tab":
+			if m.questionDone {
+				m.state = recommendationView
+			}
 			m.state = m.state.Switch()
 		case "enter":
 			if m.err != nil {
@@ -83,6 +86,10 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.chatCompMessages = append(m.chatCompMessages, msg.msg)
 		m.functionCall = "auto"
 		m.questionIndex++
+		if m.questionIndex == len(functions.List) {
+			m.questionDone = true
+			m.state = recommendationView
+		}
 		return m, tea.Batch(m.generate, m.recommend)
 	case recommendMsg:
 		m.recommendItems = msg.items

diff --git a/ui/cmd/hey/view.go b/ui/cmd/hey/view.go
@@ -20,6 +20,12 @@ func (m *Model) View() string {
 		return style.ErrorView(style.DefaultErrorMessage, m.Window.Width, m.Window.Height)
 	}
 
+	if m.questionDone {
+		return lipgloss.Place(m.Window.Width, m.Window.Height, lipgloss.Center, lipgloss.Center,
+			style.RecommendationFocused(m.getViewWidth(), m.getViewHeight()).Render(m.recommendationView()),
+		)
+	}
+
 	var s string
 	if m.state == chatView {
 		s += lipgloss.Place(m.Window.Width, m.Window.Height, lipgloss.Center, lipgloss.Center,