Billing #2667

pablonyx · 2024-10-03T00:25:46Z

JWT-based authentication:
- Uses SECRET_JWT_KEY for encrypting user/tenant context
- Employs JWT_ALGORITHM (HS256) for token signing
Inter-service communication security:
- DATA_PLANE_SECRET secures control plane and data plane communication
- Short-lived tokens generated with specific scopes and expiration times
API access control:
- EXPECTED_API_KEY required in headers for control plane API access
- Dependency checks for valid API key and JWT in request headers
Stripe integration for secure billing:
- Stripe API key used for subscription management
- Tenant IDs stored in Stripe metadata for correlation

vercel · 2024-10-03T00:25:50Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
internal-search	❌ Failed (Inspect)			Oct 12, 2024 6:38pm

greptile-apps

PR Summary

This PR introduces comprehensive billing functionality and multi-tenant support to the DAnswer system, integrating Stripe for payment processing and enhancing user management capabilities.

Implemented Stripe integration for subscription management in backend/ee/danswer/server/tenants/api.py and web/src/app/ee/admin/cloud-settings/BillingInformationPage.tsx
Added new Cloud Settings admin page in web/src/app/ee/admin/cloud-settings/page.tsx for managing billing information
Modified PostgreSQL port from 5432 to 5433 in Docker Compose files and backend/danswer/configs/app_configs.py
Enhanced multi-tenant support with new functions in backend/danswer/auth/users.py and backend/danswer/server/manage/users.py
Hardcoded CLOUD_ENABLED to true in web/src/lib/constants.ts, potentially affecting cloud-related features

_{22 file(s) reviewed, 9 comment(s)}
_{Edit PR Review Bot Settings}

backend/ee/danswer/server/tenants/api.py

backend/ee/danswer/server/tenants/models.py

backend/ee/danswer/server/tenants/utils.py

web/src/app/ee/admin/cloud-settings/BillingInformationPage.tsx

web/src/app/ee/admin/cloud-settings/page.tsx

web/src/app/ee/admin/cloud-settings/utils.ts

web/src/lib/constants.ts

yuhongsun96

If it works :P

yuhongsun96 · 2024-10-11T23:27:26Z

backend/Dockerfile.cloud

+FROM python:3.11.7-slim-bookworm
+
+LABEL com.danswer.maintainer="founders@danswer.ai"
+LABEL com.danswer.description="This image is the web/frontend container of Danswer which \


A lot of the comments and things are not correct. I would say this just should not be used by the community.

let's remove this one

yuhongsun96 · 2024-10-11T23:38:13Z

backend/danswer/server/auth_check.py

 from danswer.auth.users import current_admin_user
 from danswer.auth.users import current_curator_or_admin_user
 from danswer.auth.users import current_user
 from danswer.auth.users import current_user_with_expired_token
 from danswer.configs.app_configs import APP_API_PREFIX
 from danswer.server.danswer_api.ingestion import api_key_dep
+from ee.danswer.server.tenants.access import control_plane_dep


We should not import ee modules from the MIT stuff. It confuses the separation between the versions.

There are other places this is done but we should address those.

yuhongsun96 · 2024-10-11T23:40:37Z

backend/danswer/server/manage/users.py

@@ -60,6 +63,7 @@
 from ee.danswer.db.api_key import is_api_key_email_address
 from ee.danswer.db.external_perm import delete_user__ext_group_for_user__no_commit
 from ee.danswer.db.user_group import remove_curator_status__no_commit
+from ee.danswer.server.tenants.billing import register_tenant_users


same here and around this line, it should not import from ee

yuhongsun96 · 2024-10-11T23:44:52Z

backend/ee/danswer/server/tenants/api.py

+    They will be directed to the billing page.
+    We gate the product when
+    1) User has ended free trial without adding payment method
+    2) User's card has declined


We can let them use it and give a warning if the card declined. Hubspot does this and I appreciated that and paid them :P

backend/ee/danswer/server/tenants/api.py

yuhongsun96 · 2024-10-11T23:50:33Z

deployment/docker_compose/docker-compose.prod-cloud.yml

@@ -0,0 +1,243 @@
+services:


Why do we need this?

let's remove this

* k * data -> control * nit * nit: error handling * auth + app * nit: color standardization * nit * nit: typing * k * k * feat: functional upgrading * feat: add block for downgrading to seats < active users * add auth * remove accomplished todo + prints * nit * tiny nit * nit: centralize security * add tenant expulsion/gating + invite user -> increment billing seat no. * add cloud configs * k * k * nit: update

