apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-21 03:01:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update tests

Browse source
This commit is contained in:
Cyber MacGeddon 2026-05-08 19:47:02 +01:00
parent 14f0f9dfeb
commit adcb7e9060
12 changed files with 54 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/integration/test_cassandra_config_end_to_end.py
View file

@ -110,7 +110,8 @@ class TestEndToEndConfigurationFlow:
cassandra_host=['kg-host1', 'kg-host2', 'kg-host3', 'kg-host4'], cassandra_host=['kg-host1', 'kg-host2', 'kg-host3', 'kg-host4'],
cassandra_username='kg-user', cassandra_username='kg-user',
cassandra_password='kg-pass', cassandra_password='kg-pass',
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )
@ -182,7 +183,8 @@ class TestConfigurationPriorityEndToEnd:
cassandra_host=['partial-host'], # From parameter cassandra_host=['partial-host'], # From parameter
cassandra_username='fallback-user', # From environment cassandra_username='fallback-user', # From environment
cassandra_password='fallback-pass', # From environment cassandra_password='fallback-pass', # From environment
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )
@pytest.mark.asyncio @pytest.mark.asyncio
@ -273,7 +275,8 @@ class TestNoBackwardCompatibilityEndToEnd:
cassandra_host=['legacy-kg-host'], cassandra_host=['legacy-kg-host'],
cassandra_username=None, # Should be None since cassandra_user is not recognized cassandra_username=None, # Should be None since cassandra_user is not recognized
cassandra_password='legacy-kg-pass', cassandra_password='legacy-kg-pass',
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )
@pytest.mark.asyncio @pytest.mark.asyncio
@ -367,13 +370,13 @@ class TestMultipleHostsHandling:
from trustgraph.base.cassandra_config import resolve_cassandra_config from trustgraph.base.cassandra_config import resolve_cassandra_config
# Test various whitespace scenarios # Test various whitespace scenarios
hosts1, _, _, _ = resolve_cassandra_config(host='host1, host2 , host3') hosts1, _, _, _, _ = resolve_cassandra_config(host='host1, host2 , host3')
assert hosts1 == ['host1', 'host2', 'host3'] assert hosts1 == ['host1', 'host2', 'host3']
hosts2, _, _, _ = resolve_cassandra_config(host='host1,host2,host3,') hosts2, _, _, _, _ = resolve_cassandra_config(host='host1,host2,host3,')
assert hosts2 == ['host1', 'host2', 'host3'] assert hosts2 == ['host1', 'host2', 'host3']
hosts3, _, _, _ = resolve_cassandra_config(host=' host1 , host2 ') hosts3, _, _, _, _ = resolve_cassandra_config(host=' host1 , host2 ')
assert hosts3 == ['host1', 'host2'] assert hosts3 == ['host1', 'host2']

42
tests/unit/test_base/test_cassandra_config.py
View file

