Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Tenant provisioning in the dataplane" #2691

Merged

Conversation

pablonyx
Copy link
Contributor

@pablonyx pablonyx commented Oct 5, 2024

Reverts #2590

@pablonyx pablonyx marked this pull request as ready for review October 5, 2024 21:09
@pablonyx pablonyx merged commit e15f6bf into multi_tenant_alembic Oct 5, 2024
2 of 4 checks passed
Copy link

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR Summary

This pull request reverts changes related to tenant provisioning in the dataplane, specifically reverting PR #2590. Here are the key points:

  • Removed multi-tenant functionality: The changes remove code related to tenant management, including the deletion of files in the backend/ee/danswer/server/tenants/ directory.

  • Simplified authentication: The control_plane_dep function and related imports have been removed from backend/danswer/auth/users.py, simplifying the authentication process.

  • Reverted database session handling: In backend/danswer/chat/load_yamls.py, functions now create their own database sessions instead of receiving them as parameters.

  • Removed environment variables: DATA_PLANE_SECRET and EXPECTED_API_KEY have been removed from backend/danswer/configs/app_configs.py.

  • Updated schema validation: The regex for schema name validation in backend/danswer/db/engine.py has been modified to enforce stricter naming rules.

  • Reintroduced setup functions: setup_postgres and setup_vespa functions have been moved back to danswer.main from a separate setup file.

These changes significantly alter the application's structure and functionality, reverting the multi-tenant and dataplane-specific features introduced in the previous PR.

15 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: Deletion of tenant creation API may break multi-tenant functionality. Ensure this is intentional and alternative methods for tenant management are in place.

@pablonyx pablonyx deleted the revert-2590-tenant_provisioning_dataplane branch October 17, 2024 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant