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

ryaneggz · 2023-12-14T04:00:31Z

No description provided.

* 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/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

* 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

* 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

* 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/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

* 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

* 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

* 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

* 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

…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

* 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

* 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 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

ryaneggz added 3 commits December 11, 2023 20:14

Rag chat fixed

1532a40

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

802443d

Works for saas, may stop workign on vercel

ae381c8

ryaneggz merged commit 0eeef77 into development Dec 14, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

ryaneggz commented Dec 14, 2023

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

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

Conversation

ryaneggz commented Dec 14, 2023