Skip to content

Commit beafca5

Browse files
authored
fix: make tugraph work again (#2551)
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
1 parent 3bfbdc3 commit beafca5

2 files changed

Lines changed: 22 additions & 8 deletions

File tree

packages/dbgpt-ext/src/dbgpt_ext/datasource/conn_tugraph.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,15 @@ def get_table_names(self) -> Iterator[str]:
158158
with self._driver.session(database=self._graph) as session:
159159
# Run the query to get vertex labels
160160
raw_vertex_labels = session.run("CALL db.vertexLabels()").data()
161-
vertex_labels = [table_name["label"] for table_name in raw_vertex_labels]
161+
vertex_labels = [
162+
table_name["label"] + "_vertex" for table_name in raw_vertex_labels
163+
]
162164

163165
# Run the query to get edge labels
164166
raw_edge_labels = session.run("CALL db.edgeLabels()").data()
165-
edge_labels = [table_name["label"] for table_name in raw_edge_labels]
167+
edge_labels = [
168+
table_name["label"] + "_edge" for table_name in raw_edge_labels
169+
]
166170

167171
return iter(vertex_labels + edge_labels)
168172

packages/dbgpt-ext/src/dbgpt_ext/rag/summary/gdbms_db_summary.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ def __init__(
4444
tables = self.db.get_table_names()
4545
self.table_info_summaries = {
4646
"vertex_tables": [
47-
self.get_table_summary(table_name, "vertex")
48-
for table_name in tables["vertex_tables"]
47+
self.get_table_summary(table_name.split("_")[0], "vertex")
48+
for table_name in tables
49+
if table_name.endswith("_vertex")
4950
],
5051
"edge_tables": [
51-
self.get_table_summary(table_name, "edge")
52-
for table_name in tables["edge_tables"]
52+
self.get_table_summary(table_name.split("_")[0], "edge")
53+
for table_name in tables
54+
if table_name.endswith("_edge")
5355
],
5456
}
5557

@@ -76,8 +78,16 @@ def _parse_db_summary(
7678
table_info_summaries = None
7779
if isinstance(conn, TuGraphConnector):
7880
table_names = conn.get_table_names()
79-
v_tables = table_names.get("vertex_tables", []) # type: ignore
80-
e_tables = table_names.get("edge_tables", []) # type: ignore
81+
v_tables = [
82+
table_name.split("_")[0]
83+
for table_name in table_names
84+
if table_name.endswith("_vertex")
85+
]
86+
e_tables = [
87+
table_name.split("_")[0]
88+
for table_name in table_names
89+
if table_name.endswith("_edge")
90+
]
8191
table_info_summaries = [
8292
_parse_table_summary(conn, summary_template, table_name, "vertex")
8393
for table_name in v_tables

0 commit comments

Comments
 (0)