diff --git a/dsLightRag/Doc/[Feature Suggestion]_ Change _ Pass Workspace Name in PgSQL Storages · Issue #1244 · HKUDS_LightRAG.pdf b/dsLightRag/Doc/9、[Feature Suggestion]_ Change _ Pass Workspace Name in PgSQL Storages · Issue #1244 · HKUDS_LightRAG.pdf similarity index 100% rename from dsLightRag/Doc/[Feature Suggestion]_ Change _ Pass Workspace Name in PgSQL Storages · Issue #1244 · HKUDS_LightRAG.pdf rename to dsLightRag/Doc/9、[Feature Suggestion]_ Change _ Pass Workspace Name in PgSQL Storages · Issue #1244 · HKUDS_LightRAG.pdf diff --git a/dsLightRag/Doc/Postgresql支持工作空间的代码修改.txt b/dsLightRag/Doc/Postgresql支持工作空间的代码修改.txt index 5ab3f8c2..9d0eb07e 100644 --- a/dsLightRag/Doc/Postgresql支持工作空间的代码修改.txt +++ b/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 \ No newline at end of file diff --git a/dsLightRag/Test/T1_WriteToPg.py b/dsLightRag/Test/T1_WriteToPg.py index 58aedb6c..ab0a4bb0 100644 --- a/dsLightRag/Test/T1_WriteToPg.py +++ b/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: diff --git a/dsLightRag/Test/T2_ReadFromPg.py b/dsLightRag/Test/T2_ReadFromPg.py index bb31a6e7..b4d73d3e 100644 --- a/dsLightRag/Test/T2_ReadFromPg.py +++ b/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( # "苏轼的家人都有谁?", "苏轼与美食", diff --git a/dsLightRag/Util/LightRagUtil.py b/dsLightRag/Util/LightRagUtil.py index 5a5b012c..9e42b8d7 100644 --- a/dsLightRag/Util/LightRagUtil.py +++ b/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() diff --git a/dsLightRag/Util/__pycache__/LightRagUtil.cpython-310.pyc b/dsLightRag/Util/__pycache__/LightRagUtil.cpython-310.pyc index 40c74649..015d4bde 100644 Binary files a/dsLightRag/Util/__pycache__/LightRagUtil.cpython-310.pyc and b/dsLightRag/Util/__pycache__/LightRagUtil.cpython-310.pyc differ