💡 All-in-one AI framework for semantic search, LLM orchestration and language model workflows
Python agentsaiai-agentsembeddingsinformation-retrievallanguage-modellarge-language-modelsllmnlppythonragretrieval-augmented-generationsearchsearch-enginesemantic-searchsentence-embeddingstransformerstxtaivector-databasevector-search
Detect graph queries and route to graph index, closes #865
davidmezzetti44fb2f9d9f2d
diff --git a/src/python/txtai/embeddings/base.py b/src/python/txtai/embeddings/base.pyindex 3df5d0da..1fec1207 100644--- a/src/python/txtai/embeddings/base.py+++ b/src/python/txtai/embeddings/base.py@@ -355,8 +355,8 @@ class Embeddings:def search(self, query, limit=None, weights=None, index=None, parameters=None, graph=False):"""- Finds documents most similar to the input query. This method will run either an index search- or an index + database search depending on if a database is available.+ Finds documents most similar to the input query. This method runs an index search, index + database search+ or a graph search, depending on the embeddings configuration and query.Args:query: input query@@ -377,8 +377,8 @@ class Embeddings:def batchsearch(self, queries, limit=None, weights=None, index=None, parameters=None, graph=False):"""- Finds documents most similar to the input queries. This method will run either an index search- or an index + database search depending on if a database is available.+ Finds documents most similar to the input query. This method runs an index search, index + database search+ or a graph search, depending on the embeddings configuration and query.Args:queries: input queries@@ -401,7 +401,7 @@ class Embeddings:results = Search(self, indexids=graph)(queries, limit, weights, index, parameters)# Create subgraphs using results, if necessary- return [self.graph.filter(x) for x in results] if graph else results+ return [self.graph.filter(x) if isinstance(x, list) else x for x in results] if graph else resultsdef similarity(self, query, data):"""diff --git a/src/python/txtai/embeddings/search/base.py b/src/python/txtai/embeddings/search/base.pyindex a2c86dfb..abb02ec2 100644--- a/src/python/txtai/embeddings/search/base.py+++ b/src/python/txtai/embeddings/search/base.py@@ -36,6 +36,7 @@ class Search:self.database = embeddings.databaseself.ids = embeddings.idsself.indexes = embeddings.indexes+ self.graph = embeddings.graphself.query = embeddings.queryself.scoring = embeddings.scoring if embeddings.issparse() else None@@ -52,7 +53,9 @@ class Search:parameters: list of dicts of named parameters to bind to placeholdersReturns:- list of (id, score) per query for index search, list of dict per query for an index + database search+ list of (id, score) per query for index search+ list of dict per query for an index + database search+ list of graph results for a graph index search"""# Default input parameters@@ -67,6 +70,10 @@ class Search:if not index and not self.ann and not self.scoring and self.indexes:index = self.indexes.default()+ # Graph search+ if self.graph and self.graph.isquery(queries):+ return self.graph.batchsearch(queries, limit, self.indexids)+# Database searchif not self.indexonly and self.database:return self.dbsearch(queries, limit, weights, index, parameters)diff --git a/src/python/txtai/graph/base.py b/src/python/txtai/graph/base.pyindex 5aee27fc..2e821464 100644--- a/src/python/txtai/graph/base.py+++ b/src/python/txtai/graph/base.py@@ -297,6 +297,19 @@ class Graph:return [self.search(query, limit, graph) for query in queries]+ def isquery(self, queries):+ """+ Checks if queries are supported graph queries.++ Args:+ queries: queries to check++ Returns:+ True if all the queries are supported graph queries, False otherwise+ """++ raise NotImplementedError+def communities(self, config):"""Run community detection on the graph.diff --git a/src/python/txtai/graph/networkx.py b/src/python/txtai/graph/networkx.pyindex 821d9f0a..38226fb3 100644--- a/src/python/txtai/graph/networkx.py+++ b/src/python/txtai/graph/networkx.py@@ -142,6 +142,10 @@ class NetworkX(Graph):return rows+ def isquery(self, queries):+ # Check for required graph query clauses+ return all(query and query.strip().startswith("MATCH ") and "RETURN " in query for query in queries)+def communities(self, config):# Get community detection algorithmalgorithm = config.get("algorithm")diff --git a/test/python/testgraph.py b/test/python/testgraph.pyindex 1cd645e7..6438f3a6 100644--- a/test/python/testgraph.py+++ b/test/python/testgraph.py@@ -320,6 +320,7 @@ class TestGraph(unittest.TestCase):self.assertRaises(NotImplementedError, graph.pagerank)self.assertRaises(NotImplementedError, graph.showpath, None, None)self.assertRaises(NotImplementedError, graph.search, None)+ self.assertRaises(NotImplementedError, graph.isquery, None)self.assertRaises(NotImplementedError, graph.communities, None)self.assertRaises(NotImplementedError, graph.load, None)self.assertRaises(NotImplementedError, graph.save, None)@@ -423,7 +424,7 @@ class TestGraph(unittest.TestCase):self.embeddings.index([(uid, text, None) for uid, text in enumerate(self.data)])# Run standard search- results = self.embeddings.graph.search(+ results = self.embeddings.search("""MATCH (A)-[]->(B)RETURN A, B@@ -432,7 +433,7 @@ class TestGraph(unittest.TestCase):self.assertEqual(len(results), 3)# Run path search- results = self.embeddings.graph.search(+ results = self.embeddings.search("""MATCH P=()-[]->()RETURN P@@ -441,7 +442,7 @@ class TestGraph(unittest.TestCase):self.assertEqual(len(results), 3)# Run graph search- g = self.embeddings.graph.search(+ g = self.embeddings.search("""MATCH (A)-[]->(B)RETURN A, B@@ -451,7 +452,7 @@ class TestGraph(unittest.TestCase):self.assertEqual(g.count(), 3)# Run path search- results = self.embeddings.graph.search(+ results = self.embeddings.search("""MATCH P=()-[]->()RETURN P@@ -469,7 +470,7 @@ class TestGraph(unittest.TestCase):self.embeddings.index([(uid, text, None) for uid, text in enumerate(self.data)])# Run standard search- results = self.embeddings.graph.batchsearch(+ results = self.embeddings.batchsearch(["""MATCH (A)-[]->(B)