Merge branch 'main' into worktree-feat-project-dashboard-organization

Author: AdityaHegde

.github/workflows/cli-release.yml

@@ -58,7 +58,6 @@ jobs:
         env:
           RILL_UI_PUBLIC_INTAKE_USER: "data-modeler"
           RILL_UI_PUBLIC_INTAKE_PASSWORD: ${{ secrets.RILL_INTAKE_PASSWORD }}
-          RILL_UI_PUBLIC_POSTHOG_API_KEY: "phc_4qnfUotXUuevk2zJN8ei8HgKXMynddEMI0wPI9XwzlS"
           RILL_UI_PUBLIC_PYLON_APP_ID: "26a0fdd2-3bd3-41e2-82bc-1b35a444729f"
           NODE_OPTIONS: --max-old-space-size=4096
 

.github/workflows/rill-ui.yml

@@ -98,7 +98,6 @@ jobs:
           npm run build -w web-admin
         env:
           RILL_UI_PUBLIC_RILL_ADMIN_URL: https://admin.${{ env.DOMAIN }}
-          RILL_UI_PUBLIC_POSTHOG_API_KEY: "phc_4qnfUotXUuevk2zJN8ei8HgKXMynddEMI0wPI9XwzlS"
           RILL_UI_PUBLIC_PYLON_APP_ID: "26a0fdd2-3bd3-41e2-82bc-1b35a444729f"
           RILL_UI_PUBLIC_VERSION: ${{ env.RILL_VERSION }}
 

.gitignore

@@ -57,6 +57,7 @@ saved-state.json
 last-query-output.json
 staging-databases
 /rilldata
+/rill-examples/
 docs/dist/
 coverage
 # locally deployed test projects can generate this
@@ -98,6 +99,7 @@ latest.txt
 .claude/plans/
 .claude/worktrees/
 .claude/projects/
+.mcp.json
 
 # Vite temp files
 vite.config.ts.timestamp-*

.mcp.json

@@ -226,6 +226,26 @@ func (s *Service) IssueMagicAuthToken(ctx context.Context, opts *IssueMagicAuthT
 	return &magicAuthToken{model: dat, token: tkn}, nil
 }
 
