Feature/gql sort nodes (#1912)

* add sorting support for nodes in GraphQl * add node sorting tests * fix the python tests (submodules should start with test_ * implement sorting for list properties * non-trivial test for list sorting * fix warnings * fmt
Pometry · Jan 15, 2025 · 3573dc5 · 3573dc5
1 parent 1df3b0c
commit 3573dc5
Show file tree

Hide file tree

Showing 34 changed files with 599 additions and 89 deletions.
diff --git a/.../graphql/edit_graph/test_archive_graph.py → ..._graphql/edit_graph/test_archive_graph.py b/.../graphql/edit_graph/test_archive_graph.py → ..._graphql/edit_graph/test_archive_graph.py
diff --git a/...sts/graphql/edit_graph/test_copy_graph.py → ...est_graphql/edit_graph/test_copy_graph.py b/...sts/graphql/edit_graph/test_copy_graph.py → ...est_graphql/edit_graph/test_copy_graph.py
diff --git a/...s/graphql/edit_graph/test_delete_graph.py → ...t_graphql/edit_graph/test_delete_graph.py b/...s/graphql/edit_graph/test_delete_graph.py → ...t_graphql/edit_graph/test_delete_graph.py
diff --git a/...ests/graphql/edit_graph/test_get_graph.py → ...test_graphql/edit_graph/test_get_graph.py b/...ests/graphql/edit_graph/test_get_graph.py → ...test_graphql/edit_graph/test_get_graph.py
diff --git a/.../tests/graphql/edit_graph/test_graphql.py → ...s/test_graphql/edit_graph/test_graphql.py b/.../tests/graphql/edit_graph/test_graphql.py → ...s/test_graphql/edit_graph/test_graphql.py
diff --git a/...sts/graphql/edit_graph/test_move_graph.py → ...est_graphql/edit_graph/test_move_graph.py b/...sts/graphql/edit_graph/test_move_graph.py → ...est_graphql/edit_graph/test_move_graph.py
diff --git a/...ests/graphql/edit_graph/test_new_graph.py → ...test_graphql/edit_graph/test_new_graph.py b/...ests/graphql/edit_graph/test_new_graph.py → ...test_graphql/edit_graph/test_new_graph.py
diff --git a/.../graphql/edit_graph/test_receive_graph.py → ..._graphql/edit_graph/test_receive_graph.py b/.../graphql/edit_graph/test_receive_graph.py → ..._graphql/edit_graph/test_receive_graph.py
diff --git a/...sts/graphql/edit_graph/test_send_graph.py → ...est_graphql/edit_graph/test_send_graph.py b/...sts/graphql/edit_graph/test_send_graph.py → ...est_graphql/edit_graph/test_send_graph.py
diff --git a/...s/graphql/edit_graph/test_upload_graph.py → ...t_graphql/edit_graph/test_upload_graph.py b/...s/graphql/edit_graph/test_upload_graph.py → ...t_graphql/edit_graph/test_upload_graph.py
diff --git a/python/tests/graphql/misc/test_components.py → ...ests/test_graphql/misc/test_components.py b/python/tests/graphql/misc/test_components.py → ...ests/test_graphql/misc/test_components.py
diff --git a/...ests/graphql/misc/test_graphql_vectors.py → ...test_graphql/misc/test_graphql_vectors.py b/...ests/graphql/misc/test_graphql_vectors.py → ...test_graphql/misc/test_graphql_vectors.py
diff --git a/python/tests/graphql/misc/test_index_off.py → ...tests/test_graphql/misc/test_index_off.py b/python/tests/graphql/misc/test_index_off.py → ...tests/test_graphql/misc/test_index_off.py
diff --git a/python/tests/graphql/misc/test_latest.py → ...on/tests/test_graphql/misc/test_latest.py b/python/tests/graphql/misc/test_latest.py → ...on/tests/test_graphql/misc/test_latest.py
diff --git a/python/tests/graphql/misc/test_snapshot.py → .../tests/test_graphql/misc/test_snapshot.py b/python/tests/graphql/misc/test_snapshot.py → .../tests/test_graphql/misc/test_snapshot.py
diff --git a/python/tests/graphql/misc/test_tracing.py → ...n/tests/test_graphql/misc/test_tracing.py b/python/tests/graphql/misc/test_tracing.py → ...n/tests/test_graphql/misc/test_tracing.py
diff --git a/python/tests/graphql/test_edge_sorting.py → ...n/tests/test_graphql/test_edge_sorting.py b/python/tests/graphql/test_edge_sorting.py → ...n/tests/test_graphql/test_edge_sorting.py
@@ -1,13 +1,8 @@
-import tempfile
-
 import pytest
 
-from raphtory.graphql import GraphServer
 from raphtory import Graph, PersistentGraph
-import json
-import re
 
-PORT = 1737
+from utils import run_graphql_test
 
 
 def create_test_graph(g):
@@ -72,40 +67,12 @@ def create_test_graph(g):
     return g
 
 
-def run_graphql_test(query, expected_output, graph):
-    create_test_graph(graph)
-    tmp_work_dir = tempfile.mkdtemp()
-    with GraphServer(tmp_work_dir).start(PORT) as server:
-        client = server.get_client()
-        client.send_graph(path="g", graph=graph)
-
-        response = client.query(query)
-
-        # Convert response to a dictionary if needed and compare
-        response_dict = json.loads(response) if isinstance(response, str) else response
-        assert response_dict == expected_output
-
-
-def run_graphql_error_test(query, expected_error_message, graph):
-    create_test_graph(graph)
-    tmp_work_dir = tempfile.mkdtemp()
-    with GraphServer(tmp_work_dir).start(PORT) as server:
-        client = server.get_client()
-        client.send_graph(path="g", graph=graph)
-
-        with pytest.raises(Exception) as excinfo:
-            client.query(query)
-
-        full_error_message = str(excinfo.value)
-        match = re.search(r'"message":"(.*?)"', full_error_message)
-        error_message = match.group(1) if match else ""
+EVENT_GRAPH = create_test_graph(Graph())
 
-        assert (
-            error_message == expected_error_message
-        ), f"Expected '{expected_error_message}', but got '{error_message}'"
+PERSISTENT_GRAPH = create_test_graph(PersistentGraph())
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_nothing(graph):
     query = """
     query {
@@ -140,10 +107,10 @@ def test_graph_edge_sort_by_nothing(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_src(graph):
     query = """
     query {
@@ -178,10 +145,10 @@ def test_graph_edge_sort_by_src(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_dst(graph):
     query = """
     query {
@@ -216,10 +183,10 @@ def test_graph_edge_sort_by_dst(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_earliest_time(graph):
     query = """
     query {
@@ -254,10 +221,10 @@ def test_graph_edge_sort_by_earliest_time(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_earliest_time_reversed(graph):
     query = """
     query {
@@ -293,10 +260,10 @@ def test_graph_edge_sort_by_earliest_time_reversed(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH])
 def test_graph_edge_sort_by_latest_time(graph):
     query = """
     query {
@@ -331,10 +298,10 @@ def test_graph_edge_sort_by_latest_time(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [PersistentGraph])
+@pytest.mark.parametrize("graph", [PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_latest_time_persistent_graph(graph):
     query = """
     query {
@@ -370,10 +337,10 @@ def test_graph_edge_sort_by_latest_time_persistent_graph(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_eprop1(graph):
     query = """
     query {
@@ -408,10 +375,10 @@ def test_graph_edge_sort_by_eprop1(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_eprop2(graph):
     query = """
     query {
@@ -446,10 +413,10 @@ def test_graph_edge_sort_by_eprop2(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_eprop3(graph):
     query = """
     query {
@@ -484,10 +451,10 @@ def test_graph_edge_sort_by_eprop3(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_eprop4(graph):
     query = """
     query {
@@ -522,10 +489,10 @@ def test_graph_edge_sort_by_eprop4(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_eprop5(graph):
     query = """
     query {
@@ -560,10 +527,10 @@ def test_graph_edge_sort_by_eprop5(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_nonexistent_prop(graph):
     query = """
     query {
@@ -598,10 +565,10 @@ def test_graph_edge_sort_by_nonexistent_prop(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_combined(graph):
     query = """
     query {
@@ -636,10 +603,10 @@ def test_graph_edge_sort_by_combined(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
 
 
-@pytest.mark.parametrize("graph", [Graph, PersistentGraph])
+@pytest.mark.parametrize("graph", [EVENT_GRAPH, PERSISTENT_GRAPH])
 def test_graph_edge_sort_by_combined_2(graph):
     query = """
     query {
@@ -674,4 +641,4 @@ def test_graph_edge_sort_by_combined_2(graph):
             }
         }
     }
-    run_graphql_test(query, expected_output, graph())
+    run_graphql_test(query, expected_output, graph)
diff --git a/...sts/graphql/test_graph_file_time_stats.py → ...est_graphql/test_graph_file_time_stats.py b/...sts/graphql/test_graph_file_time_stats.py → ...est_graphql/test_graph_file_time_stats.py
diff --git a/...test_graph_nodes_edges_property_filter.py → ...test_graph_nodes_edges_property_filter.py b/...test_graph_nodes_edges_property_filter.py → ...test_graph_nodes_edges_property_filter.py