Skip to content

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

lots of work on credits integration, api keys for integrated models mode, and hooks for cloud/credits

Dane Schneider4aa8707d635b
diff --git a/app/cmd/credits.go b/app/cmd/credits.go
deleted file mode 100644
index cd7a0421..00000000
--- a/app/cmd/credits.go
+++ /dev/null
@@ -1,44 +0,0 @@
-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()
-
- org, apiErr := api.Client.GetOrgSession()
- 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
- balanceStr := fmt.Sprintf("$%.4f", balance)
-
- table := tablewriter.NewWriter(os.Stdout)
- table.SetHeader([]string{"Current Credit Balance"})
- table.Append([]string{balanceStr})
- table.Render()
-}
diff --git a/app/server/db/org_helpers.go b/app/server/db/org_helpers.go
index 185c0672..6a451ce8 100644
--- a/app/server/db/org_helpers.go
+++ b/app/server/db/org_helpers.go
@@ -19,20 +19,20 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
var orgs []*Org
err := Conn.Select(&orgUsers, "SELECT * FROM orgs_users WHERE user_id = $1", user.Id)
-
if err != nil {
return nil, fmt.Errorf("error getting orgs for user: %v", err)
}
+ orgRoleIdByOrgId := map[string]string{}
orgIds := []string{}
for _, ou := range orgUsers {
orgIds = append(orgIds, ou.OrgId)
+ orgRoleIdByOrgId[ou.OrgId] = ou.OrgRoleId
}
if len(orgIds) > 0 {
query := fmt.Sprintf("SELECT %s FROM orgs WHERE id = ANY($1)", orgFields)
err = Conn.Select(&orgs, query, pq.Array(orgIds))
-
if err != nil {
return nil, fmt.Errorf("error getting orgs for user: %v", err)
}
@@ -43,7 +43,6 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
// access via invitation
invites, err := GetPendingInvitesForEmail(user.Email)
-
if err != nil {
return nil, fmt.Errorf("error getting invites for user: %v", err)
}
@@ -51,10 +50,9 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
orgIds = []string{}
for _, invite := range invites {
orgIds = append(orgIds, invite.OrgId)
+ orgRoleIdByOrgId[invite.OrgId] = invite.OrgRoleId
}
- // log.Println(spew.Sdump(orgIds))
-
if len(orgIds) > 0 {
var orgsFromInvites []*Org
query := fmt.Sprintf("SELECT %s FROM orgs WHERE id = ANY($1)", orgFields)
@@ -67,7 +65,6 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
return orgs, nil
}
-
func GetOrg(orgId string) (*Org, error) {
var org Org
query := fmt.Sprintf("SELECT %s FROM orgs WHERE id = $1", orgFields)
diff --git a/app/server/go.mod b/app/server/go.mod
index 09339ccd..f4a1fcc3 100644
--- a/app/server/go.mod
+++ b/app/server/go.mod
@@ -25,6 +25,7 @@ require (
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pkoukk/tiktoken-go v0.1.7 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
+ github.com/shopspring/decimal v1.4.0 // indirect
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/image v0.19.0 // indirect
diff --git a/app/server/go.sum b/app/server/go.sum
index 4a8993ba..8a6d1e5f 100644
--- a/app/server/go.sum
+++ b/app/server/go.sum
@@ -89,6 +89,8 @@ github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/sashabaranov/go-openai v1.28.1 h1:aREx6faUTeOZNMDTNGAY8B9vNmmN7qoGvDV0Ke2J1Mc=
github.com/sashabaranov/go-openai v1.28.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/smacker/go-tree-sitter v0.0.0-20240625050157-a31a98a7c0f6 h1:mtD4ESyObQZnRVxHFcaYp2d7jMBDa4WJRXSB1Vszj+A=
github.com/smacker/go-tree-sitter v0.0.0-20240625050157-a31a98a7c0f6/go.mod h1:q99oHDsbP0xRwmn7Vmob8gbSMNyvJ83OauXPSuHQuKE=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
diff --git a/app/server/handlers/accounts.go b/app/server/handlers/accounts.go
index 2f533ad1..ce1066cc 100644
--- a/app/server/handlers/accounts.go
+++ b/app/server/handlers/accounts.go
@@ -72,12 +72,12 @@ func CreateAccountHandler(w http.ResponseWriter, r *http.Request) {
token := res.Token
orgId := res.OrgId
- apiErr := hooks.ExecHook(hooks.CreateAccount, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.CreateAccount, hooks.HookParams{
User: user,
OrgId: orgId,
})
if apiErr != nil {
- WriteApiError(w, *apiErr)
+ writeApiError(w, *apiErr)
return
}
@@ -98,9 +98,12 @@ func CreateAccountHandler(w http.ResponseWriter, r *http.Request) {
return
}
- var apiOrgs []*shared.Org
- for _, org := range orgs {
- apiOrgs = append(apiOrgs, org.ToApi())
+ apiOrgs, apiErr := toApiOrgs(orgs)
+
+ if apiErr != nil {
+ log.Printf("Error converting orgs to API orgs: %v\n", apiErr)
+ writeApiError(w, *apiErr)
+ return
}
resp := shared.SessionResponse{
diff --git a/app/server/handlers/auth_helpers.go b/app/server/handlers/auth_helpers.go
index 99b8a8b2..8f1fc45d 100644
--- a/app/server/handlers/auth_helpers.go
+++ b/app/server/handlers/auth_helpers.go
@@ -57,7 +57,7 @@ func Authenticate(w http.ResponseWriter, r *http.Request, requireOrg bool) *type
if err != nil {
log.Printf("error validating auth token: %v\n", err)
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeInvalidToken,
Status: http.StatusUnauthorized,
Msg: "Invalid auth token",
@@ -133,9 +133,9 @@ func Authenticate(w http.ResponseWriter, r *http.Request, requireOrg bool) *type
}
// build the permissions map
- permissionsMap := make(map[types.Permission]bool)
+ permissionsMap := make(shared.Permissions)
for _, permission := range permissions {
- permissionsMap[types.Permission(permission)] = true
+ permissionsMap[permission] = true
}
log.Printf("UserId: %s, Email: %s, OrgId: %s\n", authToken.UserId, user.Email, parsed.OrgId)
@@ -178,7 +178,7 @@ func authorizeProjectRename(w http.ResponseWriter, projectId string, auth *types
return false
}
- if !auth.HasPermission(types.PermissionRenameAnyProject) {
+ if !auth.HasPermission(shared.PermissionRenameAnyProject) {
log.Println("User does not have permission to rename project")
http.Error(w, "User does not have permission to rename project", http.StatusForbidden)
return false
@@ -192,7 +192,7 @@ func authorizeProjectDelete(w http.ResponseWriter, projectId string, auth *types
return false
}
- if !auth.HasPermission(types.PermissionDeleteAnyProject) {
+ if !auth.HasPermission(shared.PermissionDeleteAnyProject) {
log.Println("User does not have permission to delete project")
http.Error(w, "User does not have permission to delete project", http.StatusForbidden)
return false
@@ -228,7 +228,7 @@ func authorizePlanUpdate(w http.ResponseWriter, planId string, auth *types.Serve
return nil
}
- if plan.OwnerId != auth.User.Id && !auth.HasPermission(types.PermissionUpdateAnyPlan) {
+ if plan.OwnerId != auth.User.Id && !auth.HasPermission(shared.PermissionUpdateAnyPlan) {
log.Println("User does not have permission to update plan")
http.Error(w, "User does not have permission to update plan", http.StatusForbidden)
return nil
@@ -244,7 +244,7 @@ func authorizePlanDelete(w http.ResponseWriter, planId string, auth *types.Serve
return nil
}
- if plan.OwnerId != auth.User.Id && !auth.HasPermission(types.PermissionDeleteAnyPlan) {
+ if plan.OwnerId != auth.User.Id && !auth.HasPermission(shared.PermissionDeleteAnyPlan) {
log.Println("User does not have permission to delete plan")
http.Error(w, "User does not have permission to delete plan", http.StatusForbidden)
return nil
@@ -260,7 +260,7 @@ func authorizePlanRename(w http.ResponseWriter, planId string, auth *types.Serve
return nil
}
- if plan.OwnerId != auth.User.Id && !auth.HasPermission(types.PermissionRenameAnyPlan) {
+ if plan.OwnerId != auth.User.Id && !auth.HasPermission(shared.PermissionRenameAnyPlan) {
log.Println("User does not have permission to rename plan")
http.Error(w, "User does not have permission to rename plan", http.StatusForbidden)
return nil
@@ -276,7 +276,7 @@ func authorizePlanArchive(w http.ResponseWriter, planId string, auth *types.Serv
return nil
}
- if plan.OwnerId != auth.User.Id && !auth.HasPermission(types.PermissionArchiveAnyPlan) {
+ if plan.OwnerId != auth.User.Id && !auth.HasPermission(shared.PermissionArchiveAnyPlan) {
log.Println("User does not have permission to archive plan")
http.Error(w, "User does not have permission to archive plan", http.StatusForbidden)
return nil
diff --git a/app/server/handlers/client_helper.go b/app/server/handlers/client_helper.go
index 7441f3ae..02f3d586 100644
--- a/app/server/handlers/client_helper.go
+++ b/app/server/handlers/client_helper.go
@@ -4,13 +4,16 @@ import (
"log"
"net/http"
"plandex-server/db"
+ "plandex-server/hooks"
"plandex-server/model"
+ "plandex-server/types"
"github.com/sashabaranov/go-openai"
)
type initClientsParams struct {
w http.ResponseWriter
+ auth *types.ServerAuth
apiKey string
apiKeys map[string]string
endpoint string
@@ -23,15 +26,34 @@ func initClients(params initClientsParams) map[string]*openai.Client {
w := params.w
apiKey := params.apiKey
apiKeys := params.apiKeys
- openAIOrgId := params.openAIOrgId
plan := params.plan
-
- endpoint := params.openAIBase
- if endpoint == "" {
- endpoint = params.endpoint
+ var openAIOrgId string
+ var endpoint string
+
+ hookResult, apiErr := hooks.ExecHook(hooks.GetIntegratedModels, hooks.HookParams{
+ User: params.auth.User,
+ OrgId: params.auth.OrgId,
+ Plan: params.plan,
+ })
+
+ if apiErr != nil {
+ log.Printf("Error getting integrated models: %v\n", apiErr)
+ http.Error(w, "Error getting integrated models", http.StatusInternalServerError)
+ return nil
}
- if apiKeys == nil {
- apiKeys = map[string]string{"OPENAI_API_KEY": apiKey}
+
+ if hookResult.GetIntegratedModelsResult != nil && hookResult.GetIntegratedModelsResult.IntegratedModelsMode {
+ apiKeys = hookResult.GetIntegratedModelsResult.ApiKeys
+ } else {
+ if apiKeys == nil {
+ apiKeys = map[string]string{"OPENAI_API_KEY": apiKey}
+ }
+
+ openAIOrgId = params.openAIOrgId
+ endpoint = params.openAIBase
+ if endpoint == "" {
+ endpoint = params.endpoint
+ }
}
planSettings, err := db.GetPlanSettings(plan, true)
@@ -84,6 +106,12 @@ func initClients(params initClientsParams) map[string]*openai.Client {
}
}
+ if len(apiKeys) == 0 {
+ log.Println("API key is required")
+ http.Error(w, "API key is required", http.StatusBadRequest)
+ return nil
+ }
+
clients := model.InitClients(apiKeys, endpointsByApiKeyEnvVar, endpoint, openAIOrgId)
return clients
diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.go
index d9d69241..13ea1f4c 100644
--- a/app/server/handlers/context_helper.go
+++ b/app/server/handlers/context_helper.go
@@ -32,6 +32,7 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth
clients := initClients(
initClientsParams{
w: w,
+ auth: auth,
apiKeys: context.ApiKeys,
openAIBase: context.OpenAIBase,
openAIOrgId: context.OpenAIOrgId,
diff --git a/app/server/handlers/err_helper.go b/app/server/handlers/err_helper.go
index 8f8b18d8..276b6157 100644
--- a/app/server/handlers/err_helper.go
+++ b/app/server/handlers/err_helper.go
@@ -8,7 +8,7 @@ import (
"github.com/plandex/plandex/shared"
)
-func WriteApiError(w http.ResponseWriter, apiErr shared.ApiError) {
+func writeApiError(w http.ResponseWriter, apiErr shared.ApiError) {
bytes, err := json.Marshal(apiErr)
if err != nil {
log.Printf("Error marshalling response: %v\n", err)
diff --git a/app/server/handlers/invites.go b/app/server/handlers/invites.go
index 0ebec2df..487f2f03 100644
--- a/app/server/handlers/invites.go
+++ b/app/server/handlers/invites.go
@@ -6,7 +6,6 @@ import (
"net/http"
"plandex-server/db"
"plandex-server/email"
- "plandex-server/types"
"strings"
"github.com/gorilla/mux"
@@ -21,7 +20,7 @@ func InviteUserHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't invite other users",
@@ -42,7 +41,7 @@ func InviteUserHandler(w http.ResponseWriter, r *http.Request) {
req.Email = strings.ToLower(req.Email)
// ensure current user can invite target user
- permission := types.Permission(strings.Join([]string{string(types.PermissionInviteUser), req.OrgRoleId}, "|"))
+ permission := shared.Permission(strings.Join([]string{string(shared.PermissionInviteUser), req.OrgRoleId}, "|"))
if !auth.HasPermission(permission) {
log.Printf("User does not have permission to invite user with role: %v\n", req.OrgRoleId)
@@ -171,7 +170,7 @@ func ListPendingInvitesHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't list invites",
@@ -212,7 +211,7 @@ func ListAcceptedInvitesHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't list invites",
@@ -253,7 +252,7 @@ func ListAllInvitesHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't list invites",
@@ -294,7 +293,7 @@ func DeleteInviteHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't delete invites",
@@ -320,9 +319,9 @@ func DeleteInviteHandler(w http.ResponseWriter, r *http.Request) {
}
// ensure current user can remove target invite
- removePermission := types.Permission(strings.Join([]string{string(types.PermissionRemoveUser), invite.OrgRoleId}, "|"))
+ removePermission := shared.Permission(strings.Join([]string{string(shared.PermissionRemoveUser), invite.OrgRoleId}, "|"))
- invitePermission := types.Permission(strings.Join([]string{string(types.PermissionInviteUser), invite.OrgRoleId}, "|"))
+ invitePermission := shared.Permission(strings.Join([]string{string(shared.PermissionInviteUser), invite.OrgRoleId}, "|"))
if !(auth.HasPermission(removePermission) ||
(auth.User.Id == invite.InviterId && auth.HasPermission(invitePermission))) {
diff --git a/app/server/handlers/org_helpers.go b/app/server/handlers/org_helpers.go
new file mode 100644
index 00000000..e7849a4e
--- /dev/null
+++ b/app/server/handlers/org_helpers.go
@@ -0,0 +1,63 @@
+package handlers
+
+import (
+ "log"
+ "plandex-server/db"
+ "plandex-server/hooks"
+
+ "github.com/plandex/plandex/shared"
+)
+
+func toApiOrgs(orgs []*db.Org) ([]*shared.Org, *shared.ApiError) {
+ var orgIds []string
+ for _, org := range orgs {
+ orgIds = append(orgIds, org.Id)
+ }
+
+ hookRes, apiErr := hooks.ExecHook(hooks.GetApiOrgs, hooks.HookParams{
+ GetApiOrgIds: orgIds,
+ })
+
+ if apiErr != nil {
+ log.Printf("Error getting integrated models mode by org id: %v\n", apiErr)
+ return nil, apiErr
+ }
+
+ var apiOrgs []*shared.Org
+ for _, org := range orgs {
+ if hookRes.ApiOrgsById != nil {
+ hookApiOrg := hookRes.ApiOrgsById[org.Id]
+ apiOrgs = append(apiOrgs, hookApiOrg)
+ } else {
+ apiOrgs = append(apiOrgs, org.ToApi())
+ }
+ }
+
+ return apiOrgs, nil
+}
+
+func getApiOrg(orgId string) (*shared.Org, *shared.ApiError) {
+ org, err := db.GetOrg(orgId)
+ if err != nil {
+ log.Printf("Error getting org: %v\n", err)
+ return nil, &shared.ApiError{
+ Type: shared.ApiErrorTypeOther,
+ Msg: "Error getting org",
+ }
+ }
+
+ hookRes, apiErr := hooks.ExecHook(hooks.GetApiOrgs, hooks.HookParams{
+ GetApiOrgIds: []string{org.Id},
+ })
+
+ if apiErr != nil {
+ log.Printf("Error getting integrated models mode by org id: %v\n", apiErr)
+ return nil, apiErr
+ }
+
+ if hookRes.ApiOrgsById != nil {
+ return hookRes.ApiOrgsById[org.Id], nil
+ }
+
+ return org.ToApi(), nil
+}
diff --git a/app/server/handlers/orgs.go b/app/server/handlers/orgs.go
index 6bba3515..d7b4cd02 100644
--- a/app/server/handlers/orgs.go
+++ b/app/server/handlers/orgs.go
@@ -6,7 +6,6 @@ import (
"log"
"net/http"
"plandex-server/db"
- "plandex-server/types"
"github.com/plandex/plandex/shared"
)
@@ -27,9 +26,12 @@ func ListOrgsHandler(w http.ResponseWriter, r *http.Request) {
return
}
- var apiOrgs []*shared.Org
- for _, org := range orgs {
- apiOrgs = append(apiOrgs, org.ToApi())
+ apiOrgs, apiErr := toApiOrgs(orgs)
+
+ if apiErr != nil {
+ log.Printf("Error converting orgs to api: %v\n", apiErr)
+ writeApiError(w, *apiErr)
+ return
}
bytes, err := json.Marshal(apiOrgs)
@@ -54,7 +56,7 @@ func CreateOrgHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't create org",
@@ -161,6 +163,24 @@ func GetOrgSessionHandler(w http.ResponseWriter, r *http.Request) {
return
}
+ org, apiErr := getApiOrg(auth.OrgId)
+
+ if apiErr != nil {
+ log.Printf("Error converting org to api: %v\n", apiErr)
+ writeApiError(w, *apiErr)
+ return
+ }
+
+ bytes, err := json.Marshal(org)
+
+ if err != nil {
+ log.Printf("Error marshalling response: %v\n", err)
+ http.Error(w, "Error marshalling response: "+err.Error(), http.StatusInternalServerError)
+ return
+ }
+
+ w.Write(bytes)
+
log.Println("Successfully got org session")
}
@@ -173,7 +193,7 @@ func ListOrgRolesHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't list org roles",
@@ -181,7 +201,7 @@ func ListOrgRolesHandler(w http.ResponseWriter, r *http.Request) {
return
}
- if !auth.HasPermission(types.PermissionListOrgRoles) {
+ if !auth.HasPermission(shared.PermissionListOrgRoles) {
log.Println("User cannot list org roles")
http.Error(w, "User cannot list org roles", http.StatusForbidden)
return
diff --git a/app/server/handlers/plans_changes.go b/app/server/handlers/plans_changes.go
index bbc65362..bf8e0f83 100644
--- a/app/server/handlers/plans_changes.go
+++ b/app/server/handlers/plans_changes.go
@@ -132,6 +132,7 @@ func ApplyPlanHandler(w http.ResponseWriter, r *http.Request) {
clients := initClients(
initClientsParams{
w: w,
+ auth: auth,
apiKeys: requestBody.ApiKeys,
openAIBase: requestBody.OpenAIBase,
openAIOrgId: requestBody.OpenAIOrgId,
diff --git a/app/server/handlers/plans_crud.go b/app/server/handlers/plans_crud.go
index 1c9c30f3..ff2cddba 100644
--- a/app/server/handlers/plans_crud.go
+++ b/app/server/handlers/plans_crud.go
@@ -8,7 +8,6 @@ import (
"net/http"
"plandex-server/db"
"plandex-server/hooks"
- "plandex-server/types"
"sort"
"strings"
"time"
@@ -25,7 +24,7 @@ func CreatePlanHandler(w http.ResponseWriter, r *http.Request) {
return
}
- if !auth.HasPermission(types.PermissionCreatePlan) {
+ if !auth.HasPermission(shared.PermissionCreatePlan) {
log.Println("User does not have permission to create a plan")
http.Error(w, "User does not have permission to create a plan", http.StatusForbidden)
return
@@ -40,9 +39,9 @@ func CreatePlanHandler(w http.ResponseWriter, r *http.Request) {
return
}
- apiErr := hooks.ExecHook(hooks.WillCreatePlan, hooks.HookParams{User: auth.User})
+ _, apiErr := hooks.ExecHook(hooks.WillCreatePlan, hooks.HookParams{User: auth.User})
if apiErr != nil {
- WriteApiError(w, *apiErr)
+ writeApiError(w, *apiErr)
return
}
diff --git a/app/server/handlers/plans_exec.go b/app/server/handlers/plans_exec.go
index bf4c97cd..57443fcc 100644
--- a/app/server/handlers/plans_exec.go
+++ b/app/server/handlers/plans_exec.go
@@ -56,24 +56,19 @@ func TellPlanHandler(w http.ResponseWriter, r *http.Request) {
return
}
- if requestBody.ApiKey == "" && len(requestBody.ApiKeys) == 0 {
- log.Println("API key is required")
- http.Error(w, "API key is required", http.StatusBadRequest)
- return
- }
-
- apiErr := hooks.ExecHook(hooks.WillTellPlan, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillTellPlan, hooks.HookParams{
User: auth.User,
Plan: plan,
})
if apiErr != nil {
- WriteApiError(w, *apiErr)
+ writeApiError(w, *apiErr)
return
}
clients := initClients(
initClientsParams{
w: w,
+ auth: auth,
apiKey: requestBody.ApiKey,
apiKeys: requestBody.ApiKeys,
endpoint: requestBody.Endpoint,
@@ -132,15 +127,10 @@ func BuildPlanHandler(w http.ResponseWriter, r *http.Request) {
return
}
- if requestBody.ApiKey == "" && len(requestBody.ApiKeys) == 0 {
- log.Println("API key is required")
- http.Error(w, "API key is required", http.StatusBadRequest)
- return
- }
-
clients := initClients(
initClientsParams{
w: w,
+ auth: auth,
apiKey: requestBody.ApiKey,
apiKeys: requestBody.ApiKeys,
endpoint: requestBody.Endpoint,
@@ -371,7 +361,7 @@ func authorizePlanExecUpdate(w http.ResponseWriter, planId string, auth *types.S
return nil
}
- if plan.OwnerId != auth.User.Id && !auth.HasPermission(types.PermissionUpdateAnyPlan) {
+ if plan.OwnerId != auth.User.Id && !auth.HasPermission(shared.PermissionUpdateAnyPlan) {
log.Println("User does not have permission to update plan")
http.Error(w, "User does not have permission to update plan", http.StatusForbidden)
return nil
diff --git a/app/server/handlers/sessions.go b/app/server/handlers/sessions.go
index e7c261b4..0a063ee6 100644
--- a/app/server/handlers/sessions.go
+++ b/app/server/handlers/sessions.go
@@ -233,9 +233,12 @@ func SignInHandler(w http.ResponseWriter, r *http.Request) {
return
}
- var apiOrgs []*shared.Org
- for _, org := range orgs {
- apiOrgs = append(apiOrgs, org.ToApi())
+ apiOrgs, apiErr := toApiOrgs(orgs)
+
+ if apiErr != nil {
+ log.Printf("Error converting orgs to api orgs: %v\n", apiErr)
+ writeApiError(w, *apiErr)
+ return
}
resp := shared.SessionResponse{
diff --git a/app/server/handlers/users.go b/app/server/handlers/users.go
index 3fb75896..1180ee7a 100644
--- a/app/server/handlers/users.go
+++ b/app/server/handlers/users.go
@@ -5,7 +5,6 @@ import (
"log"
"net/http"
"plandex-server/db"
- "plandex-server/types"
"strings"
"github.com/gorilla/mux"
@@ -20,7 +19,7 @@ func ListUsersHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't list users",
@@ -78,7 +77,7 @@ func DeleteOrgUserHandler(w http.ResponseWriter, r *http.Request) {
}
if auth.User.IsTrial {
- WriteApiError(w, shared.ApiError{
+ writeApiError(w, shared.ApiError{
Type: shared.ApiErrorTypeTrialActionNotAllowed,
Status: http.StatusForbidden,
Msg: "Anonymous trial user can't delete users",
@@ -100,7 +99,7 @@ func DeleteOrgUserHandler(w http.ResponseWriter, r *http.Request) {
}
// ensure current user can remove target user
- removePermission := types.Permission(strings.Join([]string{string(types.PermissionRemoveUser), orgUser.OrgRoleId}, "|"))
+ removePermission := shared.Permission(strings.Join([]string{string(shared.PermissionRemoveUser), orgUser.OrgRoleId}, "|"))
if !auth.HasPermission(removePermission) {
log.Printf("User does not have permission to remove user with role: %v\n", orgUser.OrgRoleId)
diff --git a/app/server/hooks/hooks.go b/app/server/hooks/hooks.go
index fac1fb62..94cbbef1 100644
--- a/app/server/hooks/hooks.go
+++ b/app/server/hooks/hooks.go
@@ -3,6 +3,7 @@ package hooks
import (
"plandex-server/db"
+ "github.com/jmoiron/sqlx"
"github.com/plandex/plandex/shared"
)
@@ -13,6 +14,8 @@ const (
WillExecPlan = "will_exec_plan"
WillSendModelRequest = "will_send_model_request"
DidSendModelRequest = "did_send_model_request"
+ GetIntegratedModels = "get_integrated_models"
+ GetApiOrgs = "get_api_orgs"
)
type WillSendModelRequestParams struct {
@@ -35,12 +38,24 @@ type HookParams struct {
User *db.User
OrgId string
Plan *db.Plan
+ Tx *sqlx.Tx
WillSendModelRequestParams *WillSendModelRequestParams
DidSendModelRequestParams *DidSendModelRequestParams
+ GetApiOrgIds []string
}
-type Hook func(params HookParams) *shared.ApiError
+type GetIntegratedModelsResult struct {
+ IntegratedModelsMode bool
+ ApiKeys map[string]string
+}
+
+type HookResult struct {
+ GetIntegratedModelsResult *GetIntegratedModelsResult
+ ApiOrgsById map[string]*shared.Org
+}
+
+type Hook func(params HookParams) (HookResult, *shared.ApiError)
var hooks = make(map[string]Hook)
@@ -48,10 +63,10 @@ func RegisterHook(name string, hook Hook) {
hooks[name] = hook
}
-func ExecHook(name string, params HookParams) *shared.ApiError {
+func ExecHook(name string, params HookParams) (HookResult, *shared.ApiError) {
hook, ok := hooks[name]
if !ok {
- return nil
+ return HookResult{}, nil
}
return hook(params)
}
diff --git a/app/server/model/name.go b/app/server/model/name.go
index 5a23d874..bf333db6 100644
--- a/app/server/model/name.go
+++ b/app/server/model/name.go
@@ -45,7 +45,7 @@ func GenPlanName(
responseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}
}
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -114,7 +114,7 @@ func GenPlanName(
}
}
- apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -177,7 +177,7 @@ func GenPipedDataName(
responseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}
}
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -254,7 +254,7 @@ func GenPipedDataName(
}
}
- apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -321,7 +321,7 @@ func GenNoteName(
responseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}
}
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -398,7 +398,7 @@ func GenNoteName(
}
}
- apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
diff --git a/app/server/model/plan/build_exec.go b/app/server/model/plan/build_exec.go
index dd0c2f93..a7c0345c 100644
--- a/app/server/model/plan/build_exec.go
+++ b/app/server/model/plan/build_exec.go
@@ -322,7 +322,7 @@ func (fileState *activeBuildStreamFileState) buildFileLineNums() {
fileState.inputTokens = inputTokens
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
diff --git a/app/server/model/plan/build_fix.go b/app/server/model/plan/build_fix.go
index 63d12e26..f73005d4 100644
--- a/app/server/model/plan/build_fix.go
+++ b/app/server/model/plan/build_fix.go
@@ -75,7 +75,7 @@ func (fileState *activeBuildStreamFileState) fixFileLineNums() {
fileState.inputTokens = inputTokens
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
diff --git a/app/server/model/plan/build_fix_stream.go b/app/server/model/plan/build_fix_stream.go
index 20f88620..7ada737d 100644
--- a/app/server/model/plan/build_fix_stream.go
+++ b/app/server/model/plan/build_fix_stream.go
@@ -39,7 +39,7 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *open
streamFinished := false
execHookOnStop := func(sendStreamErr bool) {
- apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
@@ -116,7 +116,7 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *open
log.Println("Fix stream usage:")
spew.Dump(response.Usage)
- apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
diff --git a/app/server/model/plan/build_stream_line_nums.go b/app/server/model/plan/build_stream_line_nums.go
index fb9c10f4..69c9bad6 100644
--- a/app/server/model/plan/build_stream_line_nums.go
+++ b/app/server/model/plan/build_stream_line_nums.go
@@ -39,7 +39,7 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(str
streamFinished := false
execHookOnStop := func(sendStreamErr bool) {
- apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
@@ -117,7 +117,7 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(str
log.Println("Build stream usage:")
spew.Dump(response.Usage)
- apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
diff --git a/app/server/model/plan/build_verify.go b/app/server/model/plan/build_verify.go
index f6d3c006..bdf9ce69 100644
--- a/app/server/model/plan/build_verify.go
+++ b/app/server/model/plan/build_verify.go
@@ -95,7 +95,7 @@ func (fileState *activeBuildStreamFileState) verifyFileBuild() {
fileState.inputTokens = inputTokens
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
diff --git a/app/server/model/plan/build_verify_stream.go b/app/server/model/plan/build_verify_stream.go
index 29604f22..90c5c730 100644
--- a/app/server/model/plan/build_verify_stream.go
+++ b/app/server/model/plan/build_verify_stream.go
@@ -38,7 +38,7 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *op
streamFinished := false
execHookOnStop := func(sendStreamErr bool) {
- err := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
@@ -53,8 +53,8 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *op
},
})
- if err != nil {
- log.Printf("Error executing did send model request hook after cancel or error: %v\n", err)
+ if apiErr != nil {
+ log.Printf("Error executing did send model request hook after cancel or error: %v\n", apiErr)
if sendStreamErr {
activePlan := GetActivePlan(planId, branch)
@@ -64,7 +64,7 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *op
return
}
- activePlan.StreamDoneCh <- err
+ activePlan.StreamDoneCh <- apiErr
}
}
@@ -116,7 +116,7 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *op
log.Println("Fix stream usage:")
spew.Dump(response.Usage)
- apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: fileState.plan,
diff --git a/app/server/model/plan/commit_msg.go b/app/server/model/plan/commit_msg.go
index 3d762270..a2cc874d 100644
--- a/app/server/model/plan/commit_msg.go
+++ b/app/server/model/plan/commit_msg.go
@@ -38,7 +38,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescri
numTokens := prompts.ExtraTokensPerRequest + (prompts.ExtraTokensPerMessage * 2) + prompts.SysDescribeNumTokens + activePlan.NumTokens
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -116,7 +116,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescri
}
}
- apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -181,7 +181,7 @@ func GenCommitMsgForPendingResults(auth *types.ServerAuth, plan *db.Plan, client
numTokens := prompts.ExtraTokensPerRequest + (prompts.ExtraTokensPerMessage * 2) + prompts.SysPendingResultsNumTokens + contentTokens
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -243,7 +243,7 @@ func GenCommitMsgForPendingResults(auth *types.ServerAuth, plan *db.Plan, client
}
}
- apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
diff --git a/app/server/model/plan/exec_status.go b/app/server/model/plan/exec_status.go
index 122dd752..acd179e6 100644
--- a/app/server/model/plan/exec_status.go
+++ b/app/server/model/plan/exec_status.go
@@ -83,7 +83,7 @@ func (state *activeTellStreamState) execStatusShouldContinue(message string, lat
numTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + contentTokens
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -182,7 +182,7 @@ func (state *activeTellStreamState) execStatusShouldContinue(message string, lat
}
}
- apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
diff --git a/app/server/model/plan/tell_exec.go b/app/server/model/plan/tell_exec.go
index 5452d326..d8beb6be 100644
--- a/app/server/model/plan/tell_exec.go
+++ b/app/server/model/plan/tell_exec.go
@@ -68,7 +68,7 @@ func execTellPlan(
}
if missingFileResponse == "" {
- apiErr := hooks.ExecHook(hooks.WillExecPlan, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillExecPlan, hooks.HookParams{
User: auth.User,
Plan: plan,
})
@@ -413,7 +413,7 @@ func execTellPlan(
// log.Printf("%s: %s\n", message.Role, message.Content)
// }
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
diff --git a/app/server/model/plan/tell_stream.go b/app/server/model/plan/tell_stream.go
index bd3a0bb3..98addee6 100644
--- a/app/server/model/plan/tell_stream.go
+++ b/app/server/model/plan/tell_stream.go
@@ -59,7 +59,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
streamFinished := false
execHookOnStop := func(sendStreamErr bool) {
- err := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
@@ -74,8 +74,8 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
},
})
- if err != nil {
- log.Printf("Error executing did send model request hook after cancel or error: %v\n", err)
+ if apiErr != nil {
+ log.Printf("Error executing did send model request hook after cancel or error: %v\n", apiErr)
if sendStreamErr {
activePlan := GetActivePlan(planId, branch)
@@ -85,7 +85,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
return
}
- activePlan.StreamDoneCh <- err
+ activePlan.StreamDoneCh <- apiErr
}
}
}
@@ -138,7 +138,7 @@ mainLoop:
log.Println("Tell stream usage:")
spew.Dump(response.Usage)
- apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: auth.User,
OrgId: auth.OrgId,
Plan: plan,
diff --git a/app/server/model/summarize.go b/app/server/model/summarize.go
index 31dc952e..bdd8d61e 100644
--- a/app/server/model/summarize.go
+++ b/app/server/model/summarize.go
@@ -48,7 +48,7 @@ func PlanSummary(client *openai.Client, config shared.ModelRoleConfig, params Pl
numTokens += prompts.PlanSummaryNumTokens
- apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
+ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{
User: params.User,
OrgId: params.OrgId,
Plan: params.Plan,
@@ -102,7 +102,7 @@ func PlanSummary(client *openai.Client, config shared.ModelRoleConfig, params Pl
}
}
- apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
+ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{
User: params.User,
OrgId: params.OrgId,
Plan: params.Plan,
diff --git a/app/server/types/auth.go b/app/server/types/auth.go
index 9fea36d9..07340e7d 100644
--- a/app/server/types/auth.go
+++ b/app/server/types/auth.go
@@ -1,49 +1,22 @@
package types
import (
- "log"
"plandex-server/db"
+
+ "github.com/plandex/plandex/shared"
)
type ServerAuth struct {
AuthToken *db.AuthToken
User *db.User
OrgId string
- Permissions map[Permission]bool
+ Permissions shared.Permissions
}
-func (a *ServerAuth) HasPermission(permission Permission) bool {
- if a.Permissions == nil {
- return false
- }
-
- log.Println("checking permission", permission)
- // log.Println("permissions", spew.Sdump(a.Permissions))
-
- _, res := a.Permissions[permission]
-
- log.Println("has permission:", res)
-
- return res
+func (a *ServerAuth) HasPermission(permission shared.Permission) bool {
+ return a.Permissions.HasPermission(permission)
}
-type Permission string
-
-const (
- PermissionDeleteOrg Permission = "delete_org"
- PermissionManageEmailDomainAuth Permission = "manage_email_domain_auth"
- PermissionManageBilling Permission = "manage_billing"
- PermissionInviteUser Permission = "invite_user"
- PermissionRemoveUser Permission = "remove_user"
- PermissionSetUserRole Permission = "set_user_role"
- PermissionListOrgRoles Permission = "list_org_roles"
- PermissionCreateProject Permission = "create_project"
- PermissionRenameAnyProject Permission = "rename_any_project"
- PermissionDeleteAnyProject Permission = "delete_any_project"
- PermissionCreatePlan Permission = "create_plan"
- PermissionManageAnyPlanShares Permission = "manage_any_plan_shares"
- PermissionRenameAnyPlan Permission = "rename_any_plan"
- PermissionDeleteAnyPlan Permission = "delete_any_plan"
- PermissionUpdateAnyPlan Permission = "update_any_plan"
- PermissionArchiveAnyPlan Permission = "archive_any_plan"
-)
+func (a *ServerAuth) HasPermissionForResource(permission shared.Permission, resourceId string) bool {
+ return a.Permissions.HasPermissionForResource(permission, resourceId)
+}
diff --git a/app/shared/ai_models.go b/app/shared/ai_models.go
index 6a6a946f..d922ff81 100644
--- a/app/shared/ai_models.go
+++ b/app/shared/ai_models.go
@@ -30,6 +30,7 @@ var AvailableModels = []*AvailableModel{
Description: "OpenAI's gpt-4o model, pinned to version released on 2024-08-06",
DefaultMaxConvoTokens: 10000,
DefaultReservedOutputTokens: 16384,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenAI,
ModelName: "gpt-4o-2024-08-06",
@@ -43,6 +44,7 @@ var AvailableModels = []*AvailableModel{
Description: "OpenAI's gpt-4o model, pinned to version released on 2024-05-13",
DefaultMaxConvoTokens: 10000,
DefaultReservedOutputTokens: 4096,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenAI,
ModelName: "gpt-4o-2024-05-13",
@@ -53,9 +55,10 @@ var AvailableModels = []*AvailableModel{
},
},
{
- Description: "OpenAI's latest gpt-4-turbo model",
+ Description: "OpenAI's latest gpt-4-o model",
DefaultMaxConvoTokens: 10000,
DefaultReservedOutputTokens: 4096,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenAI,
ModelName: openai.GPT4o,
@@ -69,6 +72,7 @@ var AvailableModels = []*AvailableModel{
Description: "OpenAI's latest gpt-4-turbo model",
DefaultMaxConvoTokens: 10000,
DefaultReservedOutputTokens: 4096,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenAI,
ModelName: openai.GPT4Turbo,
@@ -82,6 +86,7 @@ var AvailableModels = []*AvailableModel{
Description: "OpenAI's gpt-4o-mini model, pinned to version released on 2024-07-18",
DefaultMaxConvoTokens: 10000,
DefaultReservedOutputTokens: 16384,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenAI,
ModelName: "gpt-4o-mini-2024-07-18",
@@ -95,6 +100,7 @@ var AvailableModels = []*AvailableModel{
Description: "OpenAI's latest gpt-4o-mini model",
DefaultMaxConvoTokens: 10000,
DefaultReservedOutputTokens: 16384,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenAI,
ModelName: "gpt-4o-mini",
@@ -108,6 +114,7 @@ var AvailableModels = []*AvailableModel{
Description: "OpenAI's latest gpt-3.5-turbo model",
DefaultMaxConvoTokens: 5000,
DefaultReservedOutputTokens: 2000,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenAI,
ModelName: openai.GPT3Dot5Turbo,
@@ -121,6 +128,7 @@ var AvailableModels = []*AvailableModel{
Description: "Anthropic Claude 3.5 Sonnet via OpenRouter",
DefaultMaxConvoTokens: 15000,
DefaultReservedOutputTokens: 4096,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenRouter,
ModelName: "anthropic/claude-3.5-sonnet",
@@ -179,6 +187,7 @@ var AvailableModels = []*AvailableModel{
Description: "Anthropic Claude 3 Haiku via OpenRouter",
DefaultMaxConvoTokens: 15000,
DefaultReservedOutputTokens: 4096,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenRouter,
ModelName: "anthropic/claude-3-haiku",
@@ -252,9 +261,10 @@ var AvailableModels = []*AvailableModel{
},
},
{
- Description: "Google Gemini Pro 1.5 preview via OpenRouter",
+ Description: "Google Gemini Pro 1.5 via OpenRouter",
DefaultMaxConvoTokens: 100000,
DefaultReservedOutputTokens: 22937,
+ CloudCreditsEnabled: true,
BaseModelConfig: BaseModelConfig{
Provider: ModelProviderOpenRouter,
ModelName: "google/gemini-pro-1.5",
diff --git a/app/shared/data_models.go b/app/shared/data_models.go
index 04929614..36340b0d 100644
--- a/app/shared/data_models.go
+++ b/app/shared/data_models.go
@@ -7,6 +7,7 @@ import (
"time"
"github.com/sashabaranov/go-openai"
+ "github.com/shopspring/decimal"
)
type Org struct {
@@ -14,7 +15,8 @@ type Org struct {
Name string `json:"name"`
// optional cloud attributes
- IntegratedModelsMode bool `json:"integratedModelsMode,omitempty"`
+ IntegratedModelsMode bool `json:"integratedModelsMode,omitempty"`
+ CloudBillingFields *CloudBillingFields `json:"cloudBillingFields,omitempty"`
}
type User struct {
@@ -352,3 +354,15 @@ func (p *PlanSettings) Scan(src interface{}) error {
func (p PlanSettings) Value() (driver.Value, error) {
return json.Marshal(p)
}
+
+type CloudBillingFields struct {
+ CreditsBalance decimal.Decimal `json:"creditsBalance"`
+ MonthlyGrant decimal.Decimal `json:"monthlyGrant"`
+ AutoRebuyEnabled bool `json:"autoRebuyEnabled"`
+ AutoRebuyMinThreshold decimal.Decimal `json:"autoRebuyMinThreshold"`
+ AutoRebuyToBalance decimal.Decimal `json:"autoRebuyToBalance"`
+ NotifyThreshold decimal.Decimal `json:"notifyThreshold"`
+ MaxThresholdPerMonth decimal.Decimal `json:"maxThresholdPerMonth"`
+ BillingCycleStartedAt time.Time `json:"billingCycleStartedAt"`
+ TrialPaid bool `json:"trialPaid"`
+}
diff --git a/app/shared/go.mod b/app/shared/go.mod
index 489cd7e4..c4384fb6 100644
--- a/app/shared/go.mod
+++ b/app/shared/go.mod
@@ -17,5 +17,6 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/olekukonko/tablewriter v0.0.5
github.com/sashabaranov/go-openai v1.24.0
+ github.com/shopspring/decimal v1.4.0
golang.org/x/image v0.17.0
)
diff --git a/app/shared/go.sum b/app/shared/go.sum
index c2391d8d..245cde6d 100644
--- a/app/shared/go.sum
+++ b/app/shared/go.sum
@@ -28,6 +28,8 @@ github.com/sashabaranov/go-openai v1.21.0 h1:isAf3zPSD3VLd0pC2/2Q6ZyRK7jzPAaz+X3
github.com/sashabaranov/go-openai v1.21.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
github.com/sashabaranov/go-openai v1.24.0 h1:4H4Pg8Bl2RH/YSnU8DYumZbuHnnkfioor/dtNlB20D4=
github.com/sashabaranov/go-openai v1.24.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
golang.org/x/image v0.17.0 h1:nTRVVdajgB8zCMZVsViyzhnMKPwYeroEERRC64JuLco=
diff --git a/app/shared/plan_result_replacements.go b/app/shared/plan_result_replacements.go
index 207b4c9e..5bf3a3d1 100644
--- a/app/shared/plan_result_replacements.go
+++ b/app/shared/plan_result_replacements.go
@@ -15,9 +15,9 @@ func ApplyReplacements(content string, replacements []*Replacement, setFailed bo
lastInsertedIdx := 0
for i, replacement := range replacements {
- // log.Println("replacement.Old:\n", replacement.Old)
- // log.Println("updated:\n", updated)
- // log.Println("lastInsertedIdx:", lastInsertedIdx)
+ log.Println("replacement.Old:\n", replacement.Old)
+ log.Println("updated:\n", updated)
+ log.Println("lastInsertedIdx:", lastInsertedIdx)
pre := updated[:lastInsertedIdx]
sub := updated[lastInsertedIdx:]
@@ -165,6 +165,9 @@ func (planState *CurrentPlanState) GetFilesBeforeReplacement(
updated = context.Body
shas[path] = context.Sha
+
+ log.Println("setting updated content to context body. updated:")
+ log.Println(updated)
}
replacements := []*Replacement{}
@@ -191,6 +194,9 @@ func (planState *CurrentPlanState) GetFilesBeforeReplacement(
maybeWithLineNums = AddLineNums(updated)
}
+ log.Println("Before replacements. updated:")
+ log.Println(updated)
+
updated, allSucceeded = ApplyReplacements(maybeWithLineNums, replacements, false)
updated = RemoveLineNums(updated)
diff --git a/app/shared/rbac.go b/app/shared/rbac.go
new file mode 100644
index 00000000..80f6e181
--- /dev/null
+++ b/app/shared/rbac.go
@@ -0,0 +1,53 @@
+package shared
+
+import (
+ "strings"
+)
+
+type Permission string
+
+const (
+ PermissionDeleteOrg Permission = "delete_org"
+ PermissionManageEmailDomainAuth Permission = "manage_email_domain_auth"
+ PermissionManageBilling Permission = "manage_billing"
+ PermissionInviteUser Permission = "invite_user"
+ PermissionRemoveUser Permission = "remove_user"
+ PermissionSetUserRole Permission = "set_user_role"
+ PermissionListOrgRoles Permission = "list_org_roles"
+ PermissionCreateProject Permission = "create_project"
+ PermissionRenameAnyProject Permission = "rename_any_project"
+ PermissionDeleteAnyProject Permission = "delete_any_project"
+ PermissionCreatePlan Permission = "create_plan"
+ PermissionManageAnyPlanShares Permission = "manage_any_plan_shares"
+ PermissionRenameAnyPlan Permission = "rename_any_plan"
+ PermissionDeleteAnyPlan Permission = "delete_any_plan"
+ PermissionUpdateAnyPlan Permission = "update_any_plan"
+ PermissionArchiveAnyPlan Permission = "archive_any_plan"
+)
+
+type Permissions map[string]bool
+
+func (perms Permissions) HasPermission(permission Permission) bool {
+ for p := range perms {
+ split := strings.Split(p, "|")
+ perm := Permission(split[0])
+
+ if perm == permission {
+ return true
+ }
+ }
+ return false
+}
+
+func (perms Permissions) HasPermissionForResource(permission Permission, resourceId string) bool {
+ for p := range perms {
+ split := strings.Split(p, "|")
+ perm := Permission(split[0])
+ resId := split[1]
+
+ if perm == permission && resId == resourceId {
+ return true
+ }
+ }
+ return false
+}