'commit'

dsLightRag/Doc/Postgresql支持工作空间的代码修改.txt

@@ -1,8 +1,9 @@
+参考文档
 https://github.com/HKUDS/LightRAG/issues/1244
 
-# 源码路径
+源码路径
 D:\anaconda3\envs\py310\Lib\site-packages\lightrag
 
+修改的文件
 # 用VScode打开编辑，可以全局搜索
-
 D:\anaconda3\envs\py310\Lib\site-packages\lightrag\kg\postgres_impl.py

dsLightRag/Test/T1_WriteToPg.py

@@ -21,7 +21,7 @@ logging.basicConfig(format="%(levelname)s:%(message)s", level=logging.INFO)
 
 async def main():
     try:
-        rag = await initialize_pg_rag(WORKING_DIR=WORKING_DIR)
+        rag = await initialize_pg_rag(WORKING_DIR=WORKING_DIR,workspace='dsideal')
         with open(f"../Txt/sushi.txt", "r", encoding="utf-8") as f:
             await rag.ainsert(f.read())
     finally:

dsLightRag/Test/T2_ReadFromPg.py

@@ -26,7 +26,8 @@ logging.basicConfig(format="%(levelname)s:%(message)s", level=logging.INFO)
 
 async def main():
     try:
-        rag = await initialize_pg_rag(WORKING_DIR)
+        rag = await initialize_pg_rag(WORKING_DIR=WORKING_DIR, workspace='default')
+        #rag = await initialize_pg_rag(WORKING_DIR=WORKING_DIR, workspace='dsideal')
         resp = await rag.aquery(
             # "苏轼的家人都有谁？",
             "苏轼与美食",

dsLightRag/Util/LightRagUtil.py

@@ -152,7 +152,7 @@ os.environ["POSTGRES_PASSWORD"] = POSTGRES_PASSWORD
 os.environ["POSTGRES_DATABASE"] = POSTGRES_DATABASE
 
 
-async def initialize_pg_rag(WORKING_DIR):
+async def initialize_pg_rag(WORKING_DIR, workspace='default'):
     rag = LightRAG(
         working_dir=WORKING_DIR,
         llm_model_func=llm_model_func,
@@ -169,12 +169,8 @@ async def initialize_pg_rag(WORKING_DIR):
         doc_status_storage="PGDocStatusStorage",
         graph_storage="PGGraphStorage",
         vector_storage="PGVectorStorage",
-<<<<<<< HEAD
-        auto_manage_storages_states=False
-=======
         auto_manage_storages_states=False,
-        workspace='dsideal'
->>>>>>> ad0f8b29474086983be114604937eed80611fb97
+        vector_db_storage_cls_kwargs={"workspace": workspace}
     )
 
     await rag.initialize_storages()