add req

aimakerspace/openai_utils/chatmodel.py

@@ -1,9 +1,6 @@
 from openai import OpenAI
-from dotenv import load_dotenv
 import os
 
-load_dotenv()
-
 
 class ChatOpenAI:
     def __init__(self, model_name: str = "gpt-3.5-turbo"):
@@ -12,11 +9,11 @@ class ChatOpenAI:
         if self.openai_api_key is None:
             raise ValueError("OPENAI_API_KEY is not set")
 
-    def run(self, messages, text_only: bool = True):
+    def run(self, client, messages, text_only: bool = True):
         if not isinstance(messages, list):
             raise ValueError("messages must be a list")
 
-        client = OpenAI()
+        # client = OpenAI()
         response = client.chat.completions.create(
             model=self.model_name, messages=messages
         )

rag.py

@@ -41,7 +41,7 @@ class RetrievalAugmentedQAPipeline:
         self.llm = llm
         self.vector_db_retriever = vector_db_retriever
 
-    def run_pipeline(self, user_query: str) -> str:
+    def run_pipeline(self, client, user_query: str) -> str:
         context_list = self.vector_db_retriever.search_by_text(user_query, k=4)
         
         context_prompt = ""
@@ -52,7 +52,7 @@ class RetrievalAugmentedQAPipeline:
 
         formatted_user_prompt = user_prompt.create_message(user_query=user_query)
         
-        return self.llm.run([formatted_system_prompt, formatted_user_prompt])
+        return self.llm.run(client, [formatted_system_prompt, formatted_user_prompt])
 
 def _split_documents():
     split_documents = []
@@ -72,9 +72,9 @@ def _build_vector_db():
     vector_db = asyncio.run(vector_db.abuild_from_list(split_documents))
     return vector_db
 
-def retrieval_augmented_qa_pipeline(client):
-    vector_db = _build_vector_db()
-    pipeline = RetrievalAugmentedQAPipeline(
-        llm=client,
-        vector_db_retriever=vector_db)
-    return pipeline
+# def retrieval_augmented_qa_pipeline(client):
+#     vector_db = _build_vector_db()
+#     pipeline = RetrievalAugmentedQAPipeline(
+#         llm=client,
+#         vector_db_retriever=vector_db)
+#     return pipeline

requirements.txt

@@ -0,0 +1,9 @@
+chainlit==0.7.700
+cohere==4.37
+openai==1.3.5
+tiktoken==0.5.1
+python-dotenv==1.0.0
+numpy==1.25.2
+openai
+pandas
+scikit-learn