Fix error LLMchain validation

reggpt/agent/agent.py

@@ -1,33 +0,0 @@
-import logging
-logger = logging.getLogger(__name__)
-from fastapi import HTTPException
-import time
-from routers.qaPipeline import run_router_chain, chain_selector
-
-def run_agent(query):
-    try:
-        logger.info(f"run_agent : Question: {query}")
-        print(f"---------------- run_agent : Question: {query} ----------------")
-        # Get the answer from the chain
-        start = time.time()
-        chain_type = run_router_chain(query)
-        res = chain_selector(chain_type,query)
-        end = time.time()
-
-        # log the result
-        logger.error(f"---------------- Answer (took {round(end - start, 2)} s.) \n: {res}")
-        print(f" \n ---------------- Answer (took {round(end - start, 2)} s.): --------------  \n")
-
-        return res
-    
-    except HTTPException as e:
-            print('HTTPException')
-            print(e)
-            logger.exception(e)
-            raise e
-    
-    except Exception as e:
-        print('Exception')
-        print(e)
-        logger.exception(e)
-        raise e

reggpt/api/router.py

@@ -1,18 +1,15 @@
 import time
-
+import logging
 
 from fastapi import  APIRouter, HTTPException, status
 from fastapi import HTTPException, status
 
 from schemas.schema import UserQuery, LoginRequest, UserModel
 from routers.controller import get_QA_Answers, get_avaliable_models
-
 from configs.api import API_ENDPOINT_LOGIN,API_ENDPOINT_CHAT, API_ENDPOINT_HEALTH, API_ENDPOINT_MODEL
-import logging
 
 logger = logging.getLogger(__name__)
 
-
 class ChatAPI:
 
     def __init__(self):
@@ -25,6 +22,7 @@ class ChatAPI:
         self.router.add_api_route(API_ENDPOINT_CHAT, self.chat, methods=["POST"])
 
     async def hello(self):
+        print(API_ENDPOINT_HEALTH)
         return "Hello there!"
 
     async def avaliable_models(self):

reggpt/app.py

@@ -23,7 +23,6 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
 from configs.api import API_TITLE, API_VERSION, API_DESCRIPTION 
-
 from api.router import ChatAPI
 
 def filer():
@@ -65,7 +64,6 @@ app.add_middleware(
 )
 
 if __name__ == "__main__":
-
     # config = uvicorn.Config("server:app",host=host, port=port, log_config= logging.basicConfig())
     config = uvicorn.Config("app:app", host=host, port=port)
     server = uvicorn.Server(config)

reggpt/chains/llmChain.py

@@ -28,11 +28,11 @@ from langchain.chains import  ConversationalRetrievalChain
 # from conversationBufferWindowMemory import ConversationBufferWindowMemory
 
 # from langchain.prompts import PromptTemplate
-# from langchain.chains import LLMChain
-from prompts import document_combine as document_combine_prompt
-from prompts import retrieval as retrieval_qa_chain_prompt
-from prompts import general as general_qa_chain_prompt
-from prompts import router as router_prompt
+from langchain.chains import LLMChain
+from prompts.document_combine import document_combine_prompt
+from prompts.retrieval import retrieval_qa_chain_prompt
+from prompts.general import general_qa_chain_prompt
+from prompts.router import router_prompt
 
 
 def get_qa_chain(model_type,retriever):
@@ -70,8 +70,8 @@ def get_general_qa_chain(model_type):
     
     try:
         general_qa_llm = get_model(model_type)
-        # general_qa_chain = LLMChain(llm=general_qa_llm, prompt=general_qa_chain_prompt)
-        general_qa_chain = general_qa_chain_prompt | general_qa_llm
+        general_qa_chain = LLMChain(llm=general_qa_llm, prompt=general_qa_chain_prompt)
+        # general_qa_chain = general_qa_chain_prompt | general_qa_llm
 
         logger.info("general_qa_chain created")
         return general_qa_chain
@@ -87,8 +87,8 @@ def get_router_chain(model_type):
     
     try:
         router_llm = get_model(model_type)
-        # router_chain = LLMChain(llm=router_llm, prompt=router_prompt)
-        router_chain = router_prompt | router_llm
+        router_chain = LLMChain(llm=router_llm, prompt=router_prompt)
+        # router_chain = router_prompt | router_llm
 
         logger.info("router_chain created")
         return router_chain

reggpt/configs/api.py

@@ -17,12 +17,12 @@ API_TITLE = "RegGPT Back End v1"
 API_VERSION = "0.1.0"
 API_DESCRIPTION = "API_DESC"
 
