From e361f670405df784679f14909780a8379bc6b0f1 Mon Sep 17 00:00:00 2001 From: Dusko Mirkovic Date: Mon, 10 Jul 2023 14:04:58 +0200 Subject: [PATCH] CTX-4251: Update "model-queue/custom" to "run" endpoint --- coretex/coretex/experiment/experiment.py | 22 +++++++++------------- coretex/project/local.py | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/coretex/coretex/experiment/experiment.py b/coretex/coretex/experiment/experiment.py index 5116eb38..f97c888a 100644 --- a/coretex/coretex/experiment/experiment.py +++ b/coretex/coretex/experiment/experiment.py @@ -390,7 +390,7 @@ def createQiimeArtifact(self, rootArtifactFolderName: str, qiimeArtifactPath: Pa # logging.getLogger("coretexpylib").warning(f">> [Coretex] Failed to upload {localFilePath} to {remoteFilePath}") @classmethod - def startCustomExperiment( + def run( cls, projectId: int, nodeId: Union[int, str], @@ -438,7 +438,7 @@ def startCustomExperiment( ] \b >>> try: - experiment = Experiment.startCustomExperiment( + experiment = Experiment.run( projectId = 1023, nodeId = 23, name = "Dummy Custom Experiment @@ -457,17 +457,13 @@ def startCustomExperiment( if parameters is None: parameters = [] - response = networkManager.genericJSONRequest( - f"{cls._endpoint()}/custom", - RequestType.post, - parameters={ - "sub_project_id": projectId, - "service_id": nodeId, - "name": name, - "description": description, - "parameters": parameters - } - ) + response = networkManager.genericJSONRequest("run", RequestType.post, { + "sub_project_id": projectId, + "service_id": nodeId, + "name": name, + "description": description, + "parameters": parameters + }) if response.hasFailed(): raise NetworkRequestError(response, "Failed to create experiment") diff --git a/coretex/project/local.py b/coretex/project/local.py index 28628298..6a80144b 100644 --- a/coretex/project/local.py +++ b/coretex/project/local.py @@ -113,7 +113,7 @@ def processLocal(args: Optional[List[str]] = None) -> Tuple[int, ProjectCallback parameters = ExperimentParameter.readExperimentConfig() - experiment: Experiment = Experiment.startCustomExperiment( + experiment: Experiment = Experiment.run( parser.projectId, # Dummy Local node ID, hardcoded as it is only a temporary solution, # backend will add a new ExperimentType (local) which does not require a specific