diff --git a/shared/workspaces/workspaces/system/services/remote_processing_service.py b/shared/workspaces/workspaces/system/services/remote_processing_service.py index cf5d7baa2280bd3afb7d400c17e4e55a6c5dbf58..4c50fb5695b7356066cb58da811a768cb7b86c80 100644 --- a/shared/workspaces/workspaces/system/services/remote_processing_service.py +++ b/shared/workspaces/workspaces/system/services/remote_processing_service.py @@ -33,6 +33,7 @@ class CapoInjector: if RemoteProcessingSites.NAASC.value in self.request.argument: system = current.split("-")[1] remote_profile = "naasc-" + system + logger.info(f"profile for request: {remote_profile}") return remote_profile return current @@ -94,10 +95,10 @@ class CapoInjector: path = self.dir_path / subspace.filename path.write_bytes(subspace.content) - logger.info(f"Writing capo subspace file to {self.dir_path}") + logger.info(f"Writing capo subspace file to {self.dir_path.__str__()}") def clear_subspace(self): - logger.info(f"Clearing capo subspace file from {self.dir_path}...") + logger.info(f"Clearing capo subspace file from {self.dir_path.__str__()}...") for file in os.listdir(self.dir_path): if file.endswith(".properties"): Path.unlink(self.dir_path / file) diff --git a/shared/workspaces/workspaces/workflow/services/workflow_service.py b/shared/workspaces/workspaces/workflow/services/workflow_service.py index 6add78b7fe7f1a9e88bb74d3acae5b9925c92380..fea0e5f4e1ad55c60b4ec626eb3bab47c83ac28a 100644 --- a/shared/workspaces/workspaces/workflow/services/workflow_service.py +++ b/shared/workspaces/workspaces/workflow/services/workflow_service.py @@ -220,14 +220,14 @@ class WorkflowService(WorkflowServiceIF): logger.info("Looking up workflow %s", request.workflow_name) definition = self.info.lookup_workflow_definition(request.workflow_name) - # Is this a remote execution workflow? - injector = CapoInjector(request) - remote = injector.is_remote_workflow() - # create a temporary directory if processing directory is not supplied, # needs to exist before template rendering temp_folder = self._make_temp_directory(request) if not request.results_dir else Path(request.results_dir) + # Is this a remote execution workflow? + injector = CapoInjector(request) + remote = injector.is_remote_workflow() + # if remote is true, create a capo subspace file in the request's directory if remote: logger.info("Creating Subspace File...")