update: combined knowledge base and pipeline packages

paisley-rag · Aug 6, 2024 · 318e0a5 · 318e0a5
1 parent 7ef2a56
commit 318e0a5
Show file tree

Hide file tree

Showing 30 changed files with 3,052 additions and 913 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/config_util.py b/config_util.py
diff --git a/config_util_test.py b/config_util_test.py
diff --git a/pipeline/config_util.py b/pipeline/config_util.py
@@ -1,7 +1,7 @@
 """ utility functions supporting server.py routes for pipeline.py (Pipeline class) """
 import json
 
-import app_logger as log
+import db.app_logger as log
 
 DEFAULT_TOP_N = 5
 

diff --git a/pipeline/config_util_test.py b/pipeline/config_util_test.py
@@ -1,7 +1,7 @@
 import json
 
 # import unittest
-import config_util as cutil
+import db.pipeline.config_util as cutil
 
 # class TestConfigUtil(unittest.TestCase):
 

diff --git a/pipeline/hybridSearch/__init__.py → pipeline/hybrid_search/__init__.py b/pipeline/hybridSearch/__init__.py → pipeline/hybrid_search/__init__.py
diff --git a/pipeline/hybridSearch/keyword.py → pipeline/hybrid_search/keyword.py b/pipeline/hybridSearch/keyword.py → pipeline/hybrid_search/keyword.py
@@ -8,7 +8,7 @@
 from dotenv import load_dotenv
 import Stemmer
 
-import app_logger as log
+import db.app_logger as log
 
 load_dotenv(dotenv_path='../.env', override=True)
 

diff --git a/pipeline/hybridSearch/search.py → pipeline/hybrid_search/search.py b/pipeline/hybridSearch/search.py → pipeline/hybrid_search/search.py
@@ -1,5 +1,5 @@
-from pipeline.hybridSearch import keyword
-from pipeline.hybridSearch import vector
+from db.pipeline.hybrid_search import keyword
+from db.pipeline.hybrid_search import vector
 
 # defaults
 default_top_k = 5

diff --git a/pipeline/hybridSearch/vector.py → pipeline/hybrid_search/vector.py b/pipeline/hybridSearch/vector.py → pipeline/hybrid_search/vector.py
@@ -8,7 +8,7 @@
 from llama_index.vector_stores.mongodb import MongoDBAtlasVectorSearch
 import pymongo
 
-import app_logger as log
+import db.app_logger as log
 
 load_dotenv(override=True)
 

diff --git a/pipeline/pipelineTest.py b/pipeline/pipelineTest.py
diff --git a/pipeline/pipeline_class.py b/pipeline/pipeline_class.py
@@ -8,9 +8,9 @@
 from llama_index.postprocessor.colbert_rerank import ColbertRerank
 from llama_index.core.response_synthesizers import  ResponseMode
 
-import app_logger as log
-from pipeline.hybridSearch import search
-import pipeline.mongo_util as mg
+import db.app_logger as log
+from db.pipeline.hybrid_search import search
+import db.pipeline.mongo_util as mg
 
 class Pipeline:
     """

diff --git a/pipeline/query.py b/pipeline/query.py
@@ -5,8 +5,8 @@
 from pydantic import BaseModel
 # from dotenv import load_dotenv
 
-import app_logger as log
-from pipeline.pipeline_class import Pipeline
+import db.app_logger as log
+from db.pipeline.pipeline_class import Pipeline
 # import pipeline.mongo_util as mutil
 # import pipeline.config_util as cutil
 

diff --git a/random/docdbtest/README.md b/random/docdbtest/README.md
diff --git a/random/docdbtest/env.template b/random/docdbtest/env.template
diff --git a/random/docdbtest/files/file1.txt b/random/docdbtest/files/file1.txt
diff --git a/random/docdbtest/files/file2.txt b/random/docdbtest/files/file2.txt
diff --git a/random/docdbtest/list_vectors.py b/random/docdbtest/list_vectors.py
diff --git a/random/docdbtest/load_vectors.py b/random/docdbtest/load_vectors.py
diff --git a/random/docdbtest/not_test_nodb.py b/random/docdbtest/not_test_nodb.py