scientiflow-cli 0.4.11__py3-none-any.whl → 0.4.13__py3-none-any.whl

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/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)
 

{scientiflow_cli-0.4.11.dist-info → scientiflow_cli-0.4.13.dist-info}/METADATA

@@ -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.dist-info → scientiflow_cli-0.4.13.dist-info}/RECORD

@@ -12,7 +12,7 @@ scientiflow_cli/pipeline/get_jobs.py,sha256=69jOIVwXd8j2lAYy28r2QcsjFT4yRpXNOqsf
 scientiflow_cli/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scientiflow_cli/services/auth_service.py,sha256=lknARfVTjRCH-4yWVPKiS330NIVHxFw3HlQdN2Lw3Og,3343
 scientiflow_cli/services/base_directory.py,sha256=2dUvGYk4enLe3Cagcs_bfv2kNuHg1ws-dtMDEW_tccI,2726
-scientiflow_cli/services/executor.py,sha256=Fum3VHiIt4IHBE3-AAXEtrKmPhdKjj1cHw_xS2fIjs8,11705
+scientiflow_cli/services/executor.py,sha256=IFtWozfDJZsuU1TxDKvckVmB0vLA32ns4jvLb0IriDM,11944
 scientiflow_cli/services/modes.py,sha256=-Bk1CJO0vgc8v_rXktfKAyHSF6cr5bGbufSGa_DtvY4,1241
 scientiflow_cli/services/request_handler.py,sha256=CjJqEjXt8AOzyZq6UwUBzRBhahqWHj1_OKUyPG3PpFs,1335
 scientiflow_cli/services/rich_printer.py,sha256=5ORAaZOa_84m6vP-novpPOI70UPxt0pEvmRq9999Ifg,2129
@@ -20,12 +20,12 @@ scientiflow_cli/services/status_updater.py,sha256=VjC2V6lWzjwBN7ZhCQzW_h_sMG25Po
 scientiflow_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scientiflow_cli/utils/config.py,sha256=iq9aEVwlJA-KLPWX6Vtx6SaEgH3UAuKjNIODw2mGYxY,256
 scientiflow_cli/utils/encryption.py,sha256=iQ-b40i75JvoB1cGANDqzZXLztD54toO_6loX1m5W9Q,1107
-scientiflow_cli/utils/file_manager.py,sha256=OjIXM_VV8t4ctLQDFo7g2sYf9ewPb2n5pe07J7OcvrY,2075
+scientiflow_cli/utils/file_manager.py,sha256=KLdJlIzFng_BfKHHZzQNp35hXsFMWfgy4OUqodadzss,1923
 scientiflow_cli/utils/logger.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scientiflow_cli/utils/mock.py,sha256=UZ9cN2Qx3EAXcxnLQY5z4DQWy4jflnWFnfNTsuvnFH8,11237
 scientiflow_cli/utils/singularity.py,sha256=jy8ep7Xa1Eg4fptNjyXLPuVN2KA8l4dFil-w-KaVNkw,4956
-scientiflow_cli-0.4.11.dist-info/LICENSE.md,sha256=nb6GGGYuS_KXe33mSNwcEW-QzvwM475NQ4cNE7KBb34,425
-scientiflow_cli-0.4.11.dist-info/METADATA,sha256=y1LNbm1rmY1J_Ck4xjqL9tit22N1ua3zljRjlCLED5M,2492
-scientiflow_cli-0.4.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-scientiflow_cli-0.4.11.dist-info/entry_points.txt,sha256=0lq2mjcG5hGfODrQodeMSAy9RfE2EX1MZSHRpfSncxc,61
-scientiflow_cli-0.4.11.dist-info/RECORD,,
+scientiflow_cli-0.4.13.dist-info/LICENSE.md,sha256=nb6GGGYuS_KXe33mSNwcEW-QzvwM475NQ4cNE7KBb34,425
+scientiflow_cli-0.4.13.dist-info/METADATA,sha256=84WZnqpSqI4s-EQgi_1VEsLWSDKB839LKdWPK7qZ89E,2492
+scientiflow_cli-0.4.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+scientiflow_cli-0.4.13.dist-info/entry_points.txt,sha256=0lq2mjcG5hGfODrQodeMSAy9RfE2EX1MZSHRpfSncxc,61
+scientiflow_cli-0.4.13.dist-info/RECORD,,