* 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>
96 lines
2.7 KiB
Python
96 lines
2.7 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 os
|
|
|
|
import pytest
|
|
from dotenv import load_dotenv
|
|
|
|
from graphiti_core.driver.driver import GraphDriver
|
|
from graphiti_core.helpers import lucene_sanitize
|
|
|
|
load_dotenv()
|
|
|
|
HAS_NEO4J = False
|
|
HAS_FALKORDB = False
|
|
if os.getenv('DISABLE_NEO4J') is None:
|
|
try:
|
|
from graphiti_core.driver.neo4j_driver import Neo4jDriver
|
|
|
|
HAS_NEO4J = True
|
|
except ImportError:
|
|
pass
|
|
|
|
if os.getenv('DISABLE_FALKORDB') is None:
|
|
try:
|
|
from graphiti_core.driver.falkordb_driver import FalkorDriver
|
|
|
|
HAS_FALKORDB = True
|
|
except ImportError:
|
|
pass
|
|
|
|
NEO4J_URI = os.getenv('NEO4J_URI', 'bolt://localhost:7687')
|
|
NEO4J_USER = os.getenv('NEO4J_USER', 'neo4j')
|
|
NEO4J_PASSWORD = os.getenv('NEO4J_PASSWORD', 'test')
|
|
|
|
FALKORDB_HOST = os.getenv('FALKORDB_HOST', 'localhost')
|
|
FALKORDB_PORT = os.getenv('FALKORDB_PORT', '6379')
|
|
FALKORDB_USER = os.getenv('FALKORDB_USER', None)
|
|
FALKORDB_PASSWORD = os.getenv('FALKORDB_PASSWORD', None)
|
|
|
|
|
|
def get_driver(driver_name: str) -> GraphDriver:
|
|
if driver_name == 'neo4j':
|
|
return Neo4jDriver(
|
|
uri=NEO4J_URI,
|
|
user=NEO4J_USER,
|
|
password=NEO4J_PASSWORD,
|
|
)
|
|
elif driver_name == 'falkordb':
|
|
return FalkorDriver(
|
|
host=FALKORDB_HOST,
|
|
port=int(FALKORDB_PORT),
|
|
username=FALKORDB_USER,
|
|
password=FALKORDB_PASSWORD,
|
|
)
|
|
else:
|
|
raise ValueError(f'Driver {driver_name} not available')
|
|
|
|
|
|
drivers: list[str] = []
|
|
if HAS_NEO4J:
|
|
drivers.append('neo4j')
|
|
if HAS_FALKORDB:
|
|
drivers.append('falkordb')
|
|
|
|
|
|
def test_lucene_sanitize():
|
|
# Call the function with test data
|
|
queries = [
|
|
(
|
|
'This has every escape character + - && || ! ( ) { } [ ] ^ " ~ * ? : \\ /',
|
|
'\\This has every escape character \\+ \\- \\&\\& \\|\\| \\! \\( \\) \\{ \\} \\[ \\] \\^ \\" \\~ \\* \\? \\: \\\\ \\/',
|
|
),
|
|
('this has no escape characters', 'this has no escape characters'),
|
|
]
|
|
|
|
for query, assert_result in queries:
|
|
result = lucene_sanitize(query)
|
|
assert assert_result == result
|
|
|
|
|
|
if __name__ == '__main__':
|
|
pytest.main([__file__])
|