From 7b3736972c65f6bc9ca13e2442ec91457cb7cd21 Mon Sep 17 00:00:00 2001 From: Mark Sze <66362098+marklysze@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:20:47 +1100 Subject: [PATCH 1/5] Setup.py > underscores to hyphens fix --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a5a71db02a..ee4db82ca8 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ "retrievechat-pgvector": retrieve_chat_pgvector, "retrievechat-mongodb": [*retrieve_chat, "pymongo>=4.0.0"], "retrievechat-qdrant": [*retrieve_chat, "qdrant_client", "fastembed>=0.3.1"], - "graph_rag_falkor_db": graph_rag_falkor_db, + "graph-rag-falkor-db": graph_rag_falkor_db, "autobuild": autobuild, "captainagent": autobuild + ["pandas"], "teachable": ["chromadb"], From c31b375fc0b3cde9cc9c66a22fa5cd71413f7a27 Mon Sep 17 00:00:00 2001 From: Mark Sze <66362098+marklysze@users.noreply.github.com> Date: Wed, 11 Dec 2024 10:43:20 +1100 Subject: [PATCH 2/5] Update setup.py Added comment for future editors --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index ee4db82ca8..fce7ff0afe 100644 --- a/setup.py +++ b/setup.py @@ -76,6 +76,9 @@ # pysqlite3-binary used so it doesn't need to compile pysqlite3 autobuild = ["chromadb", "sentence-transformers", "huggingface-hub", "pysqlite3-binary"] +# NOTE: underscores in pip install, e.g. pip install ag2[graph_rag_falkor_db], will automatically +# convert to hyphens. So, do not include underscores in the name of extras. + extra_require = { "test": [ "ipykernel", From 96801fca459ed95b694b7ee05d674f407e2eda58 Mon Sep 17 00:00:00 2001 From: Mark Sze <66362098+marklysze@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:26:56 +1100 Subject: [PATCH 3/5] Update agentchat_swarm_graphrag_trip_planner.ipynb --- notebook/agentchat_swarm_graphrag_trip_planner.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/agentchat_swarm_graphrag_trip_planner.ipynb b/notebook/agentchat_swarm_graphrag_trip_planner.ipynb index 13a2763028..26a400e2f6 100644 --- a/notebook/agentchat_swarm_graphrag_trip_planner.ipynb +++ b/notebook/agentchat_swarm_graphrag_trip_planner.ipynb @@ -25,7 +25,7 @@ "FalkorDB's GraphRAG-SDK is a dependency for this notebook, which can be installed with ag2 via pip:\n", "\n", "```bash\n", - "pip install ag2[graph_rag_falkor_db]\n", + "pip install ag2[graph-rag-falkor-db]\n", "```\n", "\n", "For more information, please refer to the [installation guide](/docs/installation/).\n", From 5885889968cc64c75e9e4bbcafe4f67ca7c39f85 Mon Sep 17 00:00:00 2001 From: Mark Sze <66362098+marklysze@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:27:39 +1100 Subject: [PATCH 4/5] Update contrib-graph-rag-tests.yml --- .github/workflows/contrib-graph-rag-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contrib-graph-rag-tests.yml b/.github/workflows/contrib-graph-rag-tests.yml index d5b2a9ef6b..04bb67c568 100644 --- a/.github/workflows/contrib-graph-rag-tests.yml +++ b/.github/workflows/contrib-graph-rag-tests.yml @@ -45,7 +45,7 @@ jobs: pip install pytest - name: Install FalkorDB SDK when on linux run: | - pip install -e .[graph_rag_falkor_db] + pip install -e .[graph-rag-falkor-db] - name: Set AUTOGEN_USE_DOCKER based on OS shell: bash run: | From 528aa3962acafd6b673c5e5278b85683d527b268 Mon Sep 17 00:00:00 2001 From: Mark Sze <66362098+marklysze@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:28:36 +1100 Subject: [PATCH 5/5] Update agentchat_graph_rag_falkordb.ipynb --- notebook/agentchat_graph_rag_falkordb.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/agentchat_graph_rag_falkordb.ipynb b/notebook/agentchat_graph_rag_falkordb.ipynb index b1802dfe18..4697da6a9a 100644 --- a/notebook/agentchat_graph_rag_falkordb.ipynb +++ b/notebook/agentchat_graph_rag_falkordb.ipynb @@ -13,7 +13,7 @@ "FalkorDB's GraphRAG-SDK is a dependency for this notebook, which can be installed with ag2 via pip:\n", "\n", "```bash\n", - "pip install ag2[graph_rag_falkor_db]\n", + "pip install ag2[graph-rag-falkor-db]\n", "```\n", "\n", "or if you have already installed ag2/autogen/pyautogen\n",