Minor tweaks

thingthatis · Aug 6, 2024 · 99e5342 · 99e5342
1 parent 1f20f14
commit 99e5342
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 460 deletions.
diff --git a/setup.py b/setup.py
@@ -50,26 +50,10 @@
         'inquirer',
         'chromadb',
         'sentence-transformers',
-        # 'llama-index',
-        # 'llama-index-vector-stores-chroma',
-        # 'llama-index-readers-web',
         'IPython',
-        # 'llama-index-retrievers-bm25',
         'rake_nltk',
-        # 'llama-index-embeddings-langchain',
-        # 'llama-index-vector-stores-faiss',
         'faiss-cpu',
-        # 'llama-index-llms-mistralai',
-        # 'llama-index-embeddings-mistralai',
-        # 'llama-index-embeddings-openai',
-        # 'llama-index-postprocessor-longllmlingua',
         'llmlingua',
-        # 'llama_index-postprocessor-cohere_rerank',
-        # 'llama_index-postprocessor-jinaai_rerank',
-        # 'llama-index-postprocessor-rankgpt-rerank',
-        # 'llama-index-postprocessor-colbert-rerank',
-        # 'llama-index-postprocessor-rankllm-rerank',
-        # 'llama-index-llms-openai',
         'langchain-huggingface',
         'rank_bm25',
         'ragas',
@@ -88,7 +72,6 @@
         'huggingface_hub',
         'datasets',
         'langchain_text_splitters',
-        # 'llama-index-core',
         'requests',
         'markdown',
         'singlestoredb',
@@ -103,6 +86,23 @@
         'langchain-google-vertexai',
         'langchain-ollama',
         'langchain_postgres',
+        # 'llama-index',
+        # 'llama-index-vector-stores-chroma',
+        # 'llama-index-readers-web',
+        # 'llama-index-retrievers-bm25',
+        # 'llama-index-embeddings-langchain',
+        # 'llama-index-vector-stores-faiss',
+        # 'llama-index-llms-mistralai',
+        # 'llama-index-embeddings-mistralai',
+        # 'llama-index-embeddings-openai',
+        # 'llama-index-postprocessor-longllmlingua',
+        # 'llama_index-postprocessor-cohere_rerank',
+        # 'llama_index-postprocessor-jinaai_rerank',
+        # 'llama-index-postprocessor-rankgpt-rerank',
+        # 'llama-index-postprocessor-colbert-rerank',
+        # 'llama-index-postprocessor-rankllm-rerank',
+        # 'llama-index-llms-openai',
+        # 'llama-index-core',
         # other dependencies
     ],
 )
diff --git a/src/ragbuilder/executor.py b/src/ragbuilder/executor.py
@@ -96,8 +96,8 @@ def rag_builder_bayes_optmization(**kwargs):
     num_runs=kwargs.get('num_runs')
     other_embedding=kwargs.get('other_embedding')
     other_llm=kwargs.get('other_llm')
-    print(f'other_embedding={other_embedding}')
-    print(f'other_llm={other_llm}')
+    logger.info(f'other_embedding={other_embedding}')
+    logger.info(f'other_llm={other_llm}')
     test_data=kwargs['test_data'] #loader_kwargs ={'source':'url','input_path': url1},
     test_df=pd.read_csv(test_data)
     test_ds = Dataset.from_pandas(test_df)