* add vespa multi tenancy * k * formatting * Billing (#2667) * k * data -> control * nit * nit: error handling * auth + app * nit: color standardization * nit * nit: typing * k * k * feat: functional upgrading * feat: add block for downgrading to seats < active users * add auth * remove accomplished todo + prints * nit * tiny nit * nit: centralize security * add tenant expulsion/gating + invite user -> increment billing seat no. * add cloud configs * k * k * nit: update * k * k * k * k * nit

vercel bot deployed to Preview October 3, 2024 01:58 View deployment

vercel bot deployed to Preview October 3, 2024 02:11 View deployment

vercel bot deployed to Preview October 3, 2024 02:44 View deployment

vercel bot deployed to Preview October 3, 2024 20:32 View deployment

vercel bot deployed to Preview October 3, 2024 22:09 View deployment

vercel bot had a problem deploying to Preview October 3, 2024 22:42 Failure

pablonyx force-pushed the vespa_multi branch from a57e25b to 1fad25e Compare October 3, 2024 23:48

pablonyx force-pushed the billing_multi branch from 2ba73ed to 45b1ff7 Compare October 3, 2024 23:51

vercel bot had a problem deploying to Preview October 3, 2024 23:52 Failure

vercel bot had a problem deploying to Preview October 3, 2024 23:58 Failure

pablonyx force-pushed the billing_multi branch from 009a27b to c35251b Compare October 4, 2024 01:08

vercel bot had a problem deploying to Preview October 4, 2024 02:32 Failure

vercel bot had a problem deploying to Preview October 4, 2024 16:30 Failure

vercel bot had a problem deploying to Preview October 5, 2024 01:55 Failure

vercel bot had a problem deploying to Preview October 5, 2024 02:57 Failure

vercel bot had a problem deploying to Preview October 5, 2024 19:14 Failure

pablonyx force-pushed the vespa_multi branch from a3623ab to 05fd2a4 Compare October 5, 2024 21:01

pablonyx force-pushed the billing_multi branch from f6ad21e to 7e4f33f Compare October 5, 2024 21:02

pablonyx marked this pull request as ready for review October 5, 2024 21:03

vercel bot had a problem deploying to Preview October 5, 2024 21:05 Failure

greptile-apps bot reviewed Oct 5, 2024

View reviewed changes

vercel bot deployed to Preview October 5, 2024 21:20 View deployment

vercel bot deployed to Preview October 5, 2024 21:42 View deployment

vercel bot deployed to Preview October 6, 2024 18:55 View deployment

vercel bot deployed to Preview October 7, 2024 00:57 View deployment

pablonyx added 4 commits October 10, 2024 09:36

k

ab9e548

data -> control

d015a02

nit

30559b0

nit: error handling

9efd372

pablonyx added 14 commits October 10, 2024 09:36

auth + app

8a726fb

nit: color standardization

7859d97

nit

85f8fff

nit: typing

9809295

k

cdafb32

k

518e0ef

feat: functional upgrading

c356812

feat: add block for downgrading to seats < active users

2f0b625

add auth

cf14be7

remove accomplished todo + prints

3f13dd6

nit

516af73

tiny nit

18f7a8f

nit: centralize security

a1289bd

add tenant expulsion/gating + invite user -> increment billing seat no.

e0f4e1f

pablonyx force-pushed the billing_multi branch from 10a97cf to e0f4e1f Compare October 10, 2024 16:37

pablonyx changed the base branch from vespa_multi to multi_tenant_vespa October 10, 2024 16:38

vercel bot deployed to Preview October 10, 2024 16:40 View deployment

add cloud configs

36c31eb

vercel bot deployed to Preview October 10, 2024 22:33 View deployment

pablonyx added 2 commits October 10, 2024 15:38

k

a91b534

k

afae460

vercel bot deployed to Preview October 10, 2024 22:42 View deployment

yuhongsun96 approved these changes Oct 11, 2024

View reviewed changes

nit: update

6faad9c

pablonyx merged commit 895adc4 into multi_tenant_vespa Oct 12, 2024
2 of 3 checks passed

vercel bot had a problem deploying to Preview October 12, 2024 18:38 Failure

pablonyx deleted the billing_multi branch October 17, 2024 23:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Billing #2667

Billing #2667

pablonyx commented Oct 3, 2024 •

edited

Loading

vercel bot commented Oct 3, 2024 •

edited

Loading

greptile-apps bot left a comment

yuhongsun96 left a comment

yuhongsun96 Oct 11, 2024

yuhongsun96 Oct 11, 2024

yuhongsun96 Oct 11, 2024

yuhongsun96 Oct 11, 2024

yuhongsun96 Oct 11, 2024

yuhongsun96 Oct 11, 2024

yuhongsun96 Oct 11, 2024

yuhongsun96 Oct 12, 2024

Billing #2667

Billing #2667

Conversation

pablonyx commented Oct 3, 2024 • edited Loading

vercel bot commented Oct 3, 2024 • edited Loading

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

yuhongsun96 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pablonyx commented Oct 3, 2024 •

edited

Loading

vercel bot commented Oct 3, 2024 •

edited

Loading