-API_ENDPOINT_PREFIX = "/api/v1"
-API_DOCS_URL = f"{API_ENDPOINT_PREFIX}/docs"
-API_REDOC_URL = f"{API_ENDPOINT_PREFIX}/redoc"
-API_OPENAPI_URL = f"{API_ENDPOINT_PREFIX}/openapi.json"
+API_ENDPOINT_PREFIX = "/api/v1/"
+API_DOCS_URL = f"{API_ENDPOINT_PREFIX}docs"
+API_REDOC_URL = f"{API_ENDPOINT_PREFIX}redoc"
+API_OPENAPI_URL = f"{API_ENDPOINT_PREFIX}openapi.json"
 
-API_ENDPOINT_HEALTH = f"{API_ENDPOINT_PREFIX}/health"
-API_ENDPOINT_CHAT = f"{API_ENDPOINT_PREFIX}/chat"
-API_ENDPOINT_MODEL = f"{API_ENDPOINT_PREFIX}/models"
-API_ENDPOINT_LOGIN = f"{API_ENDPOINT_PREFIX}/login"
+API_ENDPOINT_HEALTH = f"{API_ENDPOINT_PREFIX}health"
+API_ENDPOINT_CHAT = f"{API_ENDPOINT_PREFIX}chat"
+API_ENDPOINT_MODEL = f"{API_ENDPOINT_PREFIX}models"
+API_ENDPOINT_LOGIN = f"{API_ENDPOINT_PREFIX}login"

reggpt/controller/agent.py

@@ -4,30 +4,15 @@ import logging
 logger = logging.getLogger(__name__)
 from dotenv import load_dotenv
 from fastapi import HTTPException
-from chains.llmChain import get_qa_chain, get_general_qa_chain, get_router_chain
-from output_parsers.output_parser import general_qa_chain_output_parser, qa_chain_output_parser, out_of_domain_chain_parser
 
-from configs.config import QA_MODEL_TYPE, GENERAL_QA_MODEL_TYPE, ROUTER_MODEL_TYPE, Multi_Query_MODEL_TYPE
-from utils.retriever import load_faiss_retriever, load_ensemble_retriever, load_multi_query_retriever
 load_dotenv()
 
 verbose = os.environ.get('VERBOSE')
 
-qa_model_type=QA_MODEL_TYPE
-general_qa_model_type=GENERAL_QA_MODEL_TYPE
-router_model_type=ROUTER_MODEL_TYPE #"google/flan-t5-xxl"
-multi_query_model_type=Multi_Query_MODEL_TYPE #"google/flan-t5-xxl"
-# model_type="tiiuae/falcon-7b-instruct"
-
-# retriever=load_faiss_retriever()
-retriever=load_ensemble_retriever()
-# retriever=load_multi_query_retriever(multi_query_model_type)
-logger.info("retriever loaded:")
-
-qa_chain= get_qa_chain(qa_model_type,retriever)
-general_qa_chain= get_general_qa_chain(general_qa_model_type)
-router_chain= get_router_chain(router_model_type)
-
+from controller.router import run_router_chain
+from routers.out_of_domain import run_out_of_domain_chain
+from routers.general import run_general_qa_chain
+from routers.qa import run_qa_chain
 
 def chain_selector(chain_type, query):
     chain_type = chain_type.lower().strip()

reggpt/controller/router.py