@ -145,7 +145,7 @@ class TestResolveCassandraConfig:
def test_default_configuration(self): def test_default_configuration(self):
"""Test resolution with no parameters or environment variables.""" """Test resolution with no parameters or environment variables."""
with patch.dict(os.environ, {}, clear=True): with patch.dict(os.environ, {}, clear=True):
hosts, username, password, keyspace = resolve_cassandra_config() hosts, username, password, keyspace, _ = resolve_cassandra_config()
assert hosts == ['cassandra'] assert hosts == ['cassandra']
assert username is None assert username is None
@ -160,7 +160,7 @@ class TestResolveCassandraConfig:
} }
with patch.dict(os.environ, env_vars, clear=True): with patch.dict(os.environ, env_vars, clear=True):
hosts, username, password, keyspace = resolve_cassandra_config() hosts, username, password, keyspace, _ = resolve_cassandra_config()
assert hosts == ['env1', 'env2', 'env3'] assert hosts == ['env1', 'env2', 'env3']
assert username == 'env-user' assert username == 'env-user'
@ -175,7 +175,7 @@ class TestResolveCassandraConfig:
} }
with patch.dict(os.environ, env_vars, clear=True): with patch.dict(os.environ, env_vars, clear=True):
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host='explicit-host', host='explicit-host',
username='explicit-user', username='explicit-user',
password='explicit-pass' password='explicit-pass'
@ -188,19 +188,19 @@ class TestResolveCassandraConfig:
def test_host_list_parsing(self): def test_host_list_parsing(self):
"""Test different host list formats.""" """Test different host list formats."""
# Single host # Single host
hosts, _, _, _ = resolve_cassandra_config(host='single-host') hosts, _, _, _, _ = resolve_cassandra_config(host='single-host')
assert hosts == ['single-host'] assert hosts == ['single-host']
# Multiple hosts with spaces # Multiple hosts with spaces
hosts, _, _, _ = resolve_cassandra_config(host='host1, host2 ,host3') hosts, _, _, _, _ = resolve_cassandra_config(host='host1, host2 ,host3')
assert hosts == ['host1', 'host2', 'host3'] assert hosts == ['host1', 'host2', 'host3']
# Empty elements filtered out # Empty elements filtered out
hosts, _, _, _ = resolve_cassandra_config(host='host1,,host2,') hosts, _, _, _, _ = resolve_cassandra_config(host='host1,,host2,')
assert hosts == ['host1', 'host2'] assert hosts == ['host1', 'host2']
# Already a list # Already a list
hosts, _, _, _ = resolve_cassandra_config(host=['list-host1', 'list-host2']) hosts, _, _, _, _ = resolve_cassandra_config(host=['list-host1', 'list-host2'])
assert hosts == ['list-host1', 'list-host2'] assert hosts == ['list-host1', 'list-host2']
def test_args_object_resolution(self): def test_args_object_resolution(self):
@ -212,7 +212,7 @@ class TestResolveCassandraConfig:
cassandra_password = 'args-pass' cassandra_password = 'args-pass'
args = MockArgs() args = MockArgs()
hosts, username, password, keyspace = resolve_cassandra_config(args) hosts, username, password, keyspace, _ = resolve_cassandra_config(args)
assert hosts == ['args-host1', 'args-host2'] assert hosts == ['args-host1', 'args-host2']
assert username == 'args-user' assert username == 'args-user'
@ -233,7 +233,7 @@ class TestResolveCassandraConfig:
with patch.dict(os.environ, env_vars, clear=True): with patch.dict(os.environ, env_vars, clear=True):
args = PartialArgs() args = PartialArgs()
hosts, username, password, keyspace = resolve_cassandra_config(args) hosts, username, password, keyspace, _ = resolve_cassandra_config(args)
assert hosts == ['args-host'] # From args assert hosts == ['args-host'] # From args
assert username == 'env-user' # From env assert username == 'env-user' # From env
@ -251,7 +251,7 @@ class TestGetCassandraConfigFromParams:
'cassandra_password': 'new-pass' 'cassandra_password': 'new-pass'
} }
hosts, username, password, keyspace = get_cassandra_config_from_params(params) hosts, username, password, keyspace, _ = get_cassandra_config_from_params(params)
assert hosts == ['new-host1', 'new-host2'] assert hosts == ['new-host1', 'new-host2']
assert username == 'new-user' assert username == 'new-user'
@ -265,7 +265,7 @@ class TestGetCassandraConfigFromParams:
'graph_password': 'old-pass' 'graph_password': 'old-pass'
} }
hosts, username, password, keyspace = get_cassandra_config_from_params(params) hosts, username, password, keyspace, _ = get_cassandra_config_from_params(params)
# Should use defaults since graph_* params are not recognized # Should use defaults since graph_* params are not recognized
assert hosts == ['cassandra'] # Default assert hosts == ['cassandra'] # Default
@ -280,7 +280,7 @@ class TestGetCassandraConfigFromParams:
'cassandra_password': 'compat-pass' 'cassandra_password': 'compat-pass'
} }
hosts, username, password, keyspace = get_cassandra_config_from_params(params) hosts, username, password, keyspace, _ = get_cassandra_config_from_params(params)
assert hosts == ['compat-host'] assert hosts == ['compat-host']
assert username is None # cassandra_user is not recognized assert username is None # cassandra_user is not recognized
@ -298,7 +298,7 @@ class TestGetCassandraConfigFromParams:
'graph_password': 'old-pass' 'graph_password': 'old-pass'
} }
hosts, username, password, keyspace = get_cassandra_config_from_params(params) hosts, username, password, keyspace, _ = get_cassandra_config_from_params(params)
assert hosts == ['new-host'] # Only cassandra_* params work assert hosts == ['new-host'] # Only cassandra_* params work
assert username == 'new-user' # Only cassandra_* params work assert username == 'new-user' # Only cassandra_* params work
@ -314,7 +314,7 @@ class TestGetCassandraConfigFromParams:
with patch.dict(os.environ, env_vars, clear=True): with patch.dict(os.environ, env_vars, clear=True):
params = {} params = {}
hosts, username, password, keyspace = get_cassandra_config_from_params(params) hosts, username, password, keyspace, _ = get_cassandra_config_from_params(params)
assert hosts == ['fallback-host1', 'fallback-host2'] assert hosts == ['fallback-host1', 'fallback-host2']
assert username == 'fallback-user' assert username == 'fallback-user'
@ -334,7 +334,7 @@ class TestConfigurationPriority:
with patch.dict(os.environ, env_vars, clear=True): with patch.dict(os.environ, env_vars, clear=True):
# CLI args should override everything # CLI args should override everything
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host='cli-host', host='cli-host',
username='cli-user', username='cli-user',
password='cli-pass' password='cli-pass'
@ -354,7 +354,7 @@ class TestConfigurationPriority:
with patch.dict(os.environ, env_vars, clear=True): with patch.dict(os.environ, env_vars, clear=True):
# Only provide host via CLI # Only provide host via CLI
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host='cli-host' host='cli-host'
# username and password not provided # username and password not provided
) )
@ -366,7 +366,7 @@ class TestConfigurationPriority:
def test_no_config_defaults(self): def test_no_config_defaults(self):
"""Test that defaults are used when no configuration is provided.""" """Test that defaults are used when no configuration is provided."""
with patch.dict(os.environ, {}, clear=True): with patch.dict(os.environ, {}, clear=True):
hosts, username, password, keyspace = resolve_cassandra_config() hosts, username, password, keyspace, _ = resolve_cassandra_config()
assert hosts == ['cassandra'] # Default assert hosts == ['cassandra'] # Default
assert username is None # Default assert username is None # Default
@ -378,17 +378,17 @@ class TestEdgeCases:
def test_empty_host_string(self): def test_empty_host_string(self):
"""Test handling of empty host string falls back to default.""" """Test handling of empty host string falls back to default."""
hosts, _, _, _ = resolve_cassandra_config(host='') hosts, _, _, _, _ = resolve_cassandra_config(host='')
assert hosts == ['cassandra'] # Falls back to default assert hosts == ['cassandra'] # Falls back to default
def test_whitespace_only_host(self): def test_whitespace_only_host(self):
"""Test handling of whitespace-only host string.""" """Test handling of whitespace-only host string."""
hosts, _, _, _ = resolve_cassandra_config(host=' ') hosts, _, _, _, _ = resolve_cassandra_config(host=' ')
assert hosts == [] # Empty after stripping whitespace assert hosts == [] # Empty after stripping whitespace
def test_none_values_preserved(self): def test_none_values_preserved(self):
"""Test that None values are preserved correctly.""" """Test that None values are preserved correctly."""
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host=None, host=None,
username=None, username=None,
password=None password=None
@ -401,7 +401,7 @@ class TestEdgeCases:
def test_mixed_none_and_values(self): def test_mixed_none_and_values(self):
"""Test mixing None and actual values.""" """Test mixing None and actual values."""
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host='mixed-host', host='mixed-host',
username=None, username=None,
password='mixed-pass' password='mixed-pass'

