Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

langchain_community: fix llama index imports and fields access #17870

Merged
merged 4 commits into from
Feb 26, 2024
Merged

langchain_community: fix llama index imports and fields access #17870

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58b7997
Fix : Fixing imports, metadata and content from Llamaindex retriever
Feb 21, 2024
d867499
Merge branch 'master' into master
maximeperrindev Feb 22, 2024
3174393
Fixing imports order for lint check
Feb 23, 2024
c4fa21f
Merge branch 'master' into master
maximeperrindev Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions libs/community/langchain_community/retrievers/llama_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def _get_relevant_documents(
) -> List[Document]:
"""Get documents relevant for a query."""
try:
from llama_index.indices.base import BaseGPTIndex
from llama_index.response.schema import Response
from llama_index.core.base.response.schema import Response
from llama_index.core.indices.base import BaseGPTIndex
except ImportError:
raise ImportError(
"You need to install `pip install llama-index` to use this retriever."
Expand All @@ -35,9 +35,9 @@ def _get_relevant_documents(
# parse source nodes
docs = []
for source_node in response.source_nodes:
metadata = source_node.extra_info or {}
metadata = source_node.metadata or {}
docs.append(
Document(page_content=source_node.source_text, metadata=metadata)
Document(page_content=source_node.get_content(), metadata=metadata)
)
return docs

Expand All @@ -58,11 +58,11 @@ def _get_relevant_documents(
) -> List[Document]:
"""Get documents relevant for a query."""
try:
from llama_index.composability.graph import (
from llama_index.core.base.response.schema import Response
from llama_index.core.composability.base import (
QUERY_CONFIG_TYPE,
ComposableGraph,
)
from llama_index.response.schema import Response
except ImportError:
raise ImportError(
"You need to install `pip install llama-index` to use this retriever."
Expand All @@ -79,8 +79,8 @@ def _get_relevant_documents(
# parse source nodes
docs = []
for source_node in response.source_nodes:
metadata = source_node.extra_info or {}
metadata = source_node.metadata or {}
docs.append(
Document(page_content=source_node.source_text, metadata=metadata)
Document(page_content=source_node.get_content(), metadata=metadata)
)
return docs