MERGE development INTO master #74
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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
added a commit
that referenced
this pull request
Dec 31, 2023
…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
added a commit
that referenced
this pull request
Dec 31, 2023
* 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 * MERGE feature/76-updates-params-for-ability-to-fetch-from-other-properties 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
added a commit
that referenced
this pull request
Jan 2, 2024
* 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 * MERGE feature/76-updates-params-for-ability-to-fetch-from-other-properties 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 * Updates so UserRepo can be passed * MERGE feature/15-can-pass-tools-and-user-repo-to-include-router INTO development (#79) * Will close out issue 15, updates saas * Changelog updated
ryaneggz
added a commit
that referenced
this pull request
Jan 4, 2024
* 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 * MERGE feature/76-updates-params-for-ability-to-fetch-from-other-properties 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 * Updates so UserRepo can be passed * MERGE feature/15-can-pass-tools-and-user-repo-to-include-router INTO development (#79) * Will close out issue 15, updates saas * Changelog updated * MERGE bugfix/81-vectorstore-file-fix-args INTO development (#82) * Should be resolved, need to check after comp restart * Update changelog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates HistoryController to include a user_id as request alternative.