15
tests/unit/test_storage/test_cassandra_config_integration.py
View file

@ -218,7 +218,8 @@ class TestKgStoreConfiguration:
cassandra_host=['kg-env-host1', 'kg-env-host2', 'kg-env-host3'], cassandra_host=['kg-env-host1', 'kg-env-host2', 'kg-env-host3'],
cassandra_username='kg-env-user', cassandra_username='kg-env-user',
cassandra_password='kg-env-pass', cassandra_password='kg-env-pass',
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )
@patch('trustgraph.storage.knowledge.store.KnowledgeTableStore') @patch('trustgraph.storage.knowledge.store.KnowledgeTableStore')
@ -239,7 +240,8 @@ class TestKgStoreConfiguration:
cassandra_host=['explicit-host'], cassandra_host=['explicit-host'],
cassandra_username='explicit-user', cassandra_username='explicit-user',
cassandra_password='explicit-pass', cassandra_password='explicit-pass',
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )
@patch('trustgraph.storage.knowledge.store.KnowledgeTableStore') @patch('trustgraph.storage.knowledge.store.KnowledgeTableStore')
@ -260,7 +262,8 @@ class TestKgStoreConfiguration:
cassandra_host=['compat-host'], cassandra_host=['compat-host'],
cassandra_username=None, # Should be None since cassandra_user is ignored cassandra_username=None, # Should be None since cassandra_user is ignored
cassandra_password='compat-pass', cassandra_password='compat-pass',
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )
@patch('trustgraph.storage.knowledge.store.KnowledgeTableStore') @patch('trustgraph.storage.knowledge.store.KnowledgeTableStore')
@ -277,7 +280,8 @@ class TestKgStoreConfiguration:
cassandra_host=['cassandra'], cassandra_host=['cassandra'],
cassandra_username=None, cassandra_username=None,
cassandra_password=None, cassandra_password=None,
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )
@ -425,5 +429,6 @@ class TestConfigurationPriorityIntegration:
cassandra_host=['param-host'], # From parameter cassandra_host=['param-host'], # From parameter
cassandra_username='env-user', # From environment cassandra_username='env-user', # From environment
cassandra_password='env-pass', # From environment cassandra_password='env-pass', # From environment
keyspace='knowledge' keyspace='knowledge',
replication_factor=1,
) )

