Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

cli auth/trial update for payments/credits

Dane Schneider4f4ffe894997
diff --git a/app/cli/api/methods.go b/app/cli/api/methods.go
index f2fbd684..532717af 100644
--- a/app/cli/api/methods.go
+++ b/app/cli/api/methods.go
@@ -1304,21 +1304,33 @@ func (a *Api) CreateOrg(req shared.CreateOrgRequest) (*shared.CreateOrgResponse,
return &createOrgResponse, nil
}
-func (a *Api) GetOrgSession() *shared.ApiError {
+func (a *Api) GetOrgSession() (*shared.Org, *shared.ApiError) {
serverUrl := getApiHost() + "/orgs/session"
resp, err := authenticatedFastClient.Get(serverUrl)
if err != nil {
- return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}
+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}
}
defer resp.Body.Close()
if resp.StatusCode >= 400 {
errorBody, _ := io.ReadAll(resp.Body)
apiErr := handleApiError(resp, errorBody)
- return apiErr
+ tokenRefreshed, apiErr := refreshTokenIfNeeded(apiErr)
+ if tokenRefreshed {
+ return a.GetOrgSession()
+ }
+ return nil, apiErr
}
- return nil
+ var org *shared.Org
+
+ err = json.NewDecoder(resp.Body).Decode(&org)
+
+ if err != nil {
+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error decoding response: %v", err)}
+ }
+
+ return org, nil
}
func (a *Api) ListOrgs() ([]*shared.Org, *shared.ApiError) {
diff --git a/app/cli/auth/account.go b/app/cli/auth/account.go
index b4038b2c..de8a9576 100644
--- a/app/cli/auth/account.go
+++ b/app/cli/auth/account.go
@@ -103,23 +103,24 @@ func SelectOrSignInOrCreate() error {
return fmt.Errorf("error listing orgs: %v", apiErr.Msg)
}
- orgId, orgName, err := resolveOrgAuth(orgs)
+ org, err := resolveOrgAuth(orgs)
if err != nil {
return fmt.Errorf("error resolving org: %v", err)
}
err = setAuth(&types.ClientAuth{
- ClientAccount: *selected,
- OrgId: orgId,
- OrgName: orgName,
+ ClientAccount: *selected,
+ OrgId: org.Id,
+ OrgName: org.Name,
+ IntegratedModelsMode: org.IntegratedModelsMode,
})
if err != nil {
return fmt.Errorf("error setting auth: %v", err)
}
- apiErr = apiClient.GetOrgSession()
+ _, apiErr = apiClient.GetOrgSession()
if apiErr != nil {
return fmt.Errorf("error getting org session: %v", apiErr.Msg)
@@ -240,14 +241,15 @@ func signIn(email, pin, host string) error {
return fmt.Errorf("error setting auth: %v", err)
}
- orgId, orgName, err := resolveOrgAuth(res.Orgs)
+ org, err := resolveOrgAuth(res.Orgs)
if err != nil {
return fmt.Errorf("error resolving org: %v", err)
}
- Current.OrgId = orgId
- Current.OrgName = orgName
+ Current.OrgId = org.Id
+ Current.OrgName = org.Name
+ Current.IntegratedModelsMode = org.IntegratedModelsMode
err = writeCurrentAuth()
@@ -297,14 +299,15 @@ func createAccount(email, pin, host string) error {
return fmt.Errorf("error setting auth: %v", err)
}
- orgId, orgName, err := resolveOrgAuth(res.Orgs)
+ org, err := resolveOrgAuth(res.Orgs)
if err != nil {
return fmt.Errorf("error resolving org: %v", err)
}
- Current.OrgId = orgId
- Current.OrgName = orgName
+ Current.OrgId = org.Id
+ Current.OrgName = org.Name
+ Current.IntegratedModelsMode = org.IntegratedModelsMode
err = writeCurrentAuth()
diff --git a/app/cli/auth/auth.go b/app/cli/auth/auth.go
index 178d004b..28e2aad8 100644
--- a/app/cli/auth/auth.go
+++ b/app/cli/auth/auth.go
@@ -52,19 +52,20 @@ func MustResolveAuth(requireOrg bool) {
term.OutputErrorAndExit("Error listing orgs: %v", apiErr.Msg)
}
- orgId, orgName, err := resolveOrgAuth(orgs)
+ org, err := resolveOrgAuth(orgs)
if err != nil {
term.OutputErrorAndExit("Error resolving org: %v", err)
}
- if orgId == "" {
+ if org.Id == "" {
// still no org--exit now
term.OutputErrorAndExit("No org")
}
- Current.OrgId = orgId
- Current.OrgName = orgName
+ Current.OrgId = org.Id
+ Current.OrgName = org.Name
+ Current.IntegratedModelsMode = org.IntegratedModelsMode
err = writeCurrentAuth()
diff --git a/app/cli/auth/org.go b/app/cli/auth/org.go
index b58a19c2..8f6c0aee 100644
--- a/app/cli/auth/org.go
+++ b/app/cli/auth/org.go
@@ -8,7 +8,7 @@ import (
"github.com/plandex/plandex/shared"
)
-func resolveOrgAuth(orgs []*shared.Org) (string, string, error) {
+func resolveOrgAuth(orgs []*shared.Org) (*shared.Org, error) {
var org *shared.Org
var err error
@@ -16,7 +16,7 @@ func resolveOrgAuth(orgs []*shared.Org) (string, string, error) {
org, err = promptNoOrgs()
if err != nil {
- return "", "", fmt.Errorf("error prompting no orgs: %v", err)
+ return nil, fmt.Errorf("error prompting no orgs: %v", err)
}
} else if len(orgs) == 1 {
@@ -25,21 +25,11 @@ func resolveOrgAuth(orgs []*shared.Org) (string, string, error) {
org, err = selectOrg(orgs)
if err != nil {
- return "", "", fmt.Errorf("error selecting org: %v", err)
+ return nil, fmt.Errorf("error selecting org: %v", err)
}
}
- var (
- orgId string
- orgName string
- )
-
- if org != nil {
- orgId = org.Id
- orgName = org.Name
- }
-
- return orgId, orgName, nil
+ return org, nil
}
func promptNoOrgs() (*shared.Org, error) {
diff --git a/app/cli/auth/trial.go b/app/cli/auth/trial.go
index 7da1ee2d..0ec63981 100644
--- a/app/cli/auth/trial.go
+++ b/app/cli/auth/trial.go
@@ -67,8 +67,9 @@ func ConvertTrial() error {
IsCloud: true,
IsTrial: false,
},
- OrgId: res.Orgs[0].Id,
- OrgName: res.Orgs[0].Id,
+ OrgId: res.Orgs[0].Id,
+ OrgName: res.Orgs[0].Id,
+ IntegratedModelsMode: res.Orgs[0].IntegratedModelsMode,
})
if err != nil {
diff --git a/app/cli/cmd/build.go b/app/cli/cmd/build.go
index 2f61c8fa..01084e7c 100644
--- a/app/cli/cmd/build.go
+++ b/app/cli/cmd/build.go
@@ -35,7 +35,10 @@ func build(cmd *cobra.Command, args []string) {
term.OutputNoCurrentPlanErrorAndExit()
}
- apiKeys := lib.MustVerifyApiKeys()
+ var apiKeys map[string]string
+ if !auth.Current.IntegratedModelsMode {
+ apiKeys = lib.MustVerifyApiKeys()
+ }
didBuild, err := plan_exec.Build(plan_exec.ExecParams{
CurrentPlanId: lib.CurrentPlanId,
diff --git a/app/cli/cmd/changes.go b/app/cli/cmd/changes.go
index 53e7f60e..0b2f4787 100644
--- a/app/cli/cmd/changes.go
+++ b/app/cli/cmd/changes.go
@@ -75,7 +75,10 @@ func changes(cmd *cobra.Command, args []string) {
if !viewIncomplete {
fmt.Println("This plan has unbuilt changes. Building now.")
- apiKeys := lib.MustVerifyApiKeys()
+ var apiKeys map[string]string
+ if !auth.Current.IntegratedModelsMode {
+ apiKeys = lib.MustVerifyApiKeys()
+ }
didBuild, err := plan_exec.Build(plan_exec.ExecParams{
CurrentPlanId: lib.CurrentPlanId,
diff --git a/app/cli/cmd/continue.go b/app/cli/cmd/continue.go
index 11b15b38..2da9e487 100644
--- a/app/cli/cmd/continue.go
+++ b/app/cli/cmd/continue.go
@@ -33,7 +33,10 @@ func doContinue(cmd *cobra.Command, args []string) {
term.OutputNoCurrentPlanErrorAndExit()
}
- apiKeys := lib.MustVerifyApiKeys()
+ var apiKeys map[string]string
+ if !auth.Current.IntegratedModelsMode {
+ apiKeys = lib.MustVerifyApiKeys()
+ }
plan_exec.TellPlan(plan_exec.ExecParams{
CurrentPlanId: lib.CurrentPlanId,
diff --git a/app/cli/cmd/credits.go b/app/cli/cmd/credits.go
new file mode 100644
index 00000000..3707d36d
--- /dev/null
+++ b/app/cli/cmd/credits.go
@@ -0,0 +1,49 @@
+package cmd
+
+import (
+ "fmt"
+ "os"
+ "plandex/api"
+ "plandex/auth"
+ "plandex/term"
+
+ "github.com/olekukonko/tablewriter"
+ "github.com/spf13/cobra"
+)
+
+var creditsCmd = &cobra.Command{
+ Use: "credits",
+ Short: "Display the current credit balance if using integrated models mode",
+ Run: credits,
+}
+
+func init() {
+ RootCmd.AddCommand(creditsCmd)
+}
+
+func credits(cmd *cobra.Command, args []string) {
+ auth.MustResolveAuthWithOrg()
+
+ term.StartSpinner("")
+ org, apiErr := api.Client.GetOrgSession()
+ term.StopSpinner()
+
+ if apiErr != nil {
+ term.OutputErrorAndExit("Error getting org session: %v", apiErr)
+ return
+ }
+
+ if !org.IntegratedModelsMode {
+ fmt.Println("The org isn't using integrated models mode.")
+ return
+ }
+
+ balance := org.CloudBillingFields.CreditsBalance
+ balanceFloat, _ := balance.Float64()
+ balanceStr := fmt.Sprintf("$%.4f", balanceFloat)
+
+ table := tablewriter.NewWriter(os.Stdout)
+ table.SetHeader([]string{"Credits Balance"})
+ table.Append([]string{balanceStr})
+ table.Render()
+}
diff --git a/app/cli/cmd/tell.go b/app/cli/cmd/tell.go
index 7714faa9..c36bb055 100644
--- a/app/cli/cmd/tell.go
+++ b/app/cli/cmd/tell.go
@@ -51,7 +51,10 @@ func doTell(cmd *cobra.Command, args []string) {
term.OutputNoCurrentPlanErrorAndExit()
}
- apiKeys := lib.MustVerifyApiKeys()
+ var apiKeys map[string]string
+ if !auth.Current.IntegratedModelsMode {
+ apiKeys = lib.MustVerifyApiKeys()
+ }
var prompt string
diff --git a/app/cli/go.mod b/app/cli/go.mod
index d952705f..914fd671 100644
--- a/app/cli/go.mod
+++ b/app/cli/go.mod
@@ -37,6 +37,7 @@ require (
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
+ github.com/shopspring/decimal v1.4.0 // indirect
github.com/yuin/goldmark v1.6.0 // indirect
github.com/yuin/goldmark-emoji v1.0.2 // indirect
golang.org/x/net v0.18.0 // indirect
diff --git a/app/cli/go.sum b/app/cli/go.sum
index 49cf4258..0cb8a28d 100644
--- a/app/cli/go.sum
+++ b/app/cli/go.sum
@@ -644,6 +644,8 @@ github.com/sashabaranov/go-openai v1.24.0 h1:4H4Pg8Bl2RH/YSnU8DYumZbuHnnkfioor/d
github.com/sashabaranov/go-openai v1.24.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
diff --git a/app/cli/main.go b/app/cli/main.go
index 71a59422..19dd5f5f 100644
--- a/app/cli/main.go
+++ b/app/cli/main.go
@@ -19,7 +19,10 @@ func init() {
// inter-package dependency injections to avoid circular imports
auth.SetApiClient(api.Client)
lib.SetBuildPlanInlineFn(func(maybeContexts []*shared.Context) (bool, error) {
- apiKeys := lib.MustVerifyApiKeys()
+ var apiKeys map[string]string
+ if !auth.Current.IntegratedModelsMode {
+ apiKeys = lib.MustVerifyApiKeys()
+ }
return plan_exec.Build(plan_exec.ExecParams{
CurrentPlanId: lib.CurrentPlanId,
CurrentBranch: lib.CurrentBranch,
diff --git a/app/cli/types/api.go b/app/cli/types/api.go
index 47bd4e29..f69368ee 100644
--- a/app/cli/types/api.go
+++ b/app/cli/types/api.go
@@ -21,7 +21,7 @@ type ApiClient interface {
SignIn(req shared.SignInRequest, customHost string) (*shared.SessionResponse, *shared.ApiError)
SignOut() *shared.ApiError
- GetOrgSession() *shared.ApiError
+ GetOrgSession() (*shared.Org, *shared.ApiError)
ListOrgs() ([]*shared.Org, *shared.ApiError)
CreateOrg(req shared.CreateOrgRequest) (*shared.CreateOrgResponse, *shared.ApiError)