|
50 | 50 | ) |
51 | 51 | from quart_cors import cors |
52 | 52 |
|
53 | | -from approaches.approach import Approach |
54 | | -from approaches.chatreadretrieveread import ChatReadRetrieveReadApproach |
55 | | -from approaches.chatreadretrievereadvision import ChatReadRetrieveReadVisionApproach |
56 | | -from approaches.promptmanager import PromptyManager |
57 | | -from approaches.retrievethenread import RetrieveThenReadApproach |
58 | | -from approaches.retrievethenreadvision import RetrieveThenReadVisionApproach |
59 | | -from chat_history.cosmosdb import chat_history_cosmosdb_bp |
60 | | -from config import ( |
| 53 | +from hrchatbot.approaches.approach import Approach |
| 54 | +from hrchatbot.approaches.chatreadretrieveread import ChatReadRetrieveReadApproach |
| 55 | +from hrchatbot.approaches.promptmanager import PromptyManager |
| 56 | +from hrchatbot.chat_history.cosmosdb import chat_history_cosmosdb_bp |
| 57 | +from hrchatbot.config import ( |
61 | 58 | CONFIG_AGENT_CLIENT, |
62 | 59 | CONFIG_AGENTIC_RETRIEVAL_ENABLED, |
63 | 60 | CONFIG_ASK_APPROACH, |
|
90 | 87 | CONFIG_USER_UPLOAD_ENABLED, |
91 | 88 | CONFIG_VECTOR_SEARCH_ENABLED, |
92 | 89 | ) |
93 | | -from core.authentication import AuthenticationHelper |
94 | | -from core.sessionhelper import create_session_id |
95 | | -from decorators import authenticated, authenticated_path |
96 | | -from error import error_dict, error_response |
97 | | -from prepdocs import ( |
| 90 | +from hrchatbot.core.authentication import AuthenticationHelper |
| 91 | +from hrchatbot.core.sessionhelper import create_session_id |
| 92 | +from hrchatbot.decorators import authenticated, authenticated_path |
| 93 | +from hrchatbot.error import error_dict, error_response |
| 94 | +from hrchatbot.prepdocs import ( |
98 | 95 | clean_key_if_exists, |
99 | 96 | setup_embeddings_service, |
100 | 97 | setup_file_processors, |
101 | 98 | setup_search_info, |
102 | 99 | ) |
103 | | -from prepdocslib.filestrategy import UploadUserFileStrategy |
104 | | -from prepdocslib.listfilestrategy import File |
| 100 | +from hrchatbot.prepdocslib.filestrategy import UploadUserFileStrategy |
| 101 | +from hrchatbot.prepdocslib.listfilestrategy import File |
105 | 102 |
|
106 | 103 | bp = Blueprint("routes", __name__, static_folder="static") |
107 | 104 | # Fix Windows registry issue with mimetypes |
@@ -828,29 +825,6 @@ async def setup_clients(): |
828 | 825 |
|
829 | 826 | prompt_manager = PromptyManager() |
830 | 827 |
|
831 | | - # Set up the two default RAG approaches for /ask and /chat |
832 | | - # RetrieveThenReadApproach is used by /ask for single-turn Q&A |
833 | | - current_app.config[CONFIG_ASK_APPROACH] = RetrieveThenReadApproach( |
834 | | - search_client=search_client, |
835 | | - search_index_name=AZURE_SEARCH_INDEX, |
836 | | - agent_model=AZURE_OPENAI_SEARCHAGENT_MODEL, |
837 | | - agent_deployment=AZURE_OPENAI_SEARCHAGENT_DEPLOYMENT, |
838 | | - agent_client=agent_client, |
839 | | - openai_client=openai_client, |
840 | | - auth_helper=auth_helper, |
841 | | - chatgpt_model=OPENAI_CHATGPT_MODEL, |
842 | | - chatgpt_deployment=AZURE_OPENAI_CHATGPT_DEPLOYMENT, |
843 | | - embedding_model=OPENAI_EMB_MODEL, |
844 | | - embedding_deployment=AZURE_OPENAI_EMB_DEPLOYMENT, |
845 | | - embedding_dimensions=OPENAI_EMB_DIMENSIONS, |
846 | | - embedding_field=AZURE_SEARCH_FIELD_NAME_EMBEDDING, |
847 | | - sourcepage_field=KB_FIELDS_SOURCEPAGE, |
848 | | - content_field=KB_FIELDS_CONTENT, |
849 | | - query_language=AZURE_SEARCH_QUERY_LANGUAGE, |
850 | | - query_speller=AZURE_SEARCH_QUERY_SPELLER, |
851 | | - prompt_manager=prompt_manager, |
852 | | - reasoning_effort=OPENAI_REASONING_EFFORT, |
853 | | - ) |
854 | 828 |
|
855 | 829 | # ChatReadRetrieveReadApproach is used by /chat for multi-turn conversation |
856 | 830 | current_app.config[CONFIG_CHAT_APPROACH] = ChatReadRetrieveReadApproach( |
@@ -898,50 +872,6 @@ async def setup_clients(): |
898 | 872 | azure_credential, "https://cognitiveservices.azure.com/.default" |
899 | 873 | ) |
900 | 874 |
|
901 | | - current_app.config[CONFIG_ASK_VISION_APPROACH] = RetrieveThenReadVisionApproach( |
902 | | - search_client=search_client, |
903 | | - openai_client=openai_client, |
904 | | - blob_container_client=blob_container_client, |
905 | | - auth_helper=auth_helper, |
906 | | - vision_endpoint=AZURE_VISION_ENDPOINT, |
907 | | - vision_token_provider=token_provider, |
908 | | - gpt4v_deployment=AZURE_OPENAI_GPT4V_DEPLOYMENT, |
909 | | - gpt4v_model=AZURE_OPENAI_GPT4V_MODEL, |
910 | | - embedding_model=OPENAI_EMB_MODEL, |
911 | | - embedding_deployment=AZURE_OPENAI_EMB_DEPLOYMENT, |
912 | | - embedding_dimensions=OPENAI_EMB_DIMENSIONS, |
913 | | - embedding_field=AZURE_SEARCH_FIELD_NAME_EMBEDDING, |
914 | | - sourcepage_field=KB_FIELDS_SOURCEPAGE, |
915 | | - content_field=KB_FIELDS_CONTENT, |
916 | | - query_language=AZURE_SEARCH_QUERY_LANGUAGE, |
917 | | - query_speller=AZURE_SEARCH_QUERY_SPELLER, |
918 | | - prompt_manager=prompt_manager, |
919 | | - ) |
920 | | - |
921 | | - current_app.config[CONFIG_CHAT_VISION_APPROACH] = ( |
922 | | - ChatReadRetrieveReadVisionApproach( |
923 | | - search_client=search_client, |
924 | | - openai_client=openai_client, |
925 | | - blob_container_client=blob_container_client, |
926 | | - auth_helper=auth_helper, |
927 | | - vision_endpoint=AZURE_VISION_ENDPOINT, |
928 | | - vision_token_provider=token_provider, |
929 | | - chatgpt_model=OPENAI_CHATGPT_MODEL, |
930 | | - chatgpt_deployment=AZURE_OPENAI_CHATGPT_DEPLOYMENT, |
931 | | - gpt4v_deployment=AZURE_OPENAI_GPT4V_DEPLOYMENT, |
932 | | - gpt4v_model=AZURE_OPENAI_GPT4V_MODEL, |
933 | | - embedding_model=OPENAI_EMB_MODEL, |
934 | | - embedding_deployment=AZURE_OPENAI_EMB_DEPLOYMENT, |
935 | | - embedding_dimensions=OPENAI_EMB_DIMENSIONS, |
936 | | - embedding_field=AZURE_SEARCH_FIELD_NAME_EMBEDDING, |
937 | | - sourcepage_field=KB_FIELDS_SOURCEPAGE, |
938 | | - content_field=KB_FIELDS_CONTENT, |
939 | | - query_language=AZURE_SEARCH_QUERY_LANGUAGE, |
940 | | - query_speller=AZURE_SEARCH_QUERY_SPELLER, |
941 | | - prompt_manager=prompt_manager, |
942 | | - ) |
943 | | - ) |
944 | | - |
945 | 875 |
|
946 | 876 | @bp.after_app_serving |
947 | 877 | async def close_clients(): |
|
0 commit comments