scientiflow-cli 0.4.11__tar.gz → 0.4.13__tar.gz

{scientiflow_cli-0.4.11 → scientiflow_cli-0.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scientiflow-cli
-Version: 0.4.11
+Version: 0.4.13
 Summary: CLI tool for scientiflow. This application runs on the client side, decodes pipelines, and executes them in the configured order!
 License: Proprietary
 Author: ScientiFlow

{scientiflow_cli-0.4.11 → scientiflow_cli-0.4.13}/pyproject.toml

@@ -3,7 +3,7 @@ mode = "prod"
 
 [tool.poetry]
 name = "scientiflow-cli"
-version = "0.4.11"
+version = "0.4.13"
 description = "CLI tool for scientiflow. This application runs on the client side, decodes pipelines, and executes them in the configured order!"
 authors = ["ScientiFlow <scientiflow@gmail.com>"]
 license = "Proprietary"

{scientiflow_cli-0.4.11 → scientiflow_cli-0.4.13}/scientiflow_cli/services/executor.py

@@ -37,6 +37,9 @@ def execute_jobs(job_ids: list[int] = None, parallel: bool = False, is_cloud: bo
             if matching_jobs:
                 if is_cloud:
                     for job in matching_jobs:
+                        job['project_title'] = job['project']['id'] + '_' + job['project']['project_title']
+                        if 'server' not in job or job['server'] is None:
+                            job['server'] = {'base_directory':None}
                         job['server']['base_directory'] = get_base_directory()
                 jobs_to_execute.extend(matching_jobs)
             else:
@@ -156,7 +159,7 @@ def execute_single_job(job: dict, is_cloud: bool = False) -> None:
         if job_status != "running":
             if job["new_job"] == 1:
                 # Initialize folders for the project / project_job 
-                create_job_dirs(job, is_cloud)
+                create_job_dirs(job)
 
             # Fetch the files and folder from the backend
             get_job_files(job)

{scientiflow_cli-0.4.11 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/file_manager.py

@@ -37,12 +37,9 @@ def get_job_files(job: dict) -> None:
 
     printer.print_success(f"[+] Files extracted to {str(project_dir_name).strip()}")
         
-def create_job_dirs(job: dict, is_cloud: bool = False) -> None:
+def create_job_dirs(job: dict) -> None:
     base_dir = Path(job['server']['base_directory'])
-    if is_cloud:
-        project_dir = base_dir / (str(job['project']['id'])+"_"+job['project']['project_title'])
-    else:
-        project_dir = base_dir / job['project']['project_title']       
+    project_dir = base_dir / job['project']['project_title']       
     job_dir = project_dir / job['project_job']['job_directory']
     job_dir.mkdir(parents=True, exist_ok=True)