From 8808ac0ed78a667bb06e6d6fca75808e13b2b495 Mon Sep 17 00:00:00 2001 From: Ben Chambers <35960+bjchambers@users.noreply.github.com> Date: Fri, 17 Jan 2025 09:57:42 -0800 Subject: [PATCH] update naming (#26) * update naming * fix lint/fmt --- .github/actions/setup-python-env/action.yml | 2 +- .github/workflows/main.yml | 6 +-- Makefile | 50 +++++++++---------- packages/graph-rag/README.md | 1 - packages/graph-retriever/README.md | 1 + .../pyproject.toml | 2 +- .../src/graph_retriever}/__init__.py | 0 .../tests/__init__.py | 0 packages/langchain-graph-rag/README.md | 1 - packages/langchain-graph-retriever/README.md | 1 + .../pyproject.toml | 2 +- .../langchain_graph_retriever}/__init__.py | 0 .../gliner_entity_extractor.py | 0 .../hierarchy_link_extractor.py | 0 .../html_hyperlink_extractor.py | 0 .../keybert_keyword_extractor.py | 0 .../metadata_denormalizer.py | 0 .../src/langchain_graph_retriever}/py.typed | 0 .../retrievers/edge.py | 0 .../retrievers/edge_helper.py | 0 .../retrievers/graph_traversal_retriever.py | 0 .../retrievers/node.py | 0 .../retrievers/store_adapters/__init__.py | 0 .../retrievers/store_adapters/astra.py | 0 .../retrievers/store_adapters/base.py | 0 .../retrievers/store_adapters/cassandra.py | 0 .../retrievers/store_adapters/chroma.py | 0 .../retrievers/store_adapters/in_memory.py | 0 .../retrievers/store_adapters/open_search.py | 0 .../retrievers/strategy/__init__.py | 0 .../retrievers/strategy/base.py | 0 .../retrievers/strategy/eager.py | 0 .../retrievers/strategy/mmr.py | 2 +- .../retrievers/strategy/scored.py | 0 .../langchain_graph_retriever}/utils/math.py | 0 .../tests/__init__.py | 0 .../tests/conftest.py | 0 .../tests/embeddings/__init__.py | 0 .../tests/embeddings/simple_embeddings.py | 0 .../tests/integration_tests/assertions.py | 0 .../tests/integration_tests/conftest.py | 0 .../tests/integration_tests/invoker.py | 0 .../retrievers/animal_docs.py | 7 ++- .../integration_tests/retrievers/conftest.py | 0 .../retrievers/earth_docs.py | 2 +- .../retrievers/parser_docs.py | 0 .../retrievers/test_graph_traversal_eager.py | 4 +- .../retrievers/test_graph_traversal_mmr.py | 6 +-- .../tests/integration_tests/stores.py | 14 +++--- .../unit_tests/retrievers/test_edge_helper.py | 4 +- .../test_generic_graph_traversal.py | 2 +- pyproject.toml | 6 +-- uv.lock | 16 +++--- 53 files changed, 67 insertions(+), 62 deletions(-) delete mode 100644 packages/graph-rag/README.md create mode 100644 packages/graph-retriever/README.md rename packages/{graph-rag => graph-retriever}/pyproject.toml (93%) rename packages/{graph-rag/src/graph_rag => graph-retriever/src/graph_retriever}/__init__.py (100%) rename packages/{graph-rag => graph-retriever}/tests/__init__.py (100%) delete mode 100644 packages/langchain-graph-rag/README.md create mode 100644 packages/langchain-graph-retriever/README.md rename packages/{langchain-graph-rag => langchain-graph-retriever}/pyproject.toml (97%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/__init__.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/document_transformers/gliner_entity_extractor.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/document_transformers/hierarchy_link_extractor.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/document_transformers/html_hyperlink_extractor.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/document_transformers/keybert_keyword_extractor.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/document_transformers/metadata_denormalizer.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/py.typed (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/edge.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/edge_helper.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/graph_traversal_retriever.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/node.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/store_adapters/__init__.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/store_adapters/astra.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/store_adapters/base.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/store_adapters/cassandra.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/store_adapters/chroma.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/store_adapters/in_memory.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/store_adapters/open_search.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/strategy/__init__.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/strategy/base.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/strategy/eager.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/strategy/mmr.py (99%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/retrievers/strategy/scored.py (100%) rename packages/{langchain-graph-rag/src/langchain_graph_rag => langchain-graph-retriever/src/langchain_graph_retriever}/utils/math.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/__init__.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/conftest.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/embeddings/__init__.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/embeddings/simple_embeddings.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/assertions.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/conftest.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/invoker.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/retrievers/animal_docs.py (85%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/retrievers/conftest.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/retrievers/earth_docs.py (93%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/retrievers/parser_docs.py (100%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/retrievers/test_graph_traversal_eager.py (97%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/retrievers/test_graph_traversal_mmr.py (96%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/integration_tests/stores.py (94%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/unit_tests/retrievers/test_edge_helper.py (96%) rename packages/{langchain-graph-rag => langchain-graph-retriever}/tests/unit_tests/retrievers/test_generic_graph_traversal.py (83%) diff --git a/.github/actions/setup-python-env/action.yml b/.github/actions/setup-python-env/action.yml index e7952577..0d09f76f 100644 --- a/.github/actions/setup-python-env/action.yml +++ b/.github/actions/setup-python-env/action.yml @@ -17,5 +17,5 @@ runs: cache-suffix: ${{ matrix.python-version }} - name: Install Python dependencies - run: uv sync --frozen --package langchain-graph-rag + run: uv sync --frozen --package langchain-graph-retriever shell: bash \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7aaad545..e598c6ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,9 +68,9 @@ jobs: - name: Run `make test` run: - uv run --package langchain-graph-rag python -m pytest -vs - ./packages/langchain-graph-rag/tests/unit_tests/ - ./packages/langchain-graph-rag/tests/integration_tests/ + uv run --package langchain-graph-retriever python -m pytest -vs + ./packages/langchain-graph-retriever/tests/unit_tests/ + ./packages/langchain-graph-retriever/tests/integration_tests/ --stores=mem_norm --stores=mem --stores=cassandra --stores=chroma --stores=opensearch --junitxml=junit/test-results-${{ matrix.python-version }}.xml diff --git a/Makefile b/Makefile index e58159cc..ba7cfa3f 100644 --- a/Makefile +++ b/Makefile @@ -31,12 +31,12 @@ lock: .PHONY: deptry-gr deptry-lgr deptry deptry-gr: - @echo "🚀 Checking for obsolete dependencies: Running deptry on graph-rag" - cd packages/graph-rag && uvx $(DEPTRY) src tests + @echo "🚀 Checking for obsolete dependencies: Running deptry on graph-retriever" + cd packages/graph-retriever && uvx $(DEPTRY) src tests deptry-lgr: - @echo "🚀 Checking for obsolete dependencies: Running deptry on langchain-graph-rag" - cd packages/langchain-graph-rag && uvx $(DEPTRY) src tests + @echo "🚀 Checking for obsolete dependencies: Running deptry on langchain-graph-retriever" + cd packages/langchain-graph-retriever && uvx $(DEPTRY) src tests deptry: deptry-gr deptry-lgr @@ -49,42 +49,42 @@ docker-up: docker-down: docker compose down --rmi local -.PHONY: sync-langchain-graph-rag -sync-langchain-graph-rag: - @uv sync --package langchain-graph-rag +.PHONY: sync-langchain-graph-retriever +sync-langchain-graph-retriever: + @uv sync --package langchain-graph-retriever -.PHONY: sync-graph-rag -sync-graph-rag: - @uv sync --package graph-rag +.PHONY: sync-graph-retriever +sync-graph-retriever: + @uv sync --package graph-retriever .PHONY: integration integration: - @echo "🚀 Testing code: Running pytest ./packages/langchain-graph-rag/tests/integration_tests (in memory only)" - @uv run --project langchain-graph-rag pytest -vs ./packages/langchain-graph-rag/tests/integration_tests/ + @echo "🚀 Testing code: Running pytest ./packages/langchain-graph-retriever/tests/integration_tests (in memory only)" + @uv run --package langchain-graph-retriever pytest -vs ./packages/langchain-graph-retriever/tests/integration_tests/ .PHONY: unit unit: - @echo "🚀 Testing code: Running pytest ./packages/langchain-graph-rag/tests/unit_tests/" - @uv run --project langchain-graph-rag pytest -vs ./packages/langchain-graph-rag/tests/unit_tests/ + @echo "🚀 Testing code: Running pytest ./packages/langchain-graph-retriever/tests/unit_tests/" + @uv run --package langchain-graph-retriever pytest -vs ./packages/langchain-graph-retriever/tests/unit_tests/ .PHONY: test -test: sync-langchain-graph-rag +test: sync-langchain-graph-retriever @echo "🚀 Testing code: Running pytest" - @uv run --project langchain-graph-rag python -m pytest -vs ./packages/langchain-graph-rag/tests/ --stores=all + @cd packages/langchain-graph-retriever && uv run pytest -vs ./tests/unit_tests ./tests/integration_tests --stores=all .PHONY: mypy mypy: @echo "🚀 Static type checking: Running mypy" - @uv run --project langchain-graph-rag mypy ./packages/langchain-graph-rag + @uv run --package langchain-graph-retriever mypy ./packages/langchain-graph-retriever lint: fmt fix mypy -.PHONY: build-langchain-graph-rag -build-langchain-graph-rag: sync-langchain-graph-rag - @echo "🚀 Building langchain-graph-rag package" - @uv build --package langchain-graph-rag +.PHONY: build-langchain-graph-retriever +build-langchain-graph-retriever: sync-langchain-graph-retriever + @echo "🚀 Building langchain-graph-retriever package" + @uv build --package langchain-graph-retriever -.PHONY: build-graph-rag -build-graph-rag: sync-graph-rag - @echo "🚀 Building graph-rag package" - @uv build --package graph-rag +.PHONY: build-graph-retriever +build-graph-retriever: sync-graph-retriever + @echo "🚀 Building graph-retriever package" + @uv build --package graph-retriever diff --git a/packages/graph-rag/README.md b/packages/graph-rag/README.md deleted file mode 100644 index 8cee2dbb..00000000 --- a/packages/graph-rag/README.md +++ /dev/null @@ -1 +0,0 @@ -# graph-rag diff --git a/packages/graph-retriever/README.md b/packages/graph-retriever/README.md new file mode 100644 index 00000000..ab66deb7 --- /dev/null +++ b/packages/graph-retriever/README.md @@ -0,0 +1 @@ +# graph-retriever diff --git a/packages/graph-rag/pyproject.toml b/packages/graph-retriever/pyproject.toml similarity index 93% rename from packages/graph-rag/pyproject.toml rename to packages/graph-retriever/pyproject.toml index aa3447ac..81f318a3 100644 --- a/packages/graph-rag/pyproject.toml +++ b/packages/graph-retriever/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "graph-rag" +name = "graph-retriever" version = "0.0.0" description = "Add your description here" readme = "README.md" diff --git a/packages/graph-rag/src/graph_rag/__init__.py b/packages/graph-retriever/src/graph_retriever/__init__.py similarity index 100% rename from packages/graph-rag/src/graph_rag/__init__.py rename to packages/graph-retriever/src/graph_retriever/__init__.py diff --git a/packages/graph-rag/tests/__init__.py b/packages/graph-retriever/tests/__init__.py similarity index 100% rename from packages/graph-rag/tests/__init__.py rename to packages/graph-retriever/tests/__init__.py diff --git a/packages/langchain-graph-rag/README.md b/packages/langchain-graph-rag/README.md deleted file mode 100644 index a8ad6084..00000000 --- a/packages/langchain-graph-rag/README.md +++ /dev/null @@ -1 +0,0 @@ -# langchain-graph-rag diff --git a/packages/langchain-graph-retriever/README.md b/packages/langchain-graph-retriever/README.md new file mode 100644 index 00000000..b4cac573 --- /dev/null +++ b/packages/langchain-graph-retriever/README.md @@ -0,0 +1 @@ +# langchain-graph-retriever diff --git a/packages/langchain-graph-rag/pyproject.toml b/packages/langchain-graph-retriever/pyproject.toml similarity index 97% rename from packages/langchain-graph-rag/pyproject.toml rename to packages/langchain-graph-retriever/pyproject.toml index 4e2cca7f..ee4a59ca 100644 --- a/packages/langchain-graph-rag/pyproject.toml +++ b/packages/langchain-graph-retriever/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "langchain-graph-rag" +name = "langchain-graph-retriever" version = "0.0.1" description = "Add your description here" readme = "README.md" diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/__init__.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/__init__.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/__init__.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/__init__.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/gliner_entity_extractor.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/gliner_entity_extractor.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/gliner_entity_extractor.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/gliner_entity_extractor.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/hierarchy_link_extractor.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/hierarchy_link_extractor.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/hierarchy_link_extractor.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/hierarchy_link_extractor.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/html_hyperlink_extractor.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/html_hyperlink_extractor.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/html_hyperlink_extractor.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/html_hyperlink_extractor.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/keybert_keyword_extractor.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/keybert_keyword_extractor.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/keybert_keyword_extractor.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/keybert_keyword_extractor.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/metadata_denormalizer.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/metadata_denormalizer.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/document_transformers/metadata_denormalizer.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/document_transformers/metadata_denormalizer.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/py.typed b/packages/langchain-graph-retriever/src/langchain_graph_retriever/py.typed similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/py.typed rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/py.typed diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/edge.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/edge.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/edge.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/edge.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/edge_helper.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/edge_helper.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/edge_helper.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/edge_helper.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/graph_traversal_retriever.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/graph_traversal_retriever.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/graph_traversal_retriever.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/graph_traversal_retriever.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/node.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/node.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/node.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/node.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/__init__.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/__init__.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/__init__.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/__init__.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/astra.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/astra.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/astra.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/astra.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/base.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/base.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/base.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/base.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/cassandra.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/cassandra.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/cassandra.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/cassandra.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/chroma.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/chroma.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/chroma.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/chroma.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/in_memory.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/in_memory.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/in_memory.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/in_memory.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/open_search.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/open_search.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/store_adapters/open_search.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/store_adapters/open_search.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/__init__.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/__init__.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/__init__.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/__init__.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/base.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/base.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/base.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/base.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/eager.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/eager.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/eager.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/eager.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/mmr.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/mmr.py similarity index 99% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/mmr.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/mmr.py index 7fa9381b..034152a4 100644 --- a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/mmr.py +++ b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/mmr.py @@ -3,7 +3,7 @@ from typing import Iterable import numpy as np -from langchain_graph_rag.utils.math import cosine_similarity +from langchain_graph_retriever.utils.math import cosine_similarity from numpy.typing import NDArray from pydantic import Field diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/scored.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/scored.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/retrievers/strategy/scored.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/retrievers/strategy/scored.py diff --git a/packages/langchain-graph-rag/src/langchain_graph_rag/utils/math.py b/packages/langchain-graph-retriever/src/langchain_graph_retriever/utils/math.py similarity index 100% rename from packages/langchain-graph-rag/src/langchain_graph_rag/utils/math.py rename to packages/langchain-graph-retriever/src/langchain_graph_retriever/utils/math.py diff --git a/packages/langchain-graph-rag/tests/__init__.py b/packages/langchain-graph-retriever/tests/__init__.py similarity index 100% rename from packages/langchain-graph-rag/tests/__init__.py rename to packages/langchain-graph-retriever/tests/__init__.py diff --git a/packages/langchain-graph-rag/tests/conftest.py b/packages/langchain-graph-retriever/tests/conftest.py similarity index 100% rename from packages/langchain-graph-rag/tests/conftest.py rename to packages/langchain-graph-retriever/tests/conftest.py diff --git a/packages/langchain-graph-rag/tests/embeddings/__init__.py b/packages/langchain-graph-retriever/tests/embeddings/__init__.py similarity index 100% rename from packages/langchain-graph-rag/tests/embeddings/__init__.py rename to packages/langchain-graph-retriever/tests/embeddings/__init__.py diff --git a/packages/langchain-graph-rag/tests/embeddings/simple_embeddings.py b/packages/langchain-graph-retriever/tests/embeddings/simple_embeddings.py similarity index 100% rename from packages/langchain-graph-rag/tests/embeddings/simple_embeddings.py rename to packages/langchain-graph-retriever/tests/embeddings/simple_embeddings.py diff --git a/packages/langchain-graph-rag/tests/integration_tests/assertions.py b/packages/langchain-graph-retriever/tests/integration_tests/assertions.py similarity index 100% rename from packages/langchain-graph-rag/tests/integration_tests/assertions.py rename to packages/langchain-graph-retriever/tests/integration_tests/assertions.py diff --git a/packages/langchain-graph-rag/tests/integration_tests/conftest.py b/packages/langchain-graph-retriever/tests/integration_tests/conftest.py similarity index 100% rename from packages/langchain-graph-rag/tests/integration_tests/conftest.py rename to packages/langchain-graph-retriever/tests/integration_tests/conftest.py diff --git a/packages/langchain-graph-rag/tests/integration_tests/invoker.py b/packages/langchain-graph-retriever/tests/integration_tests/invoker.py similarity index 100% rename from packages/langchain-graph-rag/tests/integration_tests/invoker.py rename to packages/langchain-graph-retriever/tests/integration_tests/invoker.py diff --git a/packages/langchain-graph-rag/tests/integration_tests/retrievers/animal_docs.py b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/animal_docs.py similarity index 85% rename from packages/langchain-graph-rag/tests/integration_tests/retrievers/animal_docs.py rename to packages/langchain-graph-retriever/tests/integration_tests/retrievers/animal_docs.py index 0c3c7052..42b698bb 100644 --- a/packages/langchain-graph-rag/tests/integration_tests/retrievers/animal_docs.py +++ b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/animal_docs.py @@ -1,4 +1,5 @@ import json +import os import pytest from langchain_core.documents import Document @@ -9,7 +10,11 @@ @pytest.fixture(scope="session") def animal_docs() -> list[Document]: documents = [] - with open("data/animals.jsonl", "r") as file: + + path = os.path.abspath( + os.path.join(os.path.dirname(__file__), "../../../../../data/animals.jsonl") + ) + with open(path, "r") as file: for line in file: data = json.loads(line.strip()) documents.append( diff --git a/packages/langchain-graph-rag/tests/integration_tests/retrievers/conftest.py b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/conftest.py similarity index 100% rename from packages/langchain-graph-rag/tests/integration_tests/retrievers/conftest.py rename to packages/langchain-graph-retriever/tests/integration_tests/retrievers/conftest.py diff --git a/packages/langchain-graph-rag/tests/integration_tests/retrievers/earth_docs.py b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/earth_docs.py similarity index 93% rename from packages/langchain-graph-rag/tests/integration_tests/retrievers/earth_docs.py rename to packages/langchain-graph-retriever/tests/integration_tests/retrievers/earth_docs.py index de8151ae..f5ec9962 100644 --- a/packages/langchain-graph-rag/tests/integration_tests/retrievers/earth_docs.py +++ b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/earth_docs.py @@ -1,6 +1,6 @@ import pytest from langchain_core.documents import Document -from langchain_graph_rag.retrievers.store_adapters import StoreAdapter +from langchain_graph_retriever.retrievers.store_adapters import StoreAdapter from tests.embeddings.simple_embeddings import EarthEmbeddings from tests.integration_tests.stores import StoreFactory diff --git a/packages/langchain-graph-rag/tests/integration_tests/retrievers/parser_docs.py b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/parser_docs.py similarity index 100% rename from packages/langchain-graph-rag/tests/integration_tests/retrievers/parser_docs.py rename to packages/langchain-graph-retriever/tests/integration_tests/retrievers/parser_docs.py diff --git a/packages/langchain-graph-rag/tests/integration_tests/retrievers/test_graph_traversal_eager.py b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/test_graph_traversal_eager.py similarity index 97% rename from packages/langchain-graph-rag/tests/integration_tests/retrievers/test_graph_traversal_eager.py rename to packages/langchain-graph-retriever/tests/integration_tests/retrievers/test_graph_traversal_eager.py index a416abf8..e3163eac 100644 --- a/packages/langchain-graph-rag/tests/integration_tests/retrievers/test_graph_traversal_eager.py +++ b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/test_graph_traversal_eager.py @@ -1,8 +1,8 @@ from langchain_core.documents import Document -from langchain_graph_rag.retrievers.graph_traversal_retriever import ( +from langchain_graph_retriever.retrievers.graph_traversal_retriever import ( GraphTraversalRetriever, ) -from langchain_graph_rag.retrievers.strategy.eager import ( +from langchain_graph_retriever.retrievers.strategy.eager import ( Eager, ) from tests.integration_tests.assertions import assert_document_format, sorted_doc_ids diff --git a/packages/langchain-graph-rag/tests/integration_tests/retrievers/test_graph_traversal_mmr.py b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/test_graph_traversal_mmr.py similarity index 96% rename from packages/langchain-graph-rag/tests/integration_tests/retrievers/test_graph_traversal_mmr.py rename to packages/langchain-graph-retriever/tests/integration_tests/retrievers/test_graph_traversal_mmr.py index 438e99b2..fc4983df 100644 --- a/packages/langchain-graph-rag/tests/integration_tests/retrievers/test_graph_traversal_mmr.py +++ b/packages/langchain-graph-retriever/tests/integration_tests/retrievers/test_graph_traversal_mmr.py @@ -1,12 +1,12 @@ from langchain_core.documents import Document from langchain_core.vectorstores import InMemoryVectorStore -from langchain_graph_rag.retrievers.graph_traversal_retriever import ( +from langchain_graph_retriever.retrievers.graph_traversal_retriever import ( GraphTraversalRetriever, ) -from langchain_graph_rag.retrievers.store_adapters.in_memory import ( +from langchain_graph_retriever.retrievers.store_adapters.in_memory import ( InMemoryStoreAdapter, ) -from langchain_graph_rag.retrievers.strategy.mmr import ( +from langchain_graph_retriever.retrievers.strategy.mmr import ( Mmr, ) from tests.embeddings.simple_embeddings import Angular2DEmbeddings diff --git a/packages/langchain-graph-rag/tests/integration_tests/stores.py b/packages/langchain-graph-retriever/tests/integration_tests/stores.py similarity index 94% rename from packages/langchain-graph-rag/tests/integration_tests/stores.py rename to packages/langchain-graph-retriever/tests/integration_tests/stores.py index 910481f4..0ac746ed 100644 --- a/packages/langchain-graph-rag/tests/integration_tests/stores.py +++ b/packages/langchain-graph-retriever/tests/integration_tests/stores.py @@ -5,10 +5,10 @@ from langchain_core.documents import Document from langchain_core.embeddings import Embeddings from langchain_core.vectorstores import VectorStore -from langchain_graph_rag.document_transformers.metadata_denormalizer import ( +from langchain_graph_retriever.document_transformers.metadata_denormalizer import ( MetadataDenormalizer, ) -from langchain_graph_rag.retrievers.store_adapters import StoreAdapter +from langchain_graph_retriever.retrievers.store_adapters import StoreAdapter ALL_STORES = ["mem_norm", "mem", "astra", "cassandra", "chroma", "opensearch"] TESTCONTAINER_STORES = ["cassandra", "opensearch"] @@ -85,7 +85,7 @@ def _cassandra_store_factory(request: pytest.FixtureRequest): from cassandra.cluster import Cluster # type: ignore from langchain_community.vectorstores.cassandra import Cassandra - from langchain_graph_rag.retrievers.store_adapters.cassandra import ( + from langchain_graph_retriever.retrievers.store_adapters.cassandra import ( CassandraStoreAdapter, ) @@ -148,7 +148,7 @@ def teardown_cassandra(cassandra: Cassandra): def _opensearch_store_factory(request: pytest.FixtureRequest): from langchain_community.vectorstores import OpenSearchVectorSearch - from langchain_graph_rag.retrievers.store_adapters.open_search import ( + from langchain_graph_retriever.retrievers.store_adapters.open_search import ( OpenSearchStoreAdapter, ) @@ -201,7 +201,7 @@ def _astra_store_factory(_request: pytest.FixtureRequest) -> StoreFactory: from astrapy.authentication import StaticTokenProvider from dotenv import load_dotenv from langchain_astradb import AstraDBVectorStore - from langchain_graph_rag.retrievers.store_adapters.astra import ( + from langchain_graph_retriever.retrievers.store_adapters.astra import ( AstraStoreAdapter, ) @@ -248,7 +248,7 @@ def _in_memory_store_factory( _request: pytest.FixtureRequest, support_normalized_metadata: bool ) -> StoreFactory: from langchain_core.vectorstores import InMemoryVectorStore - from langchain_graph_rag.retrievers.store_adapters.in_memory import ( + from langchain_graph_retriever.retrievers.store_adapters.in_memory import ( InMemoryStoreAdapter, ) @@ -269,7 +269,7 @@ def create_in_memory( def _chroma_store_factory(_request: pytest.FixtureRequest) -> StoreFactory: from langchain_chroma.vectorstores import Chroma - from langchain_graph_rag.retrievers.store_adapters.chroma import ( + from langchain_graph_retriever.retrievers.store_adapters.chroma import ( ChromaStoreAdapter, ) diff --git a/packages/langchain-graph-rag/tests/unit_tests/retrievers/test_edge_helper.py b/packages/langchain-graph-retriever/tests/unit_tests/retrievers/test_edge_helper.py similarity index 96% rename from packages/langchain-graph-rag/tests/unit_tests/retrievers/test_edge_helper.py rename to packages/langchain-graph-retriever/tests/unit_tests/retrievers/test_edge_helper.py index 99d1e91f..c6732f3b 100644 --- a/packages/langchain-graph-rag/tests/unit_tests/retrievers/test_edge_helper.py +++ b/packages/langchain-graph-retriever/tests/unit_tests/retrievers/test_edge_helper.py @@ -1,6 +1,6 @@ import pytest -from langchain_graph_rag.retrievers.edge import Edge -from langchain_graph_rag.retrievers.edge_helper import EdgeHelper +from langchain_graph_retriever.retrievers.edge import Edge +from langchain_graph_retriever.retrievers.edge_helper import EdgeHelper def test_edge_helper_initialization(): diff --git a/packages/langchain-graph-rag/tests/unit_tests/retrievers/test_generic_graph_traversal.py b/packages/langchain-graph-retriever/tests/unit_tests/retrievers/test_generic_graph_traversal.py similarity index 83% rename from packages/langchain-graph-rag/tests/unit_tests/retrievers/test_generic_graph_traversal.py rename to packages/langchain-graph-retriever/tests/unit_tests/retrievers/test_generic_graph_traversal.py index 4831490e..39ff1c8d 100644 --- a/packages/langchain-graph-rag/tests/unit_tests/retrievers/test_generic_graph_traversal.py +++ b/packages/langchain-graph-retriever/tests/unit_tests/retrievers/test_generic_graph_traversal.py @@ -1,4 +1,4 @@ -from langchain_graph_rag.retrievers.strategy.mmr import Mmr +from langchain_graph_retriever.retrievers.strategy.mmr import Mmr def test_mmr_parameters() -> None: diff --git a/pyproject.toml b/pyproject.toml index d192ad35..8e0a13dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "graph-rag-workspace" +name = "graph-retriever-workspace" version = "0.1.0" description = "uv workspace for Graph RAG projects" readme = "README.md" @@ -41,6 +41,6 @@ skip_empty = true [tool.coverage.run] branch = true source = [ - "packages/graph-rag/src/graph_rag", - "packages/langchain-graph-rag/src/langchain_graph_rag", + "packages/graph-retriever/src/graph_retriever", + "packages/langchain-graph-retriever/src/langchain_graph_retriever", ] diff --git a/uv.lock b/uv.lock index 1cd5e3b8..7445b764 100644 --- a/uv.lock +++ b/uv.lock @@ -8,9 +8,9 @@ resolution-markers = [ [manifest] members = [ - "graph-rag", - "graph-rag-workspace", - "langchain-graph-rag", + "graph-retriever", + "graph-retriever-workspace", + "langchain-graph-retriever", ] [[package]] @@ -787,9 +787,9 @@ wheels = [ ] [[package]] -name = "graph-rag" +name = "graph-retriever" version = "0.0.0" -source = { editable = "packages/graph-rag" } +source = { editable = "packages/graph-retriever" } [package.metadata] @@ -797,7 +797,7 @@ source = { editable = "packages/graph-rag" } dev = [] [[package]] -name = "graph-rag-workspace" +name = "graph-retriever-workspace" version = "0.1.0" source = { virtual = "." } @@ -1271,9 +1271,9 @@ wheels = [ ] [[package]] -name = "langchain-graph-rag" +name = "langchain-graph-retriever" version = "0.0.1" -source = { editable = "packages/langchain-graph-rag" } +source = { editable = "packages/langchain-graph-retriever" } dependencies = [ { name = "langchain-core" }, { name = "numpy" },