@@ -14,34 +14,17 @@
  *************************************************************************/
  """
 
-import os
 import time
 import logging
 logger = logging.getLogger(__name__)
-from dotenv import load_dotenv
-from fastapi import HTTPException
-from chains.llmChain import get_qa_chain, get_general_qa_chain, get_router_chain
-from output_parsers.output_parser import general_qa_chain_output_parser, qa_chain_output_parser, out_of_domain_chain_parser
-
-from configs.config import QA_MODEL_TYPE, GENERAL_QA_MODEL_TYPE, ROUTER_MODEL_TYPE, Multi_Query_MODEL_TYPE
-from utils.retriever import load_faiss_retriever, load_ensemble_retriever, load_multi_query_retriever
-load_dotenv()
-
-verbose = os.environ.get('VERBOSE')
-
-qa_model_type=QA_MODEL_TYPE
-general_qa_model_type=GENERAL_QA_MODEL_TYPE
-router_model_type=ROUTER_MODEL_TYPE #"google/flan-t5-xxl"
-multi_query_model_type=Multi_Query_MODEL_TYPE #"google/flan-t5-xxl"
-# model_type="tiiuae/falcon-7b-instruct"
-
-# retriever=load_faiss_retriever()
-retriever=load_ensemble_retriever()
-# retriever=load_multi_query_retriever(multi_query_model_type)
-logger.info("retriever loaded:")
-
-qa_chain= get_qa_chain(qa_model_type,retriever)
-general_qa_chain= get_general_qa_chain(general_qa_model_type)
+
+from chains.llmChain import get_router_chain
+
+from configs.model import ROUTER_MODEL_TYPE
+
+
+router_model_type=ROUTER_MODEL_TYPE
+
 router_chain= get_router_chain(router_model_type)
 
 def run_router_chain(query):

reggpt/prompts/general.py

@@ -1,6 +1,6 @@
 from langchain.prompts import PromptTemplate
 
-general_qa_template_Mixtral_V0= """
+general_qa_template_Mixtral_V0 = """
 You are the AI assistant of company 'boardpac' which provide services to company board members related to banking and financial sector.
 you can answer Banking and Financial Services Sector like Banking & Financial regulations, legal framework, governance framework, compliance requirements as per Central Bank regulations related question .
 
@@ -21,5 +21,7 @@ Additionally, it's important to note that this AI assistant has access to an int
 Question: {question}
 """
 
-general_qa_chain_prompt = PromptTemplate(input_variables=["question"],template=general_qa_template_Mixtral_V0)
-
+# general_qa_chain_prompt = PromptTemplate(
+#     input_variables=["question"], template=general_qa_template_Mixtral_V0
+# )
+general_qa_chain_prompt = PromptTemplate.from_template(general_qa_template_Mixtral_V0)

reggpt/prompts/router.py