6
trustgraph-base/trustgraph/base/cassandra_config.py
View file

@ -151,7 +151,7 @@ def resolve_cassandra_config(
def get_cassandra_config_from_params( def get_cassandra_config_from_params(
params: dict, params: dict,
default_keyspace: Optional[str] = None default_keyspace: Optional[str] = None
) -> Tuple[List[str], Optional[str], Optional[str], Optional[str]]: ) -> Tuple[List[str], Optional[str], Optional[str], Optional[str], int]:
""" """
Extract and resolve Cassandra configuration from a parameters dictionary. Extract and resolve Cassandra configuration from a parameters dictionary.
@ -160,14 +160,12 @@ def get_cassandra_config_from_params(
default_keyspace: Optional default keyspace if not specified in params default_keyspace: Optional default keyspace if not specified in params
Returns: Returns:
tuple: (hosts_list, username, password, keyspace) tuple: (hosts_list, username, password, keyspace, replication_factor)
""" """
# Get Cassandra parameters
host = params.get('cassandra_host') host = params.get('cassandra_host')
username = params.get('cassandra_username') username = params.get('cassandra_username')
password = params.get('cassandra_password') password = params.get('cassandra_password')
# Use resolve function to handle defaults and list conversion
return resolve_cassandra_config( return resolve_cassandra_config(
host=host, host=host,
username=username, username=username,

3
trustgraph-flow/trustgraph/config/service/service.py
View file

@ -79,7 +79,7 @@ class Processor(AsyncProcessor):
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
# Resolve configuration with environment variable fallback # Resolve configuration with environment variable fallback
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, replication_factor = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password, password=cassandra_password,
@ -147,6 +147,7 @@ class Processor(AsyncProcessor):
username = self.cassandra_username, username = self.cassandra_username,
password = self.cassandra_password, password = self.cassandra_password,
keyspace = keyspace, keyspace = keyspace,
replication_factor = replication_factor,
push = self.push push = self.push
) )

3
trustgraph-flow/trustgraph/cores/service.py
View file

@ -56,7 +56,7 @@ class Processor(WorkspaceProcessor):
cassandra_username = params.get("cassandra_username") cassandra_username = params.get("cassandra_username")
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, replication_factor = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password, password=cassandra_password,
@ -83,6 +83,7 @@ class Processor(WorkspaceProcessor):
cassandra_password = self.cassandra_password, cassandra_password = self.cassandra_password,
keyspace = keyspace, keyspace = keyspace,
flow_config = self, flow_config = self,
replication_factor = replication_factor,
) )
self.register_config_handler(self.on_knowledge_config, types=["flow"]) self.register_config_handler(self.on_knowledge_config, types=["flow"])

3
trustgraph-flow/trustgraph/iam/service/service.py
View file

@ -96,7 +96,7 @@ class Processor(AsyncProcessor):
cassandra_username = params.get("cassandra_username") cassandra_username = params.get("cassandra_username")
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, replication_factor = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password, password=cassandra_password,
@ -149,6 +149,7 @@ class Processor(AsyncProcessor):
username=self.cassandra_username, username=self.cassandra_username,
password=self.cassandra_password, password=self.cassandra_password,
keyspace=keyspace, keyspace=keyspace,
replication_factor=replication_factor,
bootstrap_mode=self.bootstrap_mode, bootstrap_mode=self.bootstrap_mode,
bootstrap_token=self.bootstrap_token, bootstrap_token=self.bootstrap_token,
on_workspace_created=self._ensure_workspace_registered, on_workspace_created=self._ensure_workspace_registered,

3
trustgraph-flow/trustgraph/librarian/service.py
View file

@ -117,7 +117,7 @@ class Processor(WorkspaceProcessor):
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
# Resolve configuration with environment variable fallback # Resolve configuration with environment variable fallback
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, replication_factor = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password, password=cassandra_password,
@ -179,6 +179,7 @@ class Processor(WorkspaceProcessor):
object_store_secret_key = object_store_secret_key, object_store_secret_key = object_store_secret_key,
bucket_name = bucket_name, bucket_name = bucket_name,
keyspace = keyspace, keyspace = keyspace,
replication_factor = replication_factor,
load_document = self.load_document, load_document = self.load_document,
object_store_use_ssl = object_store_use_ssl, object_store_use_ssl = object_store_use_ssl,
object_store_region = object_store_region, object_store_region = object_store_region,

2
trustgraph-flow/trustgraph/query/rows/cassandra/service.py
View file

@ -47,7 +47,7 @@ class Processor(FlowProcessor):
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
# Resolve configuration with environment variable fallback # Resolve configuration with environment variable fallback
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password password=cassandra_password

2
trustgraph-flow/trustgraph/query/triples/cassandra/service.py
View file

@ -160,7 +160,7 @@ class Processor(TriplesQueryService):
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
# Resolve configuration with environment variable fallback # Resolve configuration with environment variable fallback
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password password=cassandra_password

2
trustgraph-flow/trustgraph/storage/rows/cassandra/write.py
View file

@ -47,7 +47,7 @@ class Processor(CollectionConfigHandler, FlowProcessor):
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
# Resolve configuration with environment variable fallback # Resolve configuration with environment variable fallback
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password password=cassandra_password

2
trustgraph-flow/trustgraph/storage/triples/cassandra/write.py
View file

@ -125,7 +125,7 @@ class Processor(CollectionConfigHandler, TriplesStoreService):
cassandra_password = params.get("cassandra_password") cassandra_password = params.get("cassandra_password")
# Resolve configuration with environment variable fallback # Resolve configuration with environment variable fallback
hosts, username, password, keyspace = resolve_cassandra_config( hosts, username, password, keyspace, _ = resolve_cassandra_config(
host=cassandra_host, host=cassandra_host,
username=cassandra_username, username=cassandra_username,
password=cassandra_password password=cassandra_password