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.

Sign up for GitHub

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

Add tenant context #2596

Merged
merged 23 commits into from
Oct 10, 2024
Merged

Add tenant context #2596

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
53b72ba
add proper tenant context to background tasks
pablonyx Sep 29, 2024
35ede0f
update for new session logic
pablonyx Sep 29, 2024
be1caab
remove unnecessary functions
pablonyx Sep 29, 2024
0983d83
add additional tenant context
pablonyx Sep 29, 2024
6aea755
update ports
pablonyx Sep 29, 2024
2acc6bf
proper format / directory structure
pablonyx Sep 30, 2024
27095b5
update ports
pablonyx Sep 30, 2024
b8f42bd
ensure tenant context properly passed to ee bg tasks
pablonyx Oct 1, 2024
bc42cfa
add user provisioning
pablonyx Oct 8, 2024
7cb58ee
nit
pablonyx Oct 8, 2024
62efe54
validated for multi tenant
pablonyx Oct 8, 2024
e62357f
auth
pablonyx Oct 8, 2024
58b429c
nit
pablonyx Oct 8, 2024
613ea34
nit
pablonyx Oct 8, 2024
0bf512d
nit
pablonyx Oct 8, 2024
a19d7d7
nit
pablonyx Oct 9, 2024
dcb97cc
validate pruning
pablonyx Oct 9, 2024
24e2c7e
evaluate integration tests
pablonyx Oct 9, 2024
9ea11a8
at long last, validated celery beat
pablonyx Oct 10, 2024
1321ba0
nit: minor edge case patched
pablonyx Oct 10, 2024
a645c0c
minor
pablonyx Oct 10, 2024
a4dad03
validate update
pablonyx Oct 10, 2024
4ec418c
nit
pablonyx Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
nit
  • Loading branch information
@pablonyx
pablonyx committed Oct 10, 2024
commit 7cb58ee2062951865200d6bc5d6416d3dd68bdf9
6 changes: 4 additions & 2 deletions backend/danswer/server/documents/cc_pair.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
update_connector_credential_pair_from_id,
)
from danswer.db.document import get_document_counts_for_cc_pairs
from danswer.db.engine import current_tenant_id
from danswer.db.engine import get_session
from danswer.db.enums import AccessType
from danswer.db.enums import ConnectorCredentialPairStatus
Expand All @@ -46,7 +47,6 @@
name_sync_external_doc_permissions_task,
)
from ee.danswer.db.user_group import validate_user_creation_permissions
from danswer.db.engine import current_tenant_id

logger = setup_logger()
router = APIRouter(prefix="/manage")
Expand Down Expand Up @@ -258,7 +258,9 @@ def prune_cc_pair(
f"credential_id={cc_pair.credential_id} "
f"{cc_pair.connector.name} connector."
)
tasks_created = try_creating_prune_generator_task(cc_pair, db_session, r, current_tenant_id.get())
tasks_created = try_creating_prune_generator_task(
cc_pair, db_session, r, current_tenant_id.get()
)
if not tasks_created:
raise HTTPException(
status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
Expand Down