From 666403684fb7d0214547dc9816da9e0dcb5b0ad1 Mon Sep 17 00:00:00 2001 From: Casey Jao Date: Wed, 18 Oct 2023 18:38:20 -0400 Subject: [PATCH] Fix UI backend tests --- .../end_points/electrons_test.py | 1 - .../end_points/lattices_test.py | 2 - .../utils/assert_data/electrons.py | 2 +- .../utils/assert_data/lattices.py | 8 +- .../utils/assert_data/summary.py | 4 +- .../utils/data/electrons.json | 152 ++++++++++++++++++ .../utils/data/lattices.json | 20 ++- .../utils/seed_script.py | 3 + 8 files changed, 177 insertions(+), 15 deletions(-) diff --git a/tests/covalent_ui_backend_tests/end_points/electrons_test.py b/tests/covalent_ui_backend_tests/end_points/electrons_test.py index 7ab596f9f..1c55d0e79 100644 --- a/tests/covalent_ui_backend_tests/end_points/electrons_test.py +++ b/tests/covalent_ui_backend_tests/end_points/electrons_test.py @@ -110,7 +110,6 @@ def test_electrons_details_function(): assert response.json() == test_data["response_data"] -@pytest.mark.skip(reason="TODO: Fix this failing test, see PR #1729") def test_electrons_details_executor(): """ "Test electrons for executor details""" test_data = output_data["test_electrons_details"]["case_executor_1"] diff --git a/tests/covalent_ui_backend_tests/end_points/lattices_test.py b/tests/covalent_ui_backend_tests/end_points/lattices_test.py index f3ef80d80..89f7ada63 100644 --- a/tests/covalent_ui_backend_tests/end_points/lattices_test.py +++ b/tests/covalent_ui_backend_tests/end_points/lattices_test.py @@ -135,7 +135,6 @@ def test_lattices_function_errors(): assert response.json() == test_data["response_data"] -@pytest.mark.skip(reason="TODO: Fix this failing test, see PR #1729") def test_lattices_function_executor(): """Test lattices results""" test_data = output_data["test_lattices_file"]["case_executor_1"] @@ -150,7 +149,6 @@ def test_lattices_function_executor(): assert response.json() == test_data["response_data"] -@pytest.mark.skip(reason="TODO: Fix this failing test, see PR #1729") def test_lattices_function_workflow_executor(): """Test lattices results""" test_data = output_data["test_lattices_file"]["case_workflow_executor_1"] diff --git a/tests/covalent_ui_backend_tests/utils/assert_data/electrons.py b/tests/covalent_ui_backend_tests/utils/assert_data/electrons.py index 61de28089..3930a22c5 100644 --- a/tests/covalent_ui_backend_tests/utils/assert_data/electrons.py +++ b/tests/covalent_ui_backend_tests/utils/assert_data/electrons.py @@ -95,7 +95,7 @@ def seed_electron_data(): "electron_id": VALID_NODE_ID, "name": "executor", }, - "response_data": {"executor_name": "dask", "executor_details": None}, + "response_data": {"executor_name": "dask", "executor_details": {}}, }, "case_result_1": { "status_code": 200, diff --git a/tests/covalent_ui_backend_tests/utils/assert_data/lattices.py b/tests/covalent_ui_backend_tests/utils/assert_data/lattices.py index 1c04f490a..5032ad3ab 100644 --- a/tests/covalent_ui_backend_tests/utils/assert_data/lattices.py +++ b/tests/covalent_ui_backend_tests/utils/assert_data/lattices.py @@ -108,7 +108,7 @@ def seed_lattice_data(): "dispatch_id": VALID_DISPATCH_ID, "name": "executor", }, - "response_data": {"executor_name": "dask", "executor_details": None}, + "response_data": {"executor_name": "dask", "executor_details": {}}, }, "case_workflow_executor_1": { "status_code": 200, @@ -118,7 +118,7 @@ def seed_lattice_data(): }, "response_data": { "workflow_executor_name": "dask", - "workflow_executor_details": None, + "workflow_executor_details": {}, }, }, "case_transport_graph_1": { @@ -173,7 +173,7 @@ def seed_lattice_data(): "started_at": "2022-10-27T10:08:34.497285", "ended_at": "2022-10-27T10:08:35.997225", "status": "COMPLETED", - "updated_at": "2022-10-27T10:08:36.004030", + "updated_at": "2022-10-27T10:08:36.00403", }, ] }, @@ -193,7 +193,7 @@ def seed_lattice_data(): "started_at": "2022-10-27T10:08:34.497285", "ended_at": "2022-10-27T10:08:35.997225", "status": "COMPLETED", - "updated_at": "2022-10-27T10:08:36.004030", + "updated_at": "2022-10-27T10:08:36.00403", }, { "dispatch_id": "69dec597-79d9-4c99-96de-8d5f06f3d4dd", diff --git a/tests/covalent_ui_backend_tests/utils/assert_data/summary.py b/tests/covalent_ui_backend_tests/utils/assert_data/summary.py index 7b5bc0b29..f00b28d31 100644 --- a/tests/covalent_ui_backend_tests/utils/assert_data/summary.py +++ b/tests/covalent_ui_backend_tests/utils/assert_data/summary.py @@ -80,7 +80,7 @@ def seed_summary_data(): "started_at": "2022-09-23T10:01:11.155428", "ended_at": "2022-09-23T10:01:11.717064", "status": "COMPLETED", - "updated_at": "2022-09-23T10:01:11.720140", + "updated_at": "2022-09-23T10:01:11.72014", }, { "dispatch_id": "e8fd09c9-1406-4686-9e77-c8d4d64a76ee", @@ -118,7 +118,7 @@ def seed_summary_data(): "started_at": "2022-09-23T10:01:11.155428", "ended_at": "2022-09-23T10:01:11.717064", "status": "COMPLETED", - "updated_at": "2022-09-23T10:01:11.720140", + "updated_at": "2022-09-23T10:01:11.72014", } ], "total_count": 3, diff --git a/tests/covalent_ui_backend_tests/utils/data/electrons.json b/tests/covalent_ui_backend_tests/utils/data/electrons.json index 999ed832f..7fe8b7670 100644 --- a/tests/covalent_ui_backend_tests/utils/data/electrons.json +++ b/tests/covalent_ui_backend_tests/utils/data/electrons.json @@ -6,6 +6,7 @@ "created_at": "2022-09-23 10:01:11.062647", "deps_filename": "deps.pkl", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -37,6 +38,7 @@ "created_at": "2022-09-23 10:01:11.075465", "deps_filename": "deps.pkl", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -68,6 +70,7 @@ "created_at": "2022-09-23 10:01:11.085971", "deps_filename": "deps.pkl", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -99,6 +102,7 @@ "created_at": "2022-09-23 10:01:11.098325", "deps_filename": "deps.pkl", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -130,6 +134,7 @@ "created_at": "2022-09-23 10:01:11.109305", "deps_filename": "deps.pkl", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -161,6 +166,7 @@ "created_at": "2022-09-23 10:01:11.121100", "deps_filename": "deps.pkl", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -210,6 +216,7 @@ "started_at": "2022-10-27 10:08:33.861837", "completed_at": "2022-10-27 10:08:33.933100", "executor": "dask", + "executor_data": {}, "job_id": 5, "qelectron_data_exists": false, @@ -241,6 +248,7 @@ "started_at": "2022-10-27 10:08:33.827366", "completed_at": "2022-10-27 10:08:33.827372", "executor": "dask", + "executor_data": {}, "job_id": 6, "qelectron_data_exists": false, @@ -272,6 +280,7 @@ "started_at": "2022-10-27 10:08:33.967565", "completed_at": "2022-10-27 10:08:36.028194", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -303,6 +312,7 @@ "started_at": "2022-10-27 10:08:36.065830", "completed_at": "2022-10-27 10:08:43.905519", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -334,6 +344,7 @@ "started_at": "2022-10-27 10:08:34.939603", "completed_at": "2022-10-27 10:08:35.159092", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -365,6 +376,7 @@ "started_at": "2022-10-27 10:08:34.523975", "completed_at": "2022-10-27 10:08:34.523987", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -396,6 +408,7 @@ "started_at": "2022-10-27 10:08:34.968949", "completed_at": "2022-10-27 10:08:35.238154", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -427,6 +440,7 @@ "started_at": "2022-10-27 10:08:34.576178", "completed_at": "2022-10-27 10:08:34.576181", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -458,6 +472,7 @@ "started_at": "2022-10-27 10:08:35.011096", "completed_at": "2022-10-27 10:08:35.324016", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -489,6 +504,7 @@ "started_at": "2022-10-27 10:08:34.614049", "completed_at": "2022-10-27 10:08:34.614051", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -520,6 +536,7 @@ "started_at": "2022-10-27 10:08:35.058712", "completed_at": "2022-10-27 10:08:35.408068", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -551,6 +568,7 @@ "started_at": "2022-10-27 10:08:34.647511", "completed_at": "2022-10-27 10:08:34.647516", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -582,6 +600,7 @@ "started_at": "2022-10-27 10:08:35.109570", "completed_at": "2022-10-27 10:08:35.558177", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -613,6 +632,7 @@ "started_at": "2022-10-27 10:08:34.689654", "completed_at": "2022-10-27 10:08:34.689659", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -644,6 +664,7 @@ "started_at": "2022-10-27 10:08:35.193220", "completed_at": "2022-10-27 10:08:35.514718", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -675,6 +696,7 @@ "started_at": "2022-10-27 10:08:34.729529", "completed_at": "2022-10-27 10:08:34.729533", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -706,6 +728,7 @@ "started_at": "2022-10-27 10:08:35.287892", "completed_at": "2022-10-27 10:08:35.673424", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -737,6 +760,7 @@ "started_at": "2022-10-27 10:08:34.769243", "completed_at": "2022-10-27 10:08:34.769254", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -768,6 +792,7 @@ "started_at": "2022-10-27 10:08:35.354986", "completed_at": "2022-10-27 10:08:35.763519", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -799,6 +824,7 @@ "started_at": "2022-10-27 10:08:34.810072", "completed_at": "2022-10-27 10:08:34.810076", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -830,6 +856,7 @@ "started_at": "2022-10-27 10:08:35.447829", "completed_at": "2022-10-27 10:08:35.809561", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -861,6 +888,7 @@ "started_at": "2022-10-27 10:08:34.853785", "completed_at": "2022-10-27 10:08:34.853790", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -892,6 +920,7 @@ "started_at": "2022-10-27 10:08:35.596881", "completed_at": "2022-10-27 10:08:35.861501", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -923,6 +952,7 @@ "started_at": "2022-10-27 10:08:34.895470", "completed_at": "2022-10-27 10:08:34.895475", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -954,6 +984,7 @@ "started_at": "2022-10-27 10:08:42.917693", "completed_at": "2022-10-27 10:08:43.165874", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -985,6 +1016,7 @@ "started_at": "2022-10-27 10:08:42.299329", "completed_at": "2022-10-27 10:08:42.506677", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1016,6 +1048,7 @@ "started_at": "2022-10-27 10:08:38.780790", "completed_at": "2022-10-27 10:08:38.780796", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1047,6 +1080,7 @@ "started_at": "2022-10-27 10:08:38.820257", "completed_at": "2022-10-27 10:08:38.820263", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1078,6 +1112,7 @@ "started_at": "2022-10-27 10:08:38.854643", "completed_at": "2022-10-27 10:08:38.854648", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1109,6 +1144,7 @@ "started_at": "2022-10-27 10:08:38.887957", "completed_at": "2022-10-27 10:08:38.887961", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1140,6 +1176,7 @@ "started_at": "2022-10-27 10:08:38.922953", "completed_at": "2022-10-27 10:08:38.922958", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1171,6 +1208,7 @@ "started_at": "2022-10-27 10:08:38.964715", "completed_at": "2022-10-27 10:08:38.964719", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1202,6 +1240,7 @@ "started_at": "2022-10-27 10:08:39.035460", "completed_at": "2022-10-27 10:08:39.035471", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1233,6 +1272,7 @@ "started_at": "2022-10-27 10:08:39.090917", "completed_at": "2022-10-27 10:08:39.090918", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1264,6 +1304,7 @@ "started_at": "2022-10-27 10:08:39.115263", "completed_at": "2022-10-27 10:08:39.115265", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1295,6 +1336,7 @@ "started_at": "2022-10-27 10:08:39.140423", "completed_at": "2022-10-27 10:08:39.140424", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1326,6 +1368,7 @@ "started_at": "2022-10-27 10:08:42.962785", "completed_at": "2022-10-27 10:08:43.253146", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1357,6 +1400,7 @@ "started_at": "2022-10-27 10:08:42.322474", "completed_at": "2022-10-27 10:08:42.587122", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1388,6 +1432,7 @@ "started_at": "2022-10-27 10:08:39.170609", "completed_at": "2022-10-27 10:08:39.170613", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1419,6 +1464,7 @@ "started_at": "2022-10-27 10:08:39.205854", "completed_at": "2022-10-27 10:08:39.205857", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1450,6 +1496,7 @@ "started_at": "2022-10-27 10:08:39.248043", "completed_at": "2022-10-27 10:08:39.248047", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1481,6 +1528,7 @@ "started_at": "2022-10-27 10:08:39.277848", "completed_at": "2022-10-27 10:08:39.277851", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1512,6 +1560,7 @@ "started_at": "2022-10-27 10:08:39.306032", "completed_at": "2022-10-27 10:08:39.306035", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1543,6 +1592,7 @@ "started_at": "2022-10-27 10:08:39.339834", "completed_at": "2022-10-27 10:08:39.339839", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1574,6 +1624,7 @@ "started_at": "2022-10-27 10:08:39.372707", "completed_at": "2022-10-27 10:08:39.372710", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1605,6 +1656,7 @@ "started_at": "2022-10-27 10:08:39.406279", "completed_at": "2022-10-27 10:08:39.406281", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1636,6 +1688,7 @@ "started_at": "2022-10-27 10:08:39.438271", "completed_at": "2022-10-27 10:08:39.438274", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1667,6 +1720,7 @@ "started_at": "2022-10-27 10:08:39.471663", "completed_at": "2022-10-27 10:08:39.471666", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1698,6 +1752,7 @@ "started_at": "2022-10-27 10:08:43.012521", "completed_at": "2022-10-27 10:08:43.340161", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1729,6 +1784,7 @@ "started_at": "2022-10-27 10:08:42.364016", "completed_at": "2022-10-27 10:08:42.650965", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1760,6 +1816,7 @@ "started_at": "2022-10-27 10:08:39.504710", "completed_at": "2022-10-27 10:08:39.504713", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1791,6 +1848,7 @@ "started_at": "2022-10-27 10:08:39.536280", "completed_at": "2022-10-27 10:08:39.536282", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1822,6 +1880,7 @@ "started_at": "2022-10-27 10:08:39.567594", "completed_at": "2022-10-27 10:08:39.567598", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1853,6 +1912,7 @@ "started_at": "2022-10-27 10:08:39.602978", "completed_at": "2022-10-27 10:08:39.602981", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1884,6 +1944,7 @@ "started_at": "2022-10-27 10:08:39.636935", "completed_at": "2022-10-27 10:08:39.636938", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1915,6 +1976,7 @@ "started_at": "2022-10-27 10:08:39.676238", "completed_at": "2022-10-27 10:08:39.676241", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1946,6 +2008,7 @@ "started_at": "2022-10-27 10:08:39.710482", "completed_at": "2022-10-27 10:08:39.710485", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -1977,6 +2040,7 @@ "started_at": "2022-10-27 10:08:39.743820", "completed_at": "2022-10-27 10:08:39.743822", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2008,6 +2072,7 @@ "started_at": "2022-10-27 10:08:39.776311", "completed_at": "2022-10-27 10:08:39.776316", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2039,6 +2104,7 @@ "started_at": "2022-10-27 10:08:39.813526", "completed_at": "2022-10-27 10:08:39.813527", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2070,6 +2136,7 @@ "started_at": "2022-10-27 10:08:43.124746", "completed_at": "2022-10-27 10:08:43.502348", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2101,6 +2168,7 @@ "started_at": "2022-10-27 10:08:42.410990", "completed_at": "2022-10-27 10:08:42.767106", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2132,6 +2200,7 @@ "started_at": "2022-10-27 10:08:39.840526", "completed_at": "2022-10-27 10:08:39.840528", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2163,6 +2232,7 @@ "started_at": "2022-10-27 10:08:39.872532", "completed_at": "2022-10-27 10:08:39.872534", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2194,6 +2264,7 @@ "started_at": "2022-10-27 10:08:39.905887", "completed_at": "2022-10-27 10:08:39.905891", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2225,6 +2296,7 @@ "started_at": "2022-10-27 10:08:39.937792", "completed_at": "2022-10-27 10:08:39.937795", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2256,6 +2328,7 @@ "started_at": "2022-10-27 10:08:39.973990", "completed_at": "2022-10-27 10:08:39.973995", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2287,6 +2360,7 @@ "started_at": "2022-10-27 10:08:40.004694", "completed_at": "2022-10-27 10:08:40.004696", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2318,6 +2392,7 @@ "started_at": "2022-10-27 10:08:40.038140", "completed_at": "2022-10-27 10:08:40.038143", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2349,6 +2424,7 @@ "started_at": "2022-10-27 10:08:40.071383", "completed_at": "2022-10-27 10:08:40.071386", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2380,6 +2456,7 @@ "started_at": "2022-10-27 10:08:40.105934", "completed_at": "2022-10-27 10:08:40.105939", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2411,6 +2488,7 @@ "started_at": "2022-10-27 10:08:40.142740", "completed_at": "2022-10-27 10:08:40.142743", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2442,6 +2520,7 @@ "started_at": "2022-10-27 10:08:43.041103", "completed_at": "2022-10-27 10:08:43.419548", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2473,6 +2552,7 @@ "started_at": "2022-10-27 10:08:42.460853", "completed_at": "2022-10-27 10:08:42.796610", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2504,6 +2584,7 @@ "started_at": "2022-10-27 10:08:40.181654", "completed_at": "2022-10-27 10:08:40.181662", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2535,6 +2616,7 @@ "started_at": "2022-10-27 10:08:40.220720", "completed_at": "2022-10-27 10:08:40.220725", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2566,6 +2648,7 @@ "started_at": "2022-10-27 10:08:40.254308", "completed_at": "2022-10-27 10:08:40.254312", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2597,6 +2680,7 @@ "started_at": "2022-10-27 10:08:40.293041", "completed_at": "2022-10-27 10:08:40.293044", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2628,6 +2712,7 @@ "started_at": "2022-10-27 10:08:40.339703", "completed_at": "2022-10-27 10:08:40.339706", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2659,6 +2744,7 @@ "started_at": "2022-10-27 10:08:40.388397", "completed_at": "2022-10-27 10:08:40.388409", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2690,6 +2776,7 @@ "started_at": "2022-10-27 10:08:40.427023", "completed_at": "2022-10-27 10:08:40.427026", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2721,6 +2808,7 @@ "started_at": "2022-10-27 10:08:40.476868", "completed_at": "2022-10-27 10:08:40.476872", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2752,6 +2840,7 @@ "started_at": "2022-10-27 10:08:40.524104", "completed_at": "2022-10-27 10:08:40.524107", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2783,6 +2872,7 @@ "started_at": "2022-10-27 10:08:40.568992", "completed_at": "2022-10-27 10:08:40.569005", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2814,6 +2904,7 @@ "started_at": "2022-10-27 10:08:43.207640", "completed_at": "2022-10-27 10:08:43.589035", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2845,6 +2936,7 @@ "started_at": "2022-10-27 10:08:42.540112", "completed_at": "2022-10-27 10:08:42.874105", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2876,6 +2968,7 @@ "started_at": "2022-10-27 10:08:40.606339", "completed_at": "2022-10-27 10:08:40.606344", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2907,6 +3000,7 @@ "started_at": "2022-10-27 10:08:40.641995", "completed_at": "2022-10-27 10:08:40.641996", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2938,6 +3032,7 @@ "started_at": "2022-10-27 10:08:40.672991", "completed_at": "2022-10-27 10:08:40.672994", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -2969,6 +3064,7 @@ "started_at": "2022-10-27 10:08:40.696115", "completed_at": "2022-10-27 10:08:40.696117", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3000,6 +3096,7 @@ "started_at": "2022-10-27 10:08:40.722953", "completed_at": "2022-10-27 10:08:40.722956", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3031,6 +3128,7 @@ "started_at": "2022-10-27 10:08:40.755865", "completed_at": "2022-10-27 10:08:40.755868", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3062,6 +3160,7 @@ "started_at": "2022-10-27 10:08:40.793381", "completed_at": "2022-10-27 10:08:40.793384", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3093,6 +3192,7 @@ "started_at": "2022-10-27 10:08:40.828280", "completed_at": "2022-10-27 10:08:40.828284", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3124,6 +3224,7 @@ "started_at": "2022-10-27 10:08:40.865834", "completed_at": "2022-10-27 10:08:40.865850", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3155,6 +3256,7 @@ "started_at": "2022-10-27 10:08:40.908278", "completed_at": "2022-10-27 10:08:40.908311", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3186,6 +3288,7 @@ "started_at": "2022-10-27 10:08:43.290300", "completed_at": "2022-10-27 10:08:43.649360", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3217,6 +3320,7 @@ "started_at": "2022-10-27 10:08:42.622934", "completed_at": "2022-10-27 10:08:42.939996", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3248,6 +3352,7 @@ "started_at": "2022-10-27 10:08:40.941095", "completed_at": "2022-10-27 10:08:40.941099", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3279,6 +3384,7 @@ "started_at": "2022-10-27 10:08:40.976058", "completed_at": "2022-10-27 10:08:40.976061", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3310,6 +3416,7 @@ "started_at": "2022-10-27 10:08:41.009802", "completed_at": "2022-10-27 10:08:41.009805", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3341,6 +3448,7 @@ "started_at": "2022-10-27 10:08:41.048453", "completed_at": "2022-10-27 10:08:41.048457", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3372,6 +3480,7 @@ "started_at": "2022-10-27 10:08:41.086414", "completed_at": "2022-10-27 10:08:41.086417", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3403,6 +3512,7 @@ "started_at": "2022-10-27 10:08:41.116755", "completed_at": "2022-10-27 10:08:41.116759", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3434,6 +3544,7 @@ "started_at": "2022-10-27 10:08:41.149923", "completed_at": "2022-10-27 10:08:41.149926", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3465,6 +3576,7 @@ "started_at": "2022-10-27 10:08:41.186466", "completed_at": "2022-10-27 10:08:41.186469", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3496,6 +3608,7 @@ "started_at": "2022-10-27 10:08:41.218531", "completed_at": "2022-10-27 10:08:41.218536", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3527,6 +3640,7 @@ "started_at": "2022-10-27 10:08:41.250702", "completed_at": "2022-10-27 10:08:41.250704", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3558,6 +3672,7 @@ "started_at": "2022-10-27 10:08:43.375045", "completed_at": "2022-10-27 10:08:43.687405", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3589,6 +3704,7 @@ "started_at": "2022-10-27 10:08:42.677025", "completed_at": "2022-10-27 10:08:42.989021", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3620,6 +3736,7 @@ "started_at": "2022-10-27 10:08:41.288911", "completed_at": "2022-10-27 10:08:41.288914", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3651,6 +3768,7 @@ "started_at": "2022-10-27 10:08:41.322042", "completed_at": "2022-10-27 10:08:41.322045", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3682,6 +3800,7 @@ "started_at": "2022-10-27 10:08:41.356030", "completed_at": "2022-10-27 10:08:41.356033", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3713,6 +3832,7 @@ "started_at": "2022-10-27 10:08:41.389522", "completed_at": "2022-10-27 10:08:41.389525", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3744,6 +3864,7 @@ "started_at": "2022-10-27 10:08:41.421862", "completed_at": "2022-10-27 10:08:41.421865", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3775,6 +3896,7 @@ "started_at": "2022-10-27 10:08:41.457205", "completed_at": "2022-10-27 10:08:41.457208", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3806,6 +3928,7 @@ "started_at": "2022-10-27 10:08:41.491181", "completed_at": "2022-10-27 10:08:41.491184", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3837,6 +3960,7 @@ "started_at": "2022-10-27 10:08:41.522585", "completed_at": "2022-10-27 10:08:41.522588", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3868,6 +3992,7 @@ "started_at": "2022-10-27 10:08:41.556600", "completed_at": "2022-10-27 10:08:41.556602", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3899,6 +4024,7 @@ "started_at": "2022-10-27 10:08:41.590899", "completed_at": "2022-10-27 10:08:41.590902", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3930,6 +4056,7 @@ "started_at": "2022-10-27 10:08:43.541105", "completed_at": "2022-10-27 10:08:43.761303", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3961,6 +4088,7 @@ "started_at": "2022-10-27 10:08:42.724995", "completed_at": "2022-10-27 10:08:43.086071", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -3992,6 +4120,7 @@ "started_at": "2022-10-27 10:08:41.622560", "completed_at": "2022-10-27 10:08:41.622563", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4023,6 +4152,7 @@ "started_at": "2022-10-27 10:08:41.656441", "completed_at": "2022-10-27 10:08:41.656443", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4054,6 +4184,7 @@ "started_at": "2022-10-27 10:08:41.691678", "completed_at": "2022-10-27 10:08:41.691681", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4085,6 +4216,7 @@ "started_at": "2022-10-27 10:08:41.725404", "completed_at": "2022-10-27 10:08:41.725407", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4116,6 +4248,7 @@ "started_at": "2022-10-27 10:08:41.759767", "completed_at": "2022-10-27 10:08:41.759771", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4147,6 +4280,7 @@ "started_at": "2022-10-27 10:08:41.799118", "completed_at": "2022-10-27 10:08:41.799121", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4178,6 +4312,7 @@ "started_at": "2022-10-27 10:08:41.830166", "completed_at": "2022-10-27 10:08:41.830169", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4209,6 +4344,7 @@ "started_at": "2022-10-27 10:08:41.864510", "completed_at": "2022-10-27 10:08:41.864513", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4240,6 +4376,7 @@ "started_at": "2022-10-27 10:08:41.900656", "completed_at": "2022-10-27 10:08:41.900659", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4271,6 +4408,7 @@ "started_at": "2022-10-27 10:08:41.935954", "completed_at": "2022-10-27 10:08:41.935957", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4302,6 +4440,7 @@ "started_at": "2022-10-27 10:08:43.459156", "completed_at": "2022-10-27 10:08:43.724659", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4333,6 +4472,7 @@ "started_at": "2022-10-27 10:08:42.835169", "completed_at": "2022-10-27 10:08:43.060465", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4364,6 +4504,7 @@ "started_at": "2022-10-27 10:08:41.970618", "completed_at": "2022-10-27 10:08:41.970621", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4395,6 +4536,7 @@ "started_at": "2022-10-27 10:08:41.998870", "completed_at": "2022-10-27 10:08:41.998874", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4426,6 +4568,7 @@ "started_at": "2022-10-27 10:08:42.032233", "completed_at": "2022-10-27 10:08:42.032236", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4457,6 +4600,7 @@ "started_at": "2022-10-27 10:08:42.065366", "completed_at": "2022-10-27 10:08:42.065369", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4488,6 +4632,7 @@ "started_at": "2022-10-27 10:08:42.099840", "completed_at": "2022-10-27 10:08:42.099844", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4519,6 +4664,7 @@ "started_at": "2022-10-27 10:08:42.134805", "completed_at": "2022-10-27 10:08:42.134812", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4550,6 +4696,7 @@ "started_at": "2022-10-27 10:08:42.170433", "completed_at": "2022-10-27 10:08:42.170438", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4581,6 +4728,7 @@ "started_at": "2022-10-27 10:08:42.202646", "completed_at": "2022-10-27 10:08:42.202650", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4612,6 +4760,7 @@ "started_at": "2022-10-27 10:08:42.233364", "completed_at": "2022-10-27 10:08:42.233366", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4643,6 +4792,7 @@ "started_at": "2022-10-27 10:08:42.265656", "completed_at": "2022-10-27 10:08:42.265658", "executor": "dask", + "executor_data": {}, "job_id": 1, "qelectron_data_exists": false, @@ -4657,6 +4807,7 @@ "deps_filename": "deps.pkl", "error_filename": "error.log", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -4688,6 +4839,7 @@ "deps_filename": "deps.pkl", "error_filename": "error.log", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", diff --git a/tests/covalent_ui_backend_tests/utils/data/lattices.json b/tests/covalent_ui_backend_tests/utils/data/lattices.json index 1209c6286..c166bad06 100644 --- a/tests/covalent_ui_backend_tests/utils/data/lattices.json +++ b/tests/covalent_ui_backend_tests/utils/data/lattices.json @@ -13,6 +13,7 @@ "electron_num": 6, "error_filename": "error.log", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -32,7 +33,8 @@ "storage_type": "local", "updated_at": "2022-09-23 10:01:11.720140", - "workflow_executor": "dask" + "workflow_executor": "dask", + "workflow_executor_data": {} }, { "call_after_filename": "call_after.pkl", @@ -48,6 +50,7 @@ "electron_num": 4, "error_filename": "error.log", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -67,7 +70,8 @@ "storage_type": "local", "updated_at": "2022-10-27 10:08:43.997619", - "workflow_executor": "dask" + "workflow_executor": "dask", + "workflow_executor_data": {} }, { "call_after_filename": "call_after.pkl", @@ -83,6 +87,7 @@ "electron_num": 20, "error_filename": "error.log", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -102,7 +107,8 @@ "storage_type": "local", "updated_at": "2022-10-27 10:08:36.004030", - "workflow_executor": "dask" + "workflow_executor": "dask", + "workflow_executor_data": {} }, { "call_after_filename": "call_after.pkl", @@ -118,6 +124,7 @@ "electron_num": 120, "error_filename": "error.log", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -137,7 +144,8 @@ "storage_type": "local", "updated_at": "2022-10-27 10:08:43.890454", - "workflow_executor": "dask" + "workflow_executor": "dask", + "workflow_executor_data": {} }, { "call_after_filename": "call_after.pkl", @@ -153,6 +161,7 @@ "electron_num": 2, "error_filename": "error.log", "executor": "dask", + "executor_data": {}, "function_filename": "function.pkl", "function_string_filename": "function_string.txt", @@ -172,6 +181,7 @@ "storage_type": "local", "updated_at": "2023-08-10 10:08:55.946668", - "workflow_executor": "dask" + "workflow_executor": "dask", + "workflow_executor_data": {} } ] diff --git a/tests/covalent_ui_backend_tests/utils/seed_script.py b/tests/covalent_ui_backend_tests/utils/seed_script.py index c054d68e0..da24b03e4 100644 --- a/tests/covalent_ui_backend_tests/utils/seed_script.py +++ b/tests/covalent_ui_backend_tests/utils/seed_script.py @@ -61,7 +61,9 @@ def seed(engine): function_filename=item["function_filename"], function_string_filename=item["function_string_filename"], executor=item["executor"], + executor_data=json.dumps(item["executor_data"]), workflow_executor=item["workflow_executor"], + workflow_executor_data=json.dumps(item["workflow_executor_data"]), error_filename=item["error_filename"], inputs_filename=item["inputs_filename"], named_args_filename=item["named_args_filename"], @@ -100,6 +102,7 @@ def seed(engine): function_filename=item["function_filename"], function_string_filename=item["function_string_filename"], executor=item["executor"], + executor_data=json.dumps(item["executor_data"]), results_filename=item["results_filename"], value_filename=item["value_filename"], stdout_filename=item["stdout_filename"],