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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/PKG-INFO +1 -1
  2. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/pyproject.toml +1 -1
  3. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/executor.py +2 -1
  4. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/file_manager.py +2 -5
  5. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/LICENSE.md +0 -0
  6. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/README.md +0 -0
  7. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/__init__.py +0 -0
  8. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/__main__.py +0 -0
  9. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/cli/__init__.py +0 -0
  10. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/cli/auth_utils.py +0 -0
  11. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/cli/login.py +0 -0
  12. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/cli/logout.py +0 -0
  13. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/main.py +0 -0
  14. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/pipeline/__init__.py +0 -0
  15. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/pipeline/container_manager.py +0 -0
  16. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/pipeline/decode_and_execute.py +0 -0
  17. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/pipeline/get_jobs.py +0 -0
  18. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/__init__.py +0 -0
  19. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/auth_service.py +0 -0
  20. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/base_directory.py +0 -0
  21. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/modes.py +0 -0
  22. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/request_handler.py +0 -0
  23. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/rich_printer.py +0 -0
  24. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/services/status_updater.py +0 -0
  25. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/__init__.py +0 -0
  26. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/config.py +0 -0
  27. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/encryption.py +0 -0
  28. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/logger.py +0 -0
  29. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/mock.py +0 -0
  30. {scientiflow_cli-0.4.12 → scientiflow_cli-0.4.13}/scientiflow_cli/utils/singularity.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: scientiflow-cli
3
- Version: 0.4.12
3
+ Version: 0.4.13
4
4
  Summary: CLI tool for scientiflow. This application runs on the client side, decodes pipelines, and executes them in the configured order!
5
5
  License: Proprietary
6
6
  Author: ScientiFlow
@@ -3,7 +3,7 @@ mode = "prod"
3
3
 
4
4
  [tool.poetry]
5
5
  name = "scientiflow-cli"
6
- version = "0.4.12"
6
+ version = "0.4.13"
7
7
  description = "CLI tool for scientiflow. This application runs on the client side, decodes pipelines, and executes them in the configured order!"
8
8
  authors = ["ScientiFlow <scientiflow@gmail.com>"]
9
9
  license = "Proprietary"
@@ -37,6 +37,7 @@ def execute_jobs(job_ids: list[int] = None, parallel: bool = False, is_cloud: bo
37
37
  if matching_jobs:
38
38
  if is_cloud:
39
39
  for job in matching_jobs:
40
+ job['project_title'] = job['project']['id'] + '_' + job['project']['project_title']
40
41
  if 'server' not in job or job['server'] is None:
41
42
  job['server'] = {'base_directory':None}
42
43
  job['server']['base_directory'] = get_base_directory()
@@ -158,7 +159,7 @@ def execute_single_job(job: dict, is_cloud: bool = False) -> None:
158
159
  if job_status != "running":
159
160
  if job["new_job"] == 1:
160
161
  # Initialize folders for the project / project_job
161
- create_job_dirs(job, is_cloud)
162
+ create_job_dirs(job)
162
163
 
163
164
  # Fetch the files and folder from the backend
164
165
  get_job_files(job)
@@ -37,12 +37,9 @@ def get_job_files(job: dict) -> None:
37
37
 
38
38
  printer.print_success(f"[+] Files extracted to {str(project_dir_name).strip()}")
39
39
 
40
- def create_job_dirs(job: dict, is_cloud: bool = False) -> None:
40
+ def create_job_dirs(job: dict) -> None:
41
41
  base_dir = Path(job['server']['base_directory'])
42
- if is_cloud:
43
- project_dir = base_dir / (str(job['project']['id'])+"_"+job['project']['project_title'])
44
- else:
45
- project_dir = base_dir / job['project']['project_title']
42
+ project_dir = base_dir / job['project']['project_title']
46
43
  job_dir = project_dir / job['project_job']['job_directory']
47
44
  job_dir.mkdir(parents=True, exist_ok=True)
48
45