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

MERGE development INTO master #78

Merged
merged 33 commits into from
Dec 31, 2023
Merged

MERGE development INTO master #78

merged 33 commits into from
Dec 31, 2023

Conversation

ryaneggz
Copy link
Contributor

No description provided.

ryaneggz and others added 30 commits December 10, 2023 15:38
…elopment (#51)

* Endpoints reconfigurged for settings and history

* Update changelog
* Rag chat fixed

* Remove body from create for now, may change how this works later

* Works for saas, may stop workign on vercel
* Contains updates for ollama rag but is a bit more custom than intended, doesn't include return docs atm.

* Rag working for both openai and ollama
* Contains updates for ollama rag but is a bit more custom than intended, doesn't include return docs atm.

* Rag working for both openai and ollama
…INTO development (#65)

* Updates to restrict the keys that can be saved

* Adds the keys as args so could be altered

* adds some type hinting
ryaneggz and others added 3 commits December 30, 2023 21:07
…rties INTO development (#77)

* MERGE development INTO master (#74)

* MERGE feature/50-adds-settings-and-updates-history-endpoints INTO development (#51)

* Endpoints reconfigurged for settings and history

* Update changelog

* MERGE Feature/rag chat fixed to not be agent INTO development (#53)

* Rag chat fixed

* Remove body from create for now, may change how this works later

* Works for saas, may stop workign on vercel

* MERGE feature/55-update-ollama-rag-chat INTO development (#56)

* Contains updates for ollama rag but is a bit more custom than intended, doesn't include return docs atm.

* Rag working for both openai and ollama

* MERGE feature/55-update-ollama-rag-chat INTO development (#57)

* Contains updates for ollama rag but is a bit more custom than intended, doesn't include return docs atm.

* Rag working for both openai and ollama

* Update changelog

* Update changlog

* fixing the retrieval routes

* Update changelog

* Update retrieval controller with file upload

* Adds better error handling for tools in agent

* Changes made (#62)

* MERGE feature/64-retricts-what-can-be-passed-to-settings-and-history INTO development (#65)

* Updates to restrict the keys that can be saved

* Adds the keys as args so could be altered

* adds some type hinting

* Small fix in history controller

* Need to account for tags and title on history and settings

* Switch to a set to be more efficient (#71)

* A couple adjustments

* Had to update the PINECONE_KEY to PINECONE_API_KEY

* Had to do some updates

* update HistoryController with user_id for webhook

* Update changelog

* Made, may need to take a second look edit mode is not working in the other repo

* Updates changelog
@ryaneggz ryaneggz marked this pull request as ready for review December 31, 2023 23:21
@ryaneggz ryaneggz merged commit f162939 into master Dec 31, 2023
1 check passed
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