From 8d0672be5467ecb1f984ab20e76e2e70ad772b2f Mon Sep 17 00:00:00 2001 From: leahh Date: Tue, 10 Sep 2024 08:30:16 -0600 Subject: [PATCH] changed names of functions that export the graphml to export_graphml --- beeflow/common/gdb/gdb_driver.py | 2 +- beeflow/common/gdb/neo4j_cypher.py | 2 +- beeflow/common/gdb/neo4j_driver.py | 4 ++-- beeflow/common/wf_interface.py | 4 ++-- beeflow/wf_manager/resources/wf_utils.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/beeflow/common/gdb/gdb_driver.py b/beeflow/common/gdb/gdb_driver.py index 5529834e5..a3fe0f21b 100644 --- a/beeflow/common/gdb/gdb_driver.py +++ b/beeflow/common/gdb/gdb_driver.py @@ -289,5 +289,5 @@ def close(self): """Close the connection to the graph database.""" @abstractmethod - def export_dag(self): + def export_graphml(self): """Export a BEE workflow as a graphml.""" diff --git a/beeflow/common/gdb/neo4j_cypher.py b/beeflow/common/gdb/neo4j_cypher.py index 5dc315ece..aeaf9907a 100644 --- a/beeflow/common/gdb/neo4j_cypher.py +++ b/beeflow/common/gdb/neo4j_cypher.py @@ -727,7 +727,7 @@ def cleanup(tx): tx.run(cleanup_query) -def export_dag(tx, wf_id): +def export_graphml(tx, wf_id): """Export BEE workflow as graphml.""" short_id = wf_id[:6] export_query = ( diff --git a/beeflow/common/gdb/neo4j_driver.py b/beeflow/common/gdb/neo4j_driver.py index 8d591cfc5..e21dac18b 100644 --- a/beeflow/common/gdb/neo4j_driver.py +++ b/beeflow/common/gdb/neo4j_driver.py @@ -472,10 +472,10 @@ def _write_transaction(self, tx_fun, **kwargs): with self._driver.session() as session: session.write_transaction(tx_fun, **kwargs) - def export_dag(self, workflow_id): + def export_graphml(self, workflow_id): """Export a BEE workflow as a graphml.""" with self._driver.session() as session: - session.write_transaction(tx.export_dag, wf_id=workflow_id) + session.write_transaction(tx.export_graphml, wf_id=workflow_id) def _reconstruct_requirements(req_records): diff --git a/beeflow/common/wf_interface.py b/beeflow/common/wf_interface.py index b92317ac8..168740b85 100644 --- a/beeflow/common/wf_interface.py +++ b/beeflow/common/wf_interface.py @@ -305,6 +305,6 @@ def workflow_completed(self): """ return self._gdb_driver.workflow_completed(self._workflow_id) - def export_dag(self): + def export_graphml(self): """Export a BEE workflow as a graphml.""" - self._gdb_driver.export_dag(self._workflow_id) + self._gdb_driver.export_graphml(self._workflow_id) diff --git a/beeflow/wf_manager/resources/wf_utils.py b/beeflow/wf_manager/resources/wf_utils.py index 7510323b7..bf0ebdd74 100644 --- a/beeflow/wf_manager/resources/wf_utils.py +++ b/beeflow/wf_manager/resources/wf_utils.py @@ -300,7 +300,7 @@ def setup_workflow(wf_id, wf_name, wf_dir, wf_workdir, no_start, workflow=None, def export_dag(wf_id): """Export the DAG of the workflow.""" wfi = get_workflow_interface(wf_id) - wfi.export_dag() + wfi.export_graphml() def start_workflow(wf_id):