From 009b2f2d78c24c2043580ce217fbfac1838c887f Mon Sep 17 00:00:00 2001
From: Areg Sarinyan <ar.sarinyan@gmail.com>
Date: Wed, 8 Jan 2025 14:19:08 +0400
Subject: [PATCH] chore: changes to allign with current implementation

---
 src/tools/draco.py | 70 ----------------------------------------------
 src/tools/run.py   | 48 +++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 70 deletions(-)
 delete mode 100644 src/tools/draco.py

diff --git a/src/tools/draco.py b/src/tools/draco.py
deleted file mode 100644
index 7aa3e51..0000000
--- a/src/tools/draco.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""module to run Draco on Deep Origin"""
-
-from beartype import beartype
-from deeporigin.config import get_value
-from deeporigin.data_hub import api
-from deeporigin.platform import tools
-from deeporigin.tools.utils import _get_cluster_id, _resolve_column_name
-
-
-@beartype
-def start_run(
-    *,
-    database_id: str,
-    row_id: str,
-    input_file_column_name: str,
-    output_column_name: str,
-) -> str:
-    """starts an Draco run
-
-    Args:
-        database_id (str): database ID or name of the database to source inputs from and write outputs to
-        row_id (str, optional): row ID or name of the row to source inputs from and write outputs to.
-        input_file_column_name (str): name of the column to source the input file from
-        output_column_name (str): name of the column to write output file to
-
-    Returns:
-        str: job ID of the run
-
-
-    """
-
-    if not database_id.startswith("_database"):
-        data = api.convert_id_format(hids=[database_id])
-        database_id = data[0].id
-
-    db = api.describe_database(database_id=database_id)
-    cols = db.cols
-
-    # resolve columns
-    output_column_id = _resolve_column_name(output_column_name, cols)
-    input_file_column_id = _resolve_column_name(input_file_column_name, cols)
-
-    json_data = {
-        "toolId": "deeporigin/draco",
-        "inputs": {
-            "input_file": {
-                "rowId": row_id,
-                "columnId": input_file_column_id,
-                "databaseId": database_id,
-            },
-        },
-        "outputs": {
-            "output_file": {
-                "rowId": row_id,
-                "columnId": output_column_id,
-                "databaseId": database_id,
-            },
-        },
-        "clusterId": _get_cluster_id(),
-    }
-
-    response = tools.execute_tool(
-        org_friendly_id=get_value()["organization_id"],
-        execute_tool_dto=json_data,
-    )
-
-    job_id = response.id
-
-    print(f"🧬 Job started with ID: {job_id}")
-    return job_id
diff --git a/src/tools/run.py b/src/tools/run.py
index ac57d70..1a3b677 100644
--- a/src/tools/run.py
+++ b/src/tools/run.py
@@ -243,6 +243,54 @@ def autodock_vina(
         tool_id="deeporigin/autodock-vina",
     )
 
+@beartype
+def draco(
+    *,
+    database_id: str,
+    row_id: str,
+    input_file_column_name: str,
+    output_column_name: str,
+) -> str:
+    """starts an Draco run
+
+    Args:
+        database_id (str): database ID or name of the database to source inputs from and write outputs to
+        row_id (str, optional): row ID or name of the row to source inputs from and write outputs to.
+        input_file_column_name (str): name of the column to source the input file from
+        output_column_name (str): name of the column to write output file to
+
+    Returns:
+        str: job ID of the run
+
+
+    """
+
+    TOOL_ID = "deeporigin/draco"
+
+    inputs = dict(
+        input_file={
+            "rowId": row_id,
+            "columnId": input_file_column_name,
+            "databaseId": database_id,
+        },
+    )
+    outputs = dict(
+        output_file={
+            "rowId": row_id,
+            "columnId": output_column_name,
+            "databaseId": database_id,
+        },
+    )
+
+    db = api.describe_database(database_id=database_id)
+
+    return _process_job(
+        cols=db.cols,
+        inputs=inputs,
+        outputs=outputs,
+        tool_id=TOOL_ID,
+    )
+
 
 @beartype
 def _process_job(