@@ -13,5 +13,5 @@ Give the correct name of question type. If you are not sure return "Not Sure" in
  
 Question : {question}
 """
-router_prompt=PromptTemplate(input_variables=["question"],template=router_template_Mixtral_V0)
-
+# router_prompt=PromptTemplate(input_variables=["question"],template=router_template_Mixtral_V0)
+router_prompt=PromptTemplate.from_template(router_template_Mixtral_V0)

reggpt/routers/controller.py

@@ -16,13 +16,13 @@
 
 import logging
 logger = logging.getLogger(__name__)
-from configs.config import AVALIABLE_MODELS , MEMORY_WINDOW_K
+from configs.model import AVALIABLE_MODELS , MEMORY_WINDOW_K
 
 # from qaPipeline import QAPipeline
 # from qaPipeline_retriever_only import QAPipeline
 # qaPipeline = QAPipeline()
 
-from routers.qaPipeline import run_agent
+from controller.agent import run_agent
 
 def get_QA_Answers(userQuery):
     # model=userQuery.model

reggpt/routers/general.py

@@ -1,33 +1,18 @@
 
-import os
 import time
 import logging
 logger = logging.getLogger(__name__)
-from dotenv import load_dotenv
-from fastapi import HTTPException
-from reggpt.chains.llmChain import get_qa_chain, get_general_qa_chain, get_router_chain
-from reggpt.output_parsers.output_parser import general_qa_chain_output_parser, qa_chain_output_parser, out_of_domain_chain_parser
 
-from reggpt.configs.config import QA_MODEL_TYPE, GENERAL_QA_MODEL_TYPE, ROUTER_MODEL_TYPE, Multi_Query_MODEL_TYPE
-from reggpt.utils.retriever import load_faiss_retriever, load_ensemble_retriever, load_multi_query_retriever
-load_dotenv()
+from chains.llmChain import get_general_qa_chain
+from output_parsers.output_parser import general_qa_chain_output_parser
+
+from configs.model import GENERAL_QA_MODEL_TYPE
 
-verbose = os.environ.get('VERBOSE')
 
-qa_model_type=QA_MODEL_TYPE
-general_qa_model_type=GENERAL_QA_MODEL_TYPE
-router_model_type=ROUTER_MODEL_TYPE #"google/flan-t5-xxl"
-multi_query_model_type=Multi_Query_MODEL_TYPE #"google/flan-t5-xxl"
-# model_type="tiiuae/falcon-7b-instruct"
 
-# retriever=load_faiss_retriever()
-retriever=load_ensemble_retriever()
-# retriever=load_multi_query_retriever(multi_query_model_type)
-logger.info("retriever loaded:")
+general_qa_model_type=GENERAL_QA_MODEL_TYPE
 
-qa_chain= get_qa_chain(qa_model_type,retriever)
 general_qa_chain= get_general_qa_chain(general_qa_model_type)
-router_chain= get_router_chain(router_model_type)
 
 def run_general_qa_chain(query):
     try:

reggpt/routers/out_of_domain.py

@@ -1,31 +1,4 @@
-import os
-import time
-import logging
-logger = logging.getLogger(__name__)
-from dotenv import load_dotenv
-from fastapi import HTTPException
-from reggpt.chains.llmChain import get_qa_chain, get_general_qa_chain, get_router_chain
-from reggpt.output_parsers.output_parser import general_qa_chain_output_parser, qa_chain_output_parser, out_of_domain_chain_parser
+from output_parsers.output_parser import  out_of_domain_chain_parser
 
-from reggpt.configs.config import QA_MODEL_TYPE, GENERAL_QA_MODEL_TYPE, ROUTER_MODEL_TYPE, Multi_Query_MODEL_TYPE
-from reggpt.utils.retriever import load_faiss_retriever, load_ensemble_retriever, load_multi_query_retriever
-load_dotenv()
-
-verbose = os.environ.get('VERBOSE')
-
-qa_model_type=QA_MODEL_TYPE
-general_qa_model_type=GENERAL_QA_MODEL_TYPE
-router_model_type=ROUTER_MODEL_TYPE #"google/flan-t5-xxl"
-multi_query_model_type=Multi_Query_MODEL_TYPE #"google/flan-t5-xxl"
-# model_type="tiiuae/falcon-7b-instruct"
-
-# retriever=load_faiss_retriever()
-retriever=load_ensemble_retriever()
-# retriever=load_multi_query_retriever(multi_query_model_type)
-logger.info("retriever loaded:")
-
-qa_chain= get_qa_chain(qa_model_type,retriever)
-general_qa_chain= get_general_qa_chain(general_qa_model_type)
-router_chain= get_router_chain(router_model_type)
 def run_out_of_domain_chain(query):
     return out_of_domain_chain_parser(query)

reggpt/routers/qa.py

@@ -19,30 +19,22 @@ import time
 import logging
 logger = logging.getLogger(__name__)
 from dotenv import load_dotenv
-from fastapi import HTTPException
-from reggpt.chains.llmChain import get_qa_chain, get_general_qa_chain, get_router_chain
-from reggpt.output_parsers.output_parser import general_qa_chain_output_parser, qa_chain_output_parser, out_of_domain_chain_parser
+from chains.llmChain import get_qa_chain
+from output_parsers.output_parser import qa_chain_output_parser
 
-from reggpt.configs.config import QA_MODEL_TYPE, GENERAL_QA_MODEL_TYPE, ROUTER_MODEL_TYPE, Multi_Query_MODEL_TYPE
-from reggpt.utils.retriever import load_faiss_retriever, load_ensemble_retriever, load_multi_query_retriever
+from configs.model import QA_MODEL_TYPE
+from utils.retriever import load_ensemble_retriever
 load_dotenv()
 
 verbose = os.environ.get('VERBOSE')
 
 qa_model_type=QA_MODEL_TYPE
-general_qa_model_type=GENERAL_QA_MODEL_TYPE
-router_model_type=ROUTER_MODEL_TYPE #"google/flan-t5-xxl"
-multi_query_model_type=Multi_Query_MODEL_TYPE #"google/flan-t5-xxl"
-# model_type="tiiuae/falcon-7b-instruct"
-
 # retriever=load_faiss_retriever()
 retriever=load_ensemble_retriever()
 # retriever=load_multi_query_retriever(multi_query_model_type)
 logger.info("retriever loaded:")
 
 qa_chain= get_qa_chain(qa_model_type,retriever)
-general_qa_chain= get_general_qa_chain(general_qa_model_type)
-router_chain= get_router_chain(router_model_type)
 
 def run_qa_chain(query):
     try:

reggpt/routers/qaPipeline.py

@@ -23,7 +23,7 @@ from fastapi import HTTPException
 from chains.llmChain import get_qa_chain, get_general_qa_chain, get_router_chain
 from output_parsers.output_parser import general_qa_chain_output_parser, qa_chain_output_parser, out_of_domain_chain_parser
 
-from configs.config import QA_MODEL_TYPE, GENERAL_QA_MODEL_TYPE, ROUTER_MODEL_TYPE, Multi_Query_MODEL_TYPE
+from configs.model import QA_MODEL_TYPE, GENERAL_QA_MODEL_TYPE, ROUTER_MODEL_TYPE, Multi_Query_MODEL_TYPE
 from utils.retriever import load_faiss_retriever, load_ensemble_retriever, load_multi_query_retriever
 load_dotenv()