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

add option for string node representation update #16100

Merged
merged 5 commits into from
Sep 23, 2024
+33 −6
Merged

add option for string node representation update #16100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94c3365
Revert unintended consequence of string node representation update in…
prrao87 Sep 19, 2024
979b06c
Allow toggle for pretty printing nodes with/without properties
prrao87 Sep 19, 2024
f6b21d3
Merge branch 'main' into fix-node-string-print
logan-markewich Sep 19, 2024
b8e9fe9
Merge branch 'main' into fix-node-string-print
logan-markewich Sep 23, 2024
39fe82c
revert changes to str
logan-markewich Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion llama-index-core/llama_index/core/indices/property_graph/sub_retrievers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ def __init__(
graph_store: PropertyGraphStore,
include_text: bool = True,
include_text_preamble: Optional[str] = DEFAULT_PREAMBLE,
include_properties: bool = False,
**kwargs: Any,
) -> None:
self._graph_store = graph_store
self.include_text = include_text
self._include_text_preamble = include_text_preamble
self.include_properties = include_properties
super().__init__(callback_manager=kwargs.get("callback_manager", None))

def _get_nodes_with_score(
Expand All @@ -57,7 +59,10 @@ def _get_nodes_with_score(
node_id=source_id
)

text = f"{triplet[0]!s} -> {triplet[1]!s} -> {triplet[2]!s}"
if self.include_properties:
text = f"{triplet[0]!s} -> {triplet[1]!s} -> {triplet[2]!s}"
else:
text = f"{triplet[0].id} -> {triplet[1].id} -> {triplet[2].id}"
results.append(
NodeWithScore(
node=TextNode(
Expand Down
8 changes: 7 additions & 1 deletion llama-index-core/llama_index/core/indices/property_graph/sub_retrievers/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@ def __init__(
self,
graph_store: PropertyGraphStore,
include_text: bool = False,
include_properties: bool = False,
**kwargs: Any,
) -> None:
super().__init__(graph_store=graph_store, include_text=include_text, **kwargs)
super().__init__(
graph_store=graph_store,
include_text=include_text,
include_properties=include_properties,
**kwargs,
)
self.init(**kwargs)

@property
Expand Down
4 changes: 3 additions & 1 deletion llama-index-core/llama_index/core/indices/property_graph/sub_retrievers/cypher_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ def __init__(
self.output_cls = output_cls
self.cypher_query = cypher_query

super().__init__(graph_store=graph_store, include_text=False)
super().__init__(
graph_store=graph_store, include_text=False, include_properties=False
)

def retrieve_from_graph(self, query_bundle: QueryBundle) -> List[NodeWithScore]:
question = query_bundle.query_str
Expand Down
8 changes: 7 additions & 1 deletion llama-index-core/llama_index/core/indices/property_graph/sub_retrievers/llm_synonym.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def __init__(
self,
graph_store: PropertyGraphStore,
include_text: bool = True,
include_properties: bool = False,
synonym_prompt: Union[
BasePromptTemplate, str
] = DEFAULT_SYNONYM_EXPAND_TEMPLATE,
Expand All @@ -69,7 +70,12 @@ def __init__(
self._output_parsing_fn = output_parsing_fn
self._max_keywords = max_keywords
self._path_depth = path_depth
super().__init__(graph_store=graph_store, include_text=include_text, **kwargs)
super().__init__(
graph_store=graph_store,
include_text=include_text,
include_properties=include_properties,
**kwargs,
)

def _parse_llm_output(self, output: str) -> List[str]:
if self._output_parsing_fn:
Expand Down
4 changes: 3 additions & 1 deletion llama-index-core/llama_index/core/indices/property_graph/sub_retrievers/text_to_cypher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ def __init__(
)
self.cypher_validator = cypher_validator
self.allowed_output_fields = allowed_output_fields
super().__init__(graph_store=graph_store, include_text=False)
super().__init__(
graph_store=graph_store, include_text=False, include_properties=False
)

def _parse_generated_cypher(self, cypher_query: str) -> str:
if self.cypher_validator is not None:
Expand Down
8 changes: 7 additions & 1 deletion llama-index-core/llama_index/core/indices/property_graph/sub_retrievers/vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def __init__(
self,
graph_store: PropertyGraphStore,
include_text: bool = True,
include_properties: bool = False,
embed_model: Optional[BaseEmbedding] = None,
vector_store: Optional[BasePydanticVectorStore] = None,
similarity_top_k: int = 4,
Expand All @@ -59,7 +60,12 @@ def __init__(
self._similarity_score = similarity_score
self._filters = filters

super().__init__(graph_store=graph_store, include_text=include_text, **kwargs)
super().__init__(
graph_store=graph_store,
include_text=include_text,
include_properties=include_properties,
**kwargs,
)

def _get_vector_store_query(self, query_bundle: QueryBundle) -> VectorStoreQuery:
if query_bundle.embedding is None:
Expand Down
Loading