Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
added paging for 'credits log' command
Dane Schneider55f2db24f82c
diff --git a/app/cli/api/methods.go b/app/cli/api/methods.goindex 327e375f..7e0ac1e4 100644--- a/app/cli/api/methods.go+++ b/app/cli/api/methods.go@@ -2027,8 +2027,8 @@ func (a *Api) DeleteModelPack(setId string) *shared.ApiError {return nil}-func (a *Api) GetCreditsTransactions() ([]*shared.CreditsTransaction, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/billing/credits_transactions", getApiHost())+func (a *Api) GetCreditsTransactions(pageSize, pageNum int) (*shared.CreditsLogResponse, *shared.ApiError) {+ serverUrl := fmt.Sprintf("%s/billing/credits_transactions?size=%d&page=%d", getApiHost(), pageSize, pageNum)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -2042,16 +2042,16 @@ func (a *Api) GetCreditsTransactions() ([]*shared.CreditsTransaction, *shared.ApapiErr := handleApiError(resp, errorBody)tokenRefreshed, apiErr := refreshTokenIfNeeded(apiErr)if tokenRefreshed {- return a.GetCreditsTransactions()+ return a.GetCreditsTransactions(pageSize, pageNum)}return nil, apiErr}- var transactions []*shared.CreditsTransaction- err = json.NewDecoder(resp.Body).Decode(&transactions)+ var res *shared.CreditsLogResponse+ err = json.NewDecoder(resp.Body).Decode(&res)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error decoding response: %v", err)}}- return transactions, nil+ return res, nil}diff --git a/app/cli/cmd/credits_log.go b/app/cli/cmd/credits_log.goindex 2e5c4a83..ff8ec0f9 100644--- a/app/cli/cmd/credits_log.go+++ b/app/cli/cmd/credits_log.go@@ -5,8 +5,11 @@ import ("plandex/api""plandex/auth""plandex/term"+ "strconv""strings"+ "unicode"+ "github.com/eiannone/keyboard""github.com/fatih/color""github.com/olekukonko/tablewriter""github.com/plandex/plandex/shared"@@ -14,6 +17,11 @@ import ("github.com/spf13/cobra")+const MaxCreditsLogPageSize = 500++var logCreditsPageSize int+var logCreditsPage int+var creditsLogCmd = &cobra.Command{Use: "log",Short: "Display the credits transactions log",@@ -21,15 +29,19 @@ var creditsLogCmd = &cobra.Command{}func init() {+ creditsLogCmd.Flags().IntVarP(&logCreditsPageSize, "page-size", "s", 20, "Number of transactions to display per page")+ creditsLogCmd.Flags().IntVarP(&logCreditsPage, "page", "p", 1, "Page number to display")+// subcommand of 'credits'creditsCmd.AddCommand(creditsLogCmd)+}func creditsLog(cmd *cobra.Command, args []string) {auth.MustResolveAuthWithOrg()term.StartSpinner("")- transactions, apiErr := api.Client.GetCreditsTransactions()+ res, apiErr := api.Client.GetCreditsTransactions(logCreditsPageSize, logCreditsPage)term.StopSpinner()if apiErr != nil {@@ -37,6 +49,8 @@ func creditsLog(cmd *cobra.Command, args []string) {return}+ transactions := res.Transactions+tableString := &strings.Builder{}table := tablewriter.NewWriter(tableString)table.SetAutoWrapText(false)@@ -113,5 +127,122 @@ func creditsLog(cmd *cobra.Command, args []string) {table.Render()- term.PageOutput(tableString.String())+ pageLine := fmt.Sprintf("Page size %d. Showing page %d of %d", logCreditsPageSize, logCreditsPage, res.NumPages)+ if res.NumPagesMax {+ pageLine += "+"+ }++ output := pageLine + "\n\n" + tableString.String()++ term.PageOutput(output)++ var inputFn func()+ inputFn = func() {++ fmt.Println("\n" + pageLine)++ prompts := []string{}++ if res.NumPages > 1 && logCreditsPage < res.NumPages {+ prompts = append(prompts, "Press 'n' for next page")+ }++ if logCreditsPage > 1 {+ prompts = append(prompts, "Press 'p' for previous page")+ }++ prompts = append(prompts, "Press any number to jump to a page")++ prompts = append(prompts, "Press 'q' to quit")++ color.New(term.ColorHiMagenta, color.Bold).Println(strings.Join(prompts, "\n"))+ color.New(term.ColorHiMagenta, color.Bold).Print("> ")++ char, _, err := term.GetUserKeyInput()++ if err != nil {+ term.OutputErrorAndExit("Failed to get user input: %v", err)+ }++ // Check if the input is a digit+ if unicode.IsDigit(char) {+ var numberInput strings.Builder+ numberInput.WriteRune(char)++ fmt.Print(string(char)) // Show the initial digit++ for {+ char, key, err := term.GetUserKeyInput()+ if err != nil {+ term.OutputErrorAndExit("Failed to get user input: %v", err)+ }++ // If Enter is pressed, commit the input+ if key == keyboard.KeyEnter {+ pageNumber, err := strconv.Atoi(numberInput.String())+ if err != nil {+ fmt.Println("Invalid page number.")+ return+ }++ // Check if the page number is valid+ if pageNumber >= 1 && (pageNumber <= res.NumPages || res.NumPagesMax) {+ logCreditsPage = pageNumber+ creditsLog(cmd, args) // Re-run the log command with the new page+ } else {+ fmt.Println()+ fmt.Println("Invalid page number.")+ inputFn()+ }+ return+ }++ // If another digit is pressed, add it to the input+ if unicode.IsDigit(char) {+ numberInput.WriteRune(char)+ fmt.Print(string(char)) // Show the digit+ } else {+ // Handle invalid input while typing a number+ fmt.Println()+ fmt.Println("\nInvalid input. Please enter a valid page number.")+ inputFn()+ return+ }+ }+ }++ // Handle non-digit hotkeys+ fmt.Print(string(char))+ switch char {+ case 'n':+ if logCreditsPage < res.NumPages || res.NumPagesMax {+ logCreditsPage+++ creditsLog(cmd, args)+ } else {+ fmt.Println()+ fmt.Println("Already on last page.")+ inputFn()+ }+ case 'p':+ if logCreditsPage > 1 {+ logCreditsPage--+ creditsLog(cmd, args)+ } else {+ fmt.Println()+ fmt.Println("Already on first page.")+ inputFn()+ }+ case 'q':+ fmt.Println()+ return+ default:+ fmt.Println()+ fmt.Println("Invalid input.")+ inputFn()+ }++ }++ inputFn()+}diff --git a/app/cli/term/prompt.go b/app/cli/term/prompt.goindex ba98b6d7..43675ee6 100644--- a/app/cli/term/prompt.go+++ b/app/cli/term/prompt.go@@ -48,27 +48,27 @@ func GetUserPasswordInput(msg string) (string, error) {return res, err}-func GetUserKeyInput() (rune, error) {+func GetUserKeyInput() (rune, keyboard.Key, error) {if err := keyboard.Open(); err != nil {- return 0, fmt.Errorf("failed to open keyboard: %s", err)+ return 0, 0, fmt.Errorf("failed to open keyboard: %s", err)}defer func() {_ = keyboard.Close()}()- char, _, err := keyboard.GetKey()+ char, key, err := keyboard.GetKey()if err != nil {- return 0, fmt.Errorf("failed to read keypress: %s", err)+ return 0, 0, fmt.Errorf("failed to read keypress: %s", err)}- return char, nil+ return char, key, nil}func ConfirmYesNo(fmtStr string, fmtArgs ...interface{}) (bool, error) {color.New(ColorHiMagenta, color.Bold).Printf(fmtStr+" (y)es | (n)o", fmtArgs...)color.New(ColorHiMagenta, color.Bold).Print("> ")- char, err := GetUserKeyInput()+ char, _, err := GetUserKeyInput()if err != nil {return false, fmt.Errorf("failed to get user input: %s", err)}@@ -89,7 +89,7 @@ func ConfirmYesNoCancel(fmtStr string, fmtArgs ...interface{}) (bool, bool, errocolor.New(ColorHiMagenta, color.Bold).Printf(fmtStr+" (y)es | (n)o | (c)ancel", fmtArgs...)color.New(ColorHiMagenta, color.Bold).Print("> ")- char, err := GetUserKeyInput()+ char, _, err := GetUserKeyInput()if err != nil {return false, false, fmt.Errorf("failed to get user input: %s", err)}diff --git a/app/cli/types/api.go b/app/cli/types/api.goindex e2f41811..070081a4 100644--- a/app/cli/types/api.go+++ b/app/cli/types/api.go@@ -97,5 +97,6 @@ type ApiClient interface {CreateModelPack(set *shared.ModelPack) *shared.ApiErrorListModelPacks() ([]*shared.ModelPack, *shared.ApiError)DeleteModelPack(setId string) *shared.ApiError- GetCreditsTransactions() ([]*shared.CreditsTransaction, *shared.ApiError)++ GetCreditsTransactions(pageSize, pageNum int) (*shared.CreditsLogResponse, *shared.ApiError)}diff --git a/app/shared/req_res.go b/app/shared/req_res.goindex f16a4756..f35e5a4b 100644--- a/app/shared/req_res.go+++ b/app/shared/req_res.go@@ -260,3 +260,14 @@ type StartTrialResponse struct {type TrialPaymentRequest struct {StripeToken string `json:"stripeToken"`}++type CreditsLogRequest struct {+ PageSize int `json:"pageSize"`+ Page int `json:"page"`+}++type CreditsLogResponse struct {+ Transactions []*CreditsTransaction `json:"transactions"`+ NumPages int `json:"numPages"`+ NumPagesMax bool `json:"numPagesMax"`+}