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

chore/merge upstream 2024112601 #79

Merged
merged 535 commits into from
Nov 27, 2024
Merged

Conversation

onimsha
Copy link

@onimsha onimsha commented Nov 27, 2024

Description

[Provide a brief description of the changes in this PR]

How Has This Been Tested?

[Describe the tests you ran to verify your changes]

Accepted Risk

[Any know risks or failure modes to point out to reviewers]

Related Issue(s)

[If applicable, link to the issue(s) this PR addresses]

Checklist:

  • All of the automated tests pass
  • All PR comments are addressed and marked resolved
  • If there are migrations, they have been rebased to latest main
  • If there are new dependencies, they are added to the requirements
  • If there are new environment variables, they are added to all of the deployment methods
  • If there are new APIs that don't require auth, they are added to PUBLIC_ENDPOINT_SPECS
  • Docker images build and basic functionalities work
  • Author has done a final read through of the PR right before merge

rkuo-danswer and others added 30 commits October 25, 2024 09:35
* modal fallback

* nit

* k

* k
* Fix structured outputs

* Add back rest
* check for index swap

* initial bones

* kk

* k

* k:

* nit

* nit

* rebase + update

* nit

* minior update

* k

* minor integration test fixes

* nit

* ensure we build test docker image

* remove one space

* k

* ensure we wipe volumes

* remove log

* typo

* nit

* k

* k
* upgraded model strings

* trolled

* we do a little trolling

* reeeeeee

* alembic upgrade

* added ignore

* bump litellm

* k

* nit

---------

Co-authored-by: pablodanswer <pablo@danswer.ai>
* check for index swap

* k

* minor

* k

* nit
* add posthog + layout rework

* remove posthog node

* nit
* ensure proper sentry silencing

* add comments
* remove rt

* nit

* add minor alembic revision

* functional migration

* replace usp

* k

* typing
* add tenantJWTSrategy

* nit
…r-ai#2932)

* Move user fetching to SS

* Cleanup

* Add more logging

* Small cleanup
* feat: add clean logging for api routes

* nit

* `MULTI_TENANT` must be shared config

* nit
* temporary stash

* welcome flow

* minor update

* k

* minor updates to welcome flow
rkuo-danswer and others added 28 commits November 13, 2024 16:15
* in progress PoC

* working limited user, needs routes to be marked next

* make selected endpoint available to limited user role

* xfail on test_slack_prune

* add comment to sync function

---------

Co-authored-by: Richard Kuo <rkuo@rkuo.com>
…#3126)

* Make curators able to create permission synced connectors

* removed editing permission synced connectors for curators

* updated tests to use access type instead of is_public

* update copy
* add creator id to cc pair

* fix alembic head

* show email instead of UUID

* safer check on email

* make foreign key relationships optional

* always allow creator to edit (per hagen)

* use primary join

* no index_doc_batch spam

* try this again

---------

Co-authored-by: Richard Kuo <rkuo@rkuo.com>
* Updated google copy and added non admin oauth support

* backend update

* accounted for oauth

* further removed class variables

* updated sets
* add improved cloud configuration

* fix typing

* finalize slackbot improvements

* minor update

* finalized keda

* moderate slackbot switch

* update some configs

* revert

* include reset engine!
* add cohere default

* finalize

* minor improvement

* update

* update

* update configs

* ensure we properly expose name(space) for slackbot

* update config

* config
* silence warning

* improved fallback logic

* k

* minor cosmetic update

* minor logic update

* nit
* fix tenant logging

* upsert only new/updated docs, but always upsert document to cc pair relationship

* better logging and rough cut at testing
…er-ai#3143)

* reworked drive+confluence frontend and implied backend changes

* fixed oauth admin tests

* fixed service account tests

* frontend cleanup

* copy change

* details!

* added key

* so good

* whoops!

* fixed mnore treljsertjoslijt

* has issue with boolean form

* should be done
* initial PoC

* preliminary working config

* first cut at chromatic tests

* first cut at chromatic tests

* fix yaml

* fix yaml again

* use workingDir

* adapt playwright example

* remove env

* fix working directory

* fix more paths

* fix dir

* add playwright setup

* accidentally deleted a step

* update test

* think we don't need home.png right now

* remove unused home.png

---------

Co-authored-by: Richard Kuo <rkuo@rkuo.com>
…i#3147)

* Made external permissioned users and slack users show diff

* finished

* Fix typing

* k

* Fix

* k

---------

Co-authored-by: Weves <chrisweaver101@gmail.com>
Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
@onimsha onimsha merged commit 144a9dd into main Nov 27, 2024
0 of 7 checks passed
@onimsha onimsha deleted the chore/merge-upstream-2024112601 branch November 27, 2024 04:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

9 participants