+// ExtendBrowserSessionAuthToken extends a Rill web browser session token when its
+// remaining lifetime is at or below refreshThreshold.
+func (s *Service) ExtendBrowserSessionAuthToken(ctx context.Context, authTok AuthToken, fullTTL, refreshThreshold time.Duration) error {
+	uat, ok := authTok.TokenModel().(*database.UserAuthToken)
+	if !ok {
+		return nil
+	}
+	if uat.AuthClientID == nil || *uat.AuthClientID != database.AuthClientIDRillWeb {
+		return nil
+	}
+	if uat.RepresentingUserID != nil || uat.Refresh {
+		return nil
+	}
+	if uat.ExpiresOn != nil && time.Until(*uat.ExpiresOn) > refreshThreshold {
+		return nil
+	}
+	newExpiresOn := time.Now().Add(fullTTL)
+	return s.DB.UpdateUserAuthTokenExpiresOn(ctx, uat.ID, newExpiresOn)
+}
+
 // RevokeAuthToken removes an auth token from persistent storage.
 func (s *Service) RevokeAuthToken(ctx context.Context, token string) error {
 	parsed, err := authtoken.FromString(token)

admin/auth_token.go

@@ -61,6 +61,7 @@ func (s *Service) InitOrganizationBilling(ctx context.Context, org *database.Org
 		QuotaSlotsPerDeployment:             org.QuotaSlotsPerDeployment,
 		QuotaOutstandingInvites:             org.QuotaOutstandingInvites,
 		QuotaStorageLimitBytesPerDeployment: org.QuotaStorageLimitBytesPerDeployment,
+		QuotaSeats:                          org.QuotaSeats,
 		BillingCustomerID:                   org.BillingCustomerID,
 		PaymentCustomerID:                   org.PaymentCustomerID,
 		BillingEmail:                        org.BillingEmail,
@@ -169,6 +170,7 @@ func (s *Service) RepairOrganizationBilling(ctx context.Context, org *database.O
 		QuotaSlotsPerDeployment:             org.QuotaSlotsPerDeployment,
 		QuotaOutstandingInvites:             org.QuotaOutstandingInvites,
 		QuotaStorageLimitBytesPerDeployment: org.QuotaStorageLimitBytesPerDeployment,
+		QuotaSeats:                          org.QuotaSeats,
 		BillingCustomerID:                   org.BillingCustomerID,
 		PaymentCustomerID:                   org.PaymentCustomerID,
 		BillingEmail:                        org.BillingEmail,
@@ -233,6 +235,7 @@ func (s *Service) RepairOrganizationBilling(ctx context.Context, org *database.O
 			QuotaSlotsPerDeployment:             biggerOfInt(sub.Plan.Quotas.NumSlotsPerDeployment, org.QuotaSlotsPerDeployment),
 			QuotaOutstandingInvites:             biggerOfInt(sub.Plan.Quotas.NumOutstandingInvites, org.QuotaOutstandingInvites),
 			QuotaStorageLimitBytesPerDeployment: biggerOfInt64(sub.Plan.Quotas.StorageLimitBytesPerDeployment, org.QuotaStorageLimitBytesPerDeployment),
+			QuotaSeats:                          biggerOfInt(sub.Plan.Quotas.NumSeats, org.QuotaSeats),
 			BillingCustomerID:                   org.BillingCustomerID,
 			PaymentCustomerID:                   org.PaymentCustomerID,
 			BillingEmail:                        org.BillingEmail,
@@ -328,6 +331,7 @@ func (s *Service) StartCreditTrial(ctx context.Context, org *database.Organizati
 		QuotaSlotsPerDeployment:             biggerOfInt(plan.Quotas.NumSlotsPerDeployment, org.QuotaSlotsPerDeployment),
 		QuotaOutstandingInvites:             biggerOfInt(plan.Quotas.NumOutstandingInvites, org.QuotaOutstandingInvites),
 		QuotaStorageLimitBytesPerDeployment: biggerOfInt64(plan.Quotas.StorageLimitBytesPerDeployment, org.QuotaStorageLimitBytesPerDeployment),
+		QuotaSeats:                          biggerOfInt(plan.Quotas.NumSeats, org.QuotaSeats),
 		BillingCustomerID:                   org.BillingCustomerID,
 		PaymentCustomerID:                   org.PaymentCustomerID,
 		BillingEmail:                        org.BillingEmail,
@@ -432,6 +436,7 @@ func (s *Service) StartTrial(ctx context.Context, org *database.Organization) (*
 		QuotaSlotsPerDeployment:             biggerOfInt(plan.Quotas.NumSlotsPerDeployment, org.QuotaSlotsPerDeployment),
 		QuotaOutstandingInvites:             biggerOfInt(plan.Quotas.NumOutstandingInvites, org.QuotaOutstandingInvites),
 		QuotaStorageLimitBytesPerDeployment: biggerOfInt64(plan.Quotas.StorageLimitBytesPerDeployment, org.QuotaStorageLimitBytesPerDeployment),
+		QuotaSeats:                          biggerOfInt(plan.Quotas.NumSeats, org.QuotaSeats),
 		BillingCustomerID:                   org.BillingCustomerID,
 		PaymentCustomerID:                   org.PaymentCustomerID,
 		BillingEmail:                        org.BillingEmail,
@@ -502,7 +507,7 @@ func (s *Service) RaiseNewOrgBillingIssues(ctx context.Context, orgID string, cr
 		_, err := s.DB.UpsertBillingIssue(ctx, &database.UpsertBillingIssueOptions{
 			OrgID:     orgID,
 			Type:      database.BillingIssueTypeNeverSubscribed,
-			Metadata:  database.BillingIssueMetadataNeverSubscribed{},
+			Metadata:  &database.BillingIssueMetadataNeverSubscribed{},
 			EventTime: creationTime,
 		})
 		if err != nil {

admin/billing.go

@@ -13,6 +13,8 @@ import (
 const (
 	SupportEmail    = "support@rilldata.com"
 	DefaultTimeZone = "UTC"
+	// InternalEmailDomain is excluded from billable seat counts so internal Rill users don't count against an org's seats.
+	InternalEmailDomain = "rilldata.com"
 )
 
 // CreditsCurrency is the pricing-unit used for trial credit balance/alerts/grants. Its a non-monetary custom pricing unit, so trial usage never produces USD invoice line items.
@@ -107,6 +109,8 @@ const (
 	EnterprisePlanType
 	FreePlanType
 	ProPlanType
+	StarterPlanType
+	GrowthPlanType
 )
 
 type Plan struct {
@@ -129,6 +133,9 @@ type Quotas struct {
 	NumSlotsTotal                  *int
 	NumSlotsPerDeployment          *int
 	NumOutstandingInvites          *int
+	NumSeats                       *int
+	NumAPICallsPerSeat             *int
+	NumTokensPerSeat               *int
 }
 
 type planMetadata struct {
@@ -140,6 +147,9 @@ type planMetadata struct {
 	NumSlotsTotal                  *int   `mapstructure:"num_slots_total"`
 	NumSlotsPerDeployment          *int   `mapstructure:"num_slots_per_deployment"`
 	NumOutstandingInvites          *int   `mapstructure:"num_outstanding_invites"`
+	NumSeats                       *int   `mapstructure:"num_seats"`
+	NumAPICallsPerSeat             *int   `mapstructure:"num_api_calls_per_seat"`
+	NumTokensPerSeat               *int   `mapstructure:"num_tokens_per_seat"`
 }
 
 type Subscription struct {

admin/billing/biller.go

@@ -59,6 +59,9 @@ func (o *Orb) DefaultQuotas() Quotas {
 		NumSlotsTotal:                  toPtr(40),
 		NumSlotsPerDeployment:          toPtr(8),
 		NumOutstandingInvites:          toPtr(200),
+		NumSeats:                       toPtr(10),
+		NumAPICallsPerSeat:             toPtr(2500),
+		NumTokensPerSeat:               toPtr(1000000),
 	}
 }
 
@@ -715,6 +718,9 @@ func (o *Orb) getBillingPlanFromOrbPlan(ctx context.Context, p *orb.Plan) (*Plan
 		NumSlotsTotal:                  metadata.NumSlotsTotal,
 		NumSlotsPerDeployment:          metadata.NumSlotsPerDeployment,
 		NumOutstandingInvites:          metadata.NumOutstandingInvites,
+		NumSeats:                       metadata.NumSeats,
+		NumAPICallsPerSeat:             metadata.NumAPICallsPerSeat,
+		NumTokensPerSeat:               metadata.NumTokensPerSeat,
 	}
 
 	trialPeriodDays := 0
@@ -794,6 +800,10 @@ func getPlanType(externalID string) PlanType {
 		return FreePlanType
 	case "pro_plan":
 		return ProPlanType
+	case "starter":
+		return StarterPlanType
+	case "growth":
+		return GrowthPlanType
 	default:
 		return EnterprisePlanType
 	}
@@ -811,6 +821,10 @@ func getPlanDisplayName(externalID string) string {
 		return "Free"
 	case "pro_plan":
 		return "Pro"
+	case "starter":
+		return "Starter"
+	case "growth":
+		return "Growth"
 	default:
 		return "Enterprise"
 	}

admin/billing/orb.go

@@ -0,0 +1,37 @@
+package admin
+
+import (
+	"context"
+
+	"github.com/rilldata/rill/admin/database"
+	runtimev1 "github.com/rilldata/rill/proto/gen/rill/runtime/v1"
+	"github.com/rilldata/rill/runtime"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+// LookupCanvas fetches a canvas's spec from a runtime deployment.
+func (s *Service) LookupCanvas(ctx context.Context, depl *database.Deployment, canvasName string) (*runtimev1.CanvasSpec, error) {
+	rt, err := s.OpenRuntimeClient(depl)
+	if err != nil {
+		return nil, err
+	}
+	defer rt.Close()
+
+	res, err := rt.GetResource(ctx, &runtimev1.GetResourceRequest{
+		InstanceId: depl.RuntimeInstanceID,
+		Name: &runtimev1.ResourceName{
+			Kind: runtime.ResourceKindCanvas,
+			Name: canvasName,
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	canvasResource := res.Resource.Resource.(*runtimev1.Resource_Canvas)
+	if canvasResource != nil && canvasResource.Canvas != nil && canvasResource.Canvas.State != nil {
+		return nil, status.Error(codes.NotFound, "resource not found")
+	}
+	return res.Resource.Resource.(*runtimev1.Resource_Canvas).Canvas.State.ValidSpec, nil
+}

admin/canvases.go

@@ -164,6 +164,7 @@ type DB interface {
 	FindUserAuthToken(ctx context.Context, id string) (*UserAuthToken, error)
 	InsertUserAuthToken(ctx context.Context, opts *InsertUserAuthTokenOptions) (*UserAuthToken, error)
 	UpdateUserAuthTokenUsedOn(ctx context.Context, ids []string) error
+	UpdateUserAuthTokenExpiresOn(ctx context.Context, id string, expiresOn time.Time) error
 	DeleteUserAuthToken(ctx context.Context, id string) error
 	DeleteAllUserAuthTokens(ctx context.Context, userID string) (int, error)
 	DeleteUserAuthTokensByUserAndRepresentingUser(ctx context.Context, userID, representingUserID string) error
@@ -236,7 +237,7 @@ type DB interface {
 
 	FindOrganizationMemberUsers(ctx context.Context, orgID, filterRoleID string, withCounts bool, afterEmail string, limit int, searchPattern string) ([]*OrganizationMemberUser, error)
 	FindOrganizationMemberUser(ctx context.Context, orgID, userID string) (*OrganizationMemberUser, error)
-	CountOrganizationMemberUsers(ctx context.Context, orgID, filterRoleID string, searchPattern string) (int, error)
+	CountOrganizationMemberUsers(ctx context.Context, orgID, filterRoleID, searchPattern string, negateSearch bool) (int, error)
 	FindOrganizationMemberUsersByRole(ctx context.Context, orgID, roleID string) ([]*User, error)
 	FindOrganizationMemberUserAdminStatus(ctx context.Context, orgID, userID string) (isAdmin, isLastAdmin bool, err error)
 	InsertOrganizationMemberUser(ctx context.Context, orgID, userID, roleID string, attributes map[string]any, ifNotExists bool) (bool, error)
@@ -309,6 +310,8 @@ type DB interface {
 
 	FindVirtualFiles(ctx context.Context, projectID, environment string, afterUpdatedOn time.Time, afterPath string, limit int) ([]*VirtualFile, error)
 	FindVirtualFile(ctx context.Context, projectID, environment, path string) (*VirtualFile, error)
+	// FindVirtualFilesByOwner TODO: pagination
+	FindVirtualFilesByOwner(ctx context.Context, projectID, environment, ownerID string) ([]*VirtualFile, error)
 	UpsertVirtualFile(ctx context.Context, opts *InsertVirtualFileOptions) error
 	UpdateVirtualFileDeleted(ctx context.Context, projectID, environment, path string) error
 	DeleteExpiredVirtualFiles(ctx context.Context, retention time.Duration) error
@@ -392,6 +395,7 @@ type Organization struct {
 	QuotaSlotsPerDeployment             int       `db:"quota_slots_per_deployment"`
 	QuotaOutstandingInvites             int       `db:"quota_outstanding_invites"`
 	QuotaStorageLimitBytesPerDeployment int64     `db:"quota_storage_limit_bytes_per_deployment"`
+	QuotaSeats                          int       `db:"quota_seats"`
 	BillingCustomerID                   string    `db:"billing_customer_id"`
 	PaymentCustomerID                   string    `db:"payment_customer_id"`
 	BillingEmail                        string    `db:"billing_email"`
@@ -417,6 +421,7 @@ type InsertOrganizationOptions struct {
 	QuotaSlotsPerDeployment             int
 	QuotaOutstandingInvites             int
 	QuotaStorageLimitBytesPerDeployment int64
+	QuotaSeats                          int
 	BillingCustomerID                   string
 	PaymentCustomerID                   string
 	BillingEmail                        string
@@ -440,6 +445,7 @@ type UpdateOrganizationOptions struct {
 	QuotaSlotsPerDeployment             int
 	QuotaOutstandingInvites             int
 	QuotaStorageLimitBytesPerDeployment int64
+	QuotaSeats                          int
 	BillingCustomerID                   string
 	PaymentCustomerID                   string
 	BillingEmail                        string
@@ -1225,6 +1231,7 @@ type UpdateBookmarkOptions struct {
 type VirtualFile struct {
 	Path      string    `db:"path"`
 	Data      []byte    `db:"data"`
+	OwnerID   *string   `db:"owner_id"`
 	Deleted   bool      `db:"deleted"`
 	UpdatedOn time.Time `db:"updated_on"`
 }
@@ -1233,8 +1240,9 @@ type VirtualFile struct {
 type InsertVirtualFileOptions struct {
 	ProjectID   string
 	Environment string
-	Path        string `validate:"required"`
-	Data        []byte `validate:"max=131072"` // 128kb
+	Path        string  `validate:"required"`
+	OwnerID     *string `db:"owner_id"`
+	Data        []byte  `validate:"max=131072"` // 128kb
 }
 
 // Asset represents a user-uploaded file asset.
@@ -1315,6 +1323,7 @@ const (
 	BillingIssueTypeNeverSubscribed                        = 7
 	BillingIssueTypeOnCreditTrial                          = 8
 	BillingIssueTypeTrialCreditsDepleted                   = 9
+	BillingIssueTypeMessage                                = 10
 )
 
 type BillingIssueLevel int
@@ -1389,9 +1398,16 @@ type BillingIssueMetadataTrialCreditsDepleted struct {
 	DepletedOn time.Time `json:"depleted_on"`
 }
 
+type BillingIssueMetadataMessage struct {
+	Message string `json:"message"`
+}
+
 type UpsertBillingIssueOptions struct {
-	OrgID     string           `validate:"required"`
-	Type      BillingIssueType `validate:"required"`
+	OrgID string           `validate:"required"`
+	Type  BillingIssueType `validate:"required"`
+	// Level is optional; if unspecified, it is derived from Type. It is used for types whose
+	// severity is not implied by the type itself (e.g. BillingIssueTypeMessage).
+	Level     BillingIssueLevel `exhaustruct:"optional"`
 	Metadata  BillingIssueMetadata
 	EventTime time.Time `validate:"required"`
 }