merge to template tests

Author: RobRossmiller-TG

tests/run.sh

@@ -1,6 +1,7 @@
 clear
 python3 test/setup.py &&
   # pytest test/test_centrality.py::TestCentrality::test_degree_centrality1 #test/test_ml.py
-  pytest test/test_centrality.py::TestCentrality::test_pagerank
+  # pytest test/test_centrality.py::TestCentrality::test_pagerank
   # pytest test/test_ml.py
+  pytest test/test_centrality.py::TestCentrality
 echo 'done' 

tests/test/baseline/create_baselines.py

@@ -5,8 +5,8 @@
 
 
 def run():
-    PagerankBaseline(data_path_root, baseline_path_root).run()
-    # DegreeCentralityBaseline(data_path_root, baseline_path_root).run()
+    # PagerankBaseline(data_path_root, baseline_path_root).run()
+    DegreeCentralityBaseline(data_path_root, baseline_path_root).run()
     # FastRPBaseline(data_path_root, baseline_path_root).run()
 
 

tests/test/setup.py

@@ -1,13 +1,12 @@
 import json
 import os
 import re
-import time
 from glob import glob
 
 import pyTigerGraph as tg
 from dotenv import load_dotenv
 from pyTigerGraph.datasets import Datasets
-from tqdm import tqdm, trange
+from tqdm import tqdm
 
 import util
 from baseline import create_baselines
@@ -17,17 +16,6 @@
 pattern = re.compile(r'"name":\s*"tg_.*"')
 
 
-# def add_reverse_edge_to_schema(ds: Datasets):
-#     with open(f"{dataset.tmp_dir}/{ds.name}/create_schema.gsql") as f:
-#         schema: str = f.read()
-#     with open(f"{dataset.tmp_dir}/{ds.name}/create_schema.gsql", "w") as f:
-#         schema = schema.replace(
-#             "ADD DIRECTED EDGE Cite (from Paper, to Paper, time Int, is_train Bool, is_val Bool);",
-#             'ADD DIRECTED EDGE Cite (from Paper, to Paper, time Int, is_train Bool, is_val Bool) WITH REVERSE_EDGE="reverse_Cite";',
-#         )
-#         f.write(schema)
-#
-#
 def get_query_path(q_name):
     pth = glob(f"../algorithms/**/{q_name}.gsql", recursive=True)
     return pth[0]
@@ -40,9 +28,6 @@ def get_template_queries() -> list[str]:
         name = p.replace("../", "").split(".")[0].split("/")
         pkg = ".".join(x for x in name[:-1])
         name = ".".join(x for x in name)
-        # if ".degree_cent" not in name:
-        # if "louvain" not in name:
-        # continue
         paths.append((name, p))
         packages.append(pkg)
 
@@ -51,9 +36,6 @@ def get_template_queries() -> list[str]:
 
 
 if __name__ == "__main__":
-    # print(get_template_queries())
-    create_baselines.run()
-    exit(0)
     host_name = os.environ["HOST_NAME"]
     user_name = os.environ["USER_NAME"]
     password = os.environ["PASS"]
@@ -75,7 +57,9 @@ def get_template_queries() -> list[str]:
 
     dataset = Datasets("graph_algorithms_testing")
     conn.ingestDataset(dataset, getToken=True)
-    conn.getToken()
+
+    if os.environ.get("USE_TKN", "true").lower() == "true":
+        conn.getToken()
 
     conn.graphname = graph_name
     # install the queries
@@ -109,7 +93,7 @@ def get_template_queries() -> list[str]:
 
     pkg_queries = []
     queries = [q[0] for q in queries]
-    reg = re.compile(r"- (.*)\(.*\)")  # find insatlled pacakge query names
+    reg = re.compile(r"- (.*)\(.*\)")  # find installed pacakge query names
     for pkg in packages:
         r = conn.gsql(f"SHOW PACKAGE {pkg}")
         for p in reg.findall(r):

tests/test/test_centrality.py

@@ -347,6 +347,7 @@ def test_degree_centrality4(self, test_name):
     #         )
     #         self.check_result(baseline, result, template_flag)
     #
+    @pytest.mark.skip(reason="Still testing pagerank")
     @pytest.mark.parametrize("test_name", undirected_graphs + directed_graphs)
     def test_pagerank(self, test_name):
         params = {

tests/test/util.py

@@ -6,18 +6,19 @@
 load_dotenv()
 
 
-def get_featurizer(graph_name="graph_algorithms_testing"):
-    host_name = os.getenv("HOST_NAME")
-    user_name = os.getenv("USER_NAME")
-    password = os.getenv("PASS")
-    conn = tg.TigerGraphConnection(
-        host=host_name,
-        username=user_name,
-        password=password,
-        graphname=graph_name,
-    )
-    if os.environ.get("USE_TKN", "true").lower() == "true":
-        conn.getToken()
+def get_featurizer(conn:tg.TigerGraphConnection=None, graph_name="graph_algorithms_testing"):
+    if conn is None:
+        host_name = os.getenv("HOST_NAME")
+        user_name = os.getenv("USER_NAME")
+        password = os.getenv("PASS")
+        conn = tg.TigerGraphConnection(
+            host=host_name,
+            username=user_name,
+            password=password,
+            graphname=graph_name,
+        )
+        if os.environ.get("USE_TKN", "true").lower() == "true":
+            conn.getToken()
     f = conn.gds.featurizer()
     return f