* Prepare code * Fix tests * As -> AS, remove trailing spaces * Enable more tests for FalkorDB * Fix more cypher queries * Return all created nodes and edges * Add Neo4j service to unit tests workflow - Introduced Neo4j as a service in the GitHub Actions workflow for unit tests. - Configured Neo4j with appropriate ports, authentication, and health checks. - Updated test steps to include waiting for Neo4j and running integration tests against it. - Set environment variables for Neo4j connection in both non-integration and integration test steps. * Update Neo4j authentication in unit tests workflow - Changed Neo4j authentication password from 'test' to 'testpass' in the GitHub Actions workflow. - Updated health check command to reflect the new password. - Ensured consistency across all test steps that utilize Neo4j credentials. * fix health check * Fix Neo4j integration tests in CI workflow Remove reference to non-existent test_neo4j_driver.py file from test command. Integration tests now run via parametrized tests using the drivers list. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Add OPENAI_API_KEY to Neo4j integration tests Neo4j integration tests require OpenAI API access for LLM functionality. Add the secret environment variable to enable these tests to run properly. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix Neo4j Cypher syntax error in BFS search queries Replace parameter substitution in relationship pattern ranges (*1..$depth) with direct string interpolation (*1..{bfs_max_depth}). Neo4j doesn't allow parameter maps in MATCH pattern ranges - they must be literal values. Fixed in both node_bfs_search and edge_bfs_search functions. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix variable name mismatch in edge_bfs_search query Change relationship variable from 'r' to 'e' to match ENTITY_EDGE_RETURN constant expectations. The ENTITY_EDGE_RETURN constant references variable 'e' for relationships, but the query was using 'r', causing "Variable e not defined" errors. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Isolate database tests in CI workflow - FalkorDB tests: Add DISABLE_NEO4J=1 and remove Neo4j env vars - Neo4j tests: Keep current setup without DISABLE_NEO4J flag This ensures proper test isolation where each test suite only runs against its intended database backend. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Siddhartha Sahu <sid@kuzudb.com> Co-authored-by: Claude <noreply@anthropic.com>
179 lines
6.6 KiB
Python
179 lines
6.6 KiB
Python
"""
|
|
Copyright 2024, Zep Software, Inc.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
"""
|
|
|
|
import logging
|
|
from datetime import datetime
|
|
from typing import TYPE_CHECKING, Any
|
|
|
|
if TYPE_CHECKING:
|
|
from falkordb import Graph as FalkorGraph
|
|
from falkordb.asyncio import FalkorDB
|
|
else:
|
|
try:
|
|
from falkordb import Graph as FalkorGraph
|
|
from falkordb.asyncio import FalkorDB
|
|
except ImportError:
|
|
# If falkordb is not installed, raise an ImportError
|
|
raise ImportError(
|
|
'falkordb is required for FalkorDriver. '
|
|
'Install it with: pip install graphiti-core[falkordb]'
|
|
) from None
|
|
|
|
from graphiti_core.driver.driver import GraphDriver, GraphDriverSession, GraphProvider
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class FalkorDriverSession(GraphDriverSession):
|
|
def __init__(self, graph: FalkorGraph):
|
|
self.graph = graph
|
|
|
|
async def __aenter__(self):
|
|
return self
|
|
|
|
async def __aexit__(self, exc_type, exc, tb):
|
|
# No cleanup needed for Falkor, but method must exist
|
|
pass
|
|
|
|
async def close(self):
|
|
# No explicit close needed for FalkorDB, but method must exist
|
|
pass
|
|
|
|
async def execute_write(self, func, *args, **kwargs):
|
|
# Directly await the provided async function with `self` as the transaction/session
|
|
return await func(self, *args, **kwargs)
|
|
|
|
async def run(self, query: str | list, **kwargs: Any) -> Any:
|
|
# FalkorDB does not support argument for Label Set, so it's converted into an array of queries
|
|
if isinstance(query, list):
|
|
for cypher, params in query:
|
|
params = convert_datetimes_to_strings(params)
|
|
await self.graph.query(str(cypher), params) # type: ignore[reportUnknownArgumentType]
|
|
else:
|
|
params = dict(kwargs)
|
|
params = convert_datetimes_to_strings(params)
|
|
await self.graph.query(str(query), params) # type: ignore[reportUnknownArgumentType]
|
|
# Assuming `graph.query` is async (ideal); otherwise, wrap in executor
|
|
return None
|
|
|
|
|
|
class FalkorDriver(GraphDriver):
|
|
provider = GraphProvider.FALKORDB
|
|
|
|
def __init__(
|
|
self,
|
|
host: str = 'localhost',
|
|
port: int = 6379,
|
|
username: str | None = None,
|
|
password: str | None = None,
|
|
falkor_db: FalkorDB | None = None,
|
|
database: str = 'default_db',
|
|
):
|
|
"""
|
|
Initialize the FalkorDB driver.
|
|
|
|
FalkorDB is a multi-tenant graph database.
|
|
To connect, provide the host and port.
|
|
The default parameters assume a local (on-premises) FalkorDB instance.
|
|
"""
|
|
super().__init__()
|
|
|
|
self._database = database
|
|
if falkor_db is not None:
|
|
# If a FalkorDB instance is provided, use it directly
|
|
self.client = falkor_db
|
|
else:
|
|
self.client = FalkorDB(host=host, port=port, username=username, password=password)
|
|
|
|
self.fulltext_syntax = '@' # FalkorDB uses a redisearch-like syntax for fulltext queries see https://redis.io/docs/latest/develop/ai/search-and-query/query/full-text/
|
|
|
|
def _get_graph(self, graph_name: str | None) -> FalkorGraph:
|
|
# FalkorDB requires a non-None database name for multi-tenant graphs; the default is "default_db"
|
|
if graph_name is None:
|
|
graph_name = self._database
|
|
return self.client.select_graph(graph_name)
|
|
|
|
async def execute_query(self, cypher_query_, **kwargs: Any):
|
|
graph = self._get_graph(self._database)
|
|
|
|
# Convert datetime objects to ISO strings (FalkorDB does not support datetime objects directly)
|
|
params = convert_datetimes_to_strings(dict(kwargs))
|
|
|
|
try:
|
|
result = await graph.query(cypher_query_, params) # type: ignore[reportUnknownArgumentType]
|
|
except Exception as e:
|
|
if 'already indexed' in str(e):
|
|
# check if index already exists
|
|
logger.info(f'Index already exists: {e}')
|
|
return None
|
|
logger.error(f'Error executing FalkorDB query: {e}\n{cypher_query_}\n{params}')
|
|
raise
|
|
|
|
# Convert the result header to a list of strings
|
|
header = [h[1] for h in result.header]
|
|
|
|
# Convert FalkorDB's result format (list of lists) to the format expected by Graphiti (list of dicts)
|
|
records = []
|
|
for row in result.result_set:
|
|
record = {}
|
|
for i, field_name in enumerate(header):
|
|
if i < len(row):
|
|
record[field_name] = row[i]
|
|
else:
|
|
# If there are more fields in header than values in row, set to None
|
|
record[field_name] = None
|
|
records.append(record)
|
|
|
|
return records, header, None
|
|
|
|
def session(self, database: str | None = None) -> GraphDriverSession:
|
|
return FalkorDriverSession(self._get_graph(database))
|
|
|
|
async def close(self) -> None:
|
|
"""Close the driver connection."""
|
|
if hasattr(self.client, 'aclose'):
|
|
await self.client.aclose() # type: ignore[reportUnknownMemberType]
|
|
elif hasattr(self.client.connection, 'aclose'):
|
|
await self.client.connection.aclose()
|
|
elif hasattr(self.client.connection, 'close'):
|
|
await self.client.connection.close()
|
|
|
|
async def delete_all_indexes(self) -> None:
|
|
await self.execute_query(
|
|
'CALL db.indexes() YIELD name DROP INDEX name',
|
|
)
|
|
|
|
def clone(self, database: str) -> 'GraphDriver':
|
|
"""
|
|
Returns a shallow copy of this driver with a different default database.
|
|
Reuses the same connection (e.g. FalkorDB, Neo4j).
|
|
"""
|
|
cloned = FalkorDriver(falkor_db=self.client, database=database)
|
|
|
|
return cloned
|
|
|
|
|
|
def convert_datetimes_to_strings(obj):
|
|
if isinstance(obj, dict):
|
|
return {k: convert_datetimes_to_strings(v) for k, v in obj.items()}
|
|
elif isinstance(obj, list):
|
|
return [convert_datetimes_to_strings(item) for item in obj]
|
|
elif isinstance(obj, tuple):
|
|
return tuple(convert_datetimes_to_strings(item) for item in obj)
|
|
elif isinstance(obj, datetime):
|
|
return obj.isoformat()
|
|
else:
|
|
return obj
|