Skip to content
This repository has been archived by the owner on Dec 11, 2024. It is now read-only.

chore/merge upstream 2024112801 #81

Merged
merged 620 commits into from
Nov 29, 2024
Merged

Conversation

onimsha
Copy link

@onimsha onimsha commented Nov 29, 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

hagen-danswer and others added 30 commits October 29, 2024 16:05
* added old error handling to comment fetching

* Not

* properly escaped cql labels

* reverted changes
Co-authored-by: Richard Kuo <rkuo@rkuo.com>
* add regeneration clarity

* minor udpate
* ensure functionality

* naming

* ensure tailwind theme updated

* add comments

* nit

* remove pr

* enforce colors

* update our tailwind config
* only warmup on index swap

* move conditional
* improve logging around indexing tasks

* task_logger doesn't work inside the spawned task
* add proper tenant reset

* clear comment

* minor formatting
…2945)

* refactoring changes

* everything working for service account

* works with service account

* combined scopes

* copy change

* oauth prep

* Works for oauth and service account credentials

* mypy

* merge fixes

* Refactor Google Drive connector

* finished backend

* auth changes

* if its stupid but it works, its not stupid

* npm run dev fixes

* addressed change requests

* string fix

* minor fixes and cleanup

* spacing cleanup

* Update connector.py

* everything done

* testing!

* Delete backend/tests/daily/connectors/google_drive/file_generator.py

* cleaned up

---------

Co-authored-by: Chris Weaver <25087905+Weves@users.noreply.github.com>
* make pywikibot store its working files in a system provided temp directory

* move the config setting around

---------

Co-authored-by: Richard Kuo <rkuo@rkuo.com>
* don't count api keys as users

* typing
* basic multi tenant api key

* organization

* nit

* clean
* first pass

* simplify

* remove now unneeded COPY command

* minor clean up

* k

* nit
* Fix

Fix

Refactor

more

more

fix

refactor

Fix circular imports

Refactor

Move tests around

* Add quote support

* Testing

* More testing

* Fix image generation slowness

* Remove unused exception

* Fix UT

* fix stop generating

* minor typo

* minor logging updates for clarity

---------

Co-authored-by: pablodanswer <pablo@danswer.ai>
yuhongsun96 and others added 28 commits November 23, 2024 14:44
* minor cleanup

* ensure users don't modify built-in attributes of assistants

* update sidebar

* k

* update update flow + assistant creation
* fix google sites connector

* minior cleanup

* rm comments
…nyx-dot-app#3247)

* improve messaging and UI around cleanup of leftover index attempts

* add tag on init
Improved logging for confluence doc sync and robust user creation
…yx-dot-app#3218)

* Add description for Google Gemini models and custom model icons for LiteLLM (OpenAI) proxied models

* Adds Vertex AI aliases for Claude

---------

Co-authored-by: Emerson Gomes <emerson.gomes@thalesgroup.com>
* validate dropdown

* validate

* update organization

* move to utils
)

* all done except routing

* fixed initial changes

* added backend endpoint for duplicating a chat session from Slack

* got chat duplication routing done

* got login routing working

* improved answer handling

* finished all checks

* finished all!

* made sure it works with google oauth

* dont remove that lol

* fixed weird thing

* bad comments
* Change external permissions behavior

* fixed behavior

* added error handling

* LLM the goat

* comment

* simplify

* fixed

* done

* limits increased

* added a ton of logging

* uhhhh
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 7e62a23 into main Nov 29, 2024
0 of 7 checks passed
@onimsha onimsha deleted the chore/merge-upstream-2024112801 branch November 29, 2024 07:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.