@@ -27,8 +27,8 @@ def test_builds_endpoints(self):
2727
2828 assert len (endpoints ) > 0
2929 assert 'exports/entities/parquet' in endpoints
30- assert 'exports/interactions /parquet' in endpoints
31- assert 'exports/associations /parquet' in endpoints
30+ assert 'exports/relations /parquet' in endpoints
31+ assert 'exports/annotations /parquet' in endpoints
3232
3333 def test_entity_filters (self ):
3434
@@ -41,18 +41,15 @@ def test_entity_filters(self):
4141 assert 'taxonomy_ids' in ep .params
4242 assert 'entity_types' in ep .params
4343
44- def test_interaction_filters (self ):
44+ def test_relation_filters (self ):
4545
4646 endpoints = _build_static_fallback ()
47- ep = endpoints ['exports/interactions /parquet' ]
47+ ep = endpoints ['exports/relations /parquet' ]
4848
49- assert 'direction' in ep .params
50- pdef = ep .params ['direction' ]
51- assert pdef .allowed_values == [
52- 'any' ,
53- 'directed' ,
54- 'undirected' ,
55- ]
49+ assert 'subject_entity_pks' in ep .params
50+ assert 'object_entity_pks' in ep .params
51+ assert 'predicates' in ep .params
52+ assert 'relation_categories' in ep .params
5653
5754
5855class TestParseOpenapi :
@@ -72,8 +69,8 @@ def test_parse_local_spec(self):
7269
7370 assert len (endpoints ) > 0
7471 assert 'exports/entities/parquet' in endpoints
75- assert 'exports/interactions /parquet' in endpoints
76- assert 'exports/associations /parquet' in endpoints
72+ assert 'exports/relations /parquet' in endpoints
73+ assert 'exports/annotations /parquet' in endpoints
7774
7875 def test_export_endpoints_have_filters (self ):
7976
@@ -84,19 +81,12 @@ def test_export_endpoints_have_filters(self):
8481 spec = json .load (f )
8582
8683 endpoints = parse_openapi (spec )
87- ep = endpoints ['exports/interactions /parquet' ]
84+ ep = endpoints ['exports/relations /parquet' ]
8885
8986 assert ep .method == 'POST'
9087 assert ep .response_format == 'parquet'
91- assert 'entity_ids' in ep .params
92- assert 'direction' in ep .params
93-
94- direction = ep .params ['direction' ]
95- assert direction .allowed_values == [
96- 'any' ,
97- 'directed' ,
98- 'undirected' ,
99- ]
88+ assert 'sources' in ep .params
89+ assert 'predicates' in ep .params
10090
10191 def test_ontology_endpoints (self ):
10292
@@ -131,22 +121,23 @@ def test_params_method(self):
131121 inv = Inventory (base_url = 'http://localhost:99999' )
132122 inv .load ()
133123
134- params = inv .params ('exports/interactions /parquet' )
124+ params = inv .params ('exports/relations /parquet' )
135125
136- assert 'entity_ids ' in params
137- assert isinstance (params ['entity_ids ' ], ParamDef )
126+ assert 'sources ' in params
127+ assert isinstance (params ['sources ' ], ParamDef )
138128
139- def test_allowed_values_method (self ):
129+ def test_allowed_values_unconstrained_relation_filter (self ):
140130
141131 inv = Inventory (base_url = 'http://localhost:99999' )
142132 inv .load ()
143133
144134 values = inv .allowed_values (
145- 'exports/interactions /parquet' ,
146- 'direction ' ,
135+ 'exports/relations /parquet' ,
136+ 'sources ' ,
147137 )
148138
149- assert values == ['any' , 'directed' , 'undirected' ]
139+ # The static fallback does not enumerate allowed sources.
140+ assert values is None
150141
151142 def test_allowed_values_unconstrained (self ):
152143
0 commit comments