Merge pull request #576 from ShanGor/main
Revise the AGE implementation on get_node_edges, to align with Neo4j behavior.
This commit is contained in:
commit
9f48124a69
2 changed files with 17 additions and 5 deletions
|
|
@ -141,13 +141,16 @@ class PostgreSQLDB:
|
|||
await connection.execute(sql)
|
||||
else:
|
||||
await connection.execute(sql, *data.values())
|
||||
except asyncpg.exceptions.UniqueViolationError as e:
|
||||
except (
|
||||
asyncpg.exceptions.UniqueViolationError,
|
||||
asyncpg.exceptions.DuplicateTableError,
|
||||
) as e:
|
||||
if upsert:
|
||||
print("Key value duplicate, but upsert succeeded.")
|
||||
else:
|
||||
logger.error(f"Upsert error: {e}")
|
||||
except Exception as e:
|
||||
logger.error(f"PostgreSQL database error: {e}")
|
||||
logger.error(f"PostgreSQL database error: {e.__class__} - {e}")
|
||||
print(sql)
|
||||
print(data)
|
||||
raise
|
||||
|
|
@ -885,7 +888,12 @@ class PGGraphStorage(BaseGraphStorage):
|
|||
)
|
||||
|
||||
if source_label and target_label:
|
||||
edges.append((source_label, target_label))
|
||||
edges.append(
|
||||
(
|
||||
PGGraphStorage._decode_graph_label(source_label),
|
||||
PGGraphStorage._decode_graph_label(target_label),
|
||||
)
|
||||
)
|
||||
|
||||
return edges
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ db = PostgreSQLDB(
|
|||
"port": 15432,
|
||||
"user": "rag",
|
||||
"password": "rag",
|
||||
"database": "rag",
|
||||
"database": "r1",
|
||||
}
|
||||
)
|
||||
|
||||
|
|
@ -74,8 +74,12 @@ async def query_with_age():
|
|||
embedding_func=None,
|
||||
)
|
||||
graph.db = db
|
||||
res = await graph.get_node('"CHRISTMAS-TIME"')
|
||||
res = await graph.get_node('"A CHRISTMAS CAROL"')
|
||||
print("Node is: ", res)
|
||||
res = await graph.get_edge('"A CHRISTMAS CAROL"', "PROJECT GUTENBERG")
|
||||
print("Edge is: ", res)
|
||||
res = await graph.get_node_edges('"SCROOGE"')
|
||||
print("Node Edges are: ", res)
|
||||
|
||||
|
||||
async def create_edge_with_age():
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue