From 53836aaca610d1e32e8171eab62a89bf4954363e Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Fri, 11 Jul 2025 21:34:27 +0800 Subject: [PATCH] 'commit' --- ...ages · Issue #1244 · HKUDS_LightRAG.pdf} | Bin ...resql支持工作空间的代码修改.txt | 5 +++-- dsLightRag/Test/T1_WriteToPg.py | 2 +- dsLightRag/Test/T2_ReadFromPg.py | 3 ++- dsLightRag/Util/LightRagUtil.py | 8 ++------ .../__pycache__/LightRagUtil.cpython-310.pyc | Bin 4443 -> 4511 bytes 6 files changed, 8 insertions(+), 10 deletions(-) rename dsLightRag/Doc/{[Feature Suggestion]_ Change _ Pass Workspace Name in PgSQL Storages · Issue #1244 · HKUDS_LightRAG.pdf => 9、[Feature Suggestion]_ Change _ Pass Workspace Name in PgSQL Storages · Issue #1244 · HKUDS_LightRAG.pdf} (100%) 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 40c7464955963b5b2d0ff109fa0f9ed5a4b13058..015d4bde0fef5e3ddf946549e26b77f2f48c0691 100644 GIT binary patch delta 1112 zcmY*Y%~R7*5YJ27^fL(}jyhHlDq>*-6fZiCj)+tQN=p?ee#DTxme@3@F9C#+(StKy z^w4=1Z^}i-vqwGYINm&Ydg>qGMUS4G@ohhJ%p||;{&wH)W_Rf5?}5J~l+Ep({h?e_IR1ngs*C)|C5i$BJaA6OVXXY~6?D-{a zym;ke!4ib$0;6-m$0$j^1}D)$nhK3|ck|$+hXae0EE_v|6|+cHzdOF^V~wb;rOA zf@r2im<$4>)@r)H+EjUdZKYX&8m^-Wx)a`!PC$w=dMR>B%7A!@K8nnsJpCM*m8O8W zOb4Q8(L60hPoqV;6TO{cY8Lw&E~zXPe3$5D{3^g?TwTGYX*rO-%II*czc&ws%Vnb1 zRyD8bNftSmjt~(d=cykX{zTpu?}@ZW*?(W;yO79!hmtJefgoHV5Rb)kndyaACs=1L zGvOKqU-#F%HmBq=8E8UVS96&KZ19G(h)EWOZhAG{z-gH@TG8m8V%t@%>YCVwaUaKQ z_df!Lse7A_!S?-6`fdd~nrCfcM!zZjr=jC4R#|V4fOVR#!4;^m&5@hnq^vipYLkqf zQIiHswpeqeZO{zc(<&P}DSPQ?Yn1$ab4(IQ8o(_8$WC;C0Ecvd#TV!1r>C+RZDMMk z5HPIJr|KXYrtj6GStR{bx)LZTl5KDov)MG_H%Wq)A|w2@tiaOqMH@C;r(~50Y%mKs zYt`B&6P+5_&GklAjE;7koC2OtNTahs+wy!Cc1)cReY07m0q0DB5@F)eue`Bn&N zqlez4+`&xj%UYR?PS|cWe-U-i3BIt}4l#a^@n)?(ohUpO%3-P_89a3iGjD5VN_Rxm zv_Y`Mc2r2M?r8Q_*=70FjdB4szM^;;ba|rNyTqhXp`IT3p74E;v7gTPukhEvyiT9_ z=TL}#_0RJ+fEcDq)i9c(gHj!RP}PlQ>6@xMoj4fL?LCWZuf}bQXc_&`jU_#|p{LV^ znPC;>FdYbVwTB?5lp)&AmYOd|l3B(ne&Pc45G@3HnC9z18y^88Nr%~v=%77jy0Dt<5)Ue;5rIj6*wA`+(;&^#<>vpF?q zrS)ui1nMfjm{s9{wfw%B!t_{fWCMF5cO5``abUYp={K%TTPfy12^Ee+9qEFTwnE}2 zZP&J#sL9^5Lc$S^&9G8+`e5u}`7wB~VgL&Okd`cRTmwhk%v4+@VI{gaI~@tDlhcbN z?lk^KumSbazrpjN-*TOZJT9{C#6}_tiYT2#VII3N`!U!QT}WBxrja2qq9w1no7>qh zxy&6>$9$(4Ozr9scIyw-L)aN^citw%897hZ$lE2Knbru=_RGa3;M@|x3cxCZl211a Z2C+<%1PTM(0$2mM4Y1AzWX&bI{{f00C-eXS