scientiflow-cli 0.4.9__tar.gz → 0.4.11__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.
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/PKG-INFO +1 -1
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/pyproject.toml +1 -1
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/executor.py +4 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/utils/file_manager.py +1 -1
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/LICENSE.md +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/README.md +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/__init__.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/__main__.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/cli/__init__.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/cli/auth_utils.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/cli/login.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/cli/logout.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/main.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/pipeline/__init__.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/pipeline/container_manager.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/pipeline/decode_and_execute.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/pipeline/get_jobs.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/__init__.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/auth_service.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/base_directory.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/modes.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/request_handler.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/rich_printer.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/status_updater.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/utils/__init__.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/utils/config.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/utils/encryption.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/utils/logger.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/utils/mock.py +0 -0
- {scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/utils/singularity.py +0 -0
|
@@ -3,7 +3,7 @@ mode = "prod"
|
|
|
3
3
|
|
|
4
4
|
[tool.poetry]
|
|
5
5
|
name = "scientiflow-cli"
|
|
6
|
-
version = "0.4.
|
|
6
|
+
version = "0.4.11"
|
|
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"
|
|
@@ -5,6 +5,7 @@ from scientiflow_cli.pipeline.decode_and_execute import decode_and_execute_pipel
|
|
|
5
5
|
from scientiflow_cli.pipeline.container_manager import get_job_containers
|
|
6
6
|
from scientiflow_cli.utils.file_manager import create_job_dirs, get_job_files
|
|
7
7
|
from scientiflow_cli.services.rich_printer import RichPrinter
|
|
8
|
+
from scientiflow_cli.services.base_directory import get_base_directory
|
|
8
9
|
|
|
9
10
|
printer = RichPrinter()
|
|
10
11
|
|
|
@@ -34,6 +35,9 @@ def execute_jobs(job_ids: list[int] = None, parallel: bool = False, is_cloud: bo
|
|
|
34
35
|
for job_id in job_ids:
|
|
35
36
|
matching_jobs = [job for job in all_pending_jobs if job['project_job']['id'] == job_id]
|
|
36
37
|
if matching_jobs:
|
|
38
|
+
if is_cloud:
|
|
39
|
+
for job in matching_jobs:
|
|
40
|
+
job['server']['base_directory'] = get_base_directory()
|
|
37
41
|
jobs_to_execute.extend(matching_jobs)
|
|
38
42
|
else:
|
|
39
43
|
printer.print_error(f"Job with id: {job_id} not found")
|
|
@@ -40,7 +40,7 @@ def get_job_files(job: dict) -> None:
|
|
|
40
40
|
def create_job_dirs(job: dict, is_cloud: bool = False) -> None:
|
|
41
41
|
base_dir = Path(job['server']['base_directory'])
|
|
42
42
|
if is_cloud:
|
|
43
|
-
project_dir = base_dir / (job['project']['id']+"_"+job['project']['project_title'])
|
|
43
|
+
project_dir = base_dir / (str(job['project']['id'])+"_"+job['project']['project_title'])
|
|
44
44
|
else:
|
|
45
45
|
project_dir = base_dir / job['project']['project_title']
|
|
46
46
|
job_dir = project_dir / job['project_job']['job_directory']
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/pipeline/container_manager.py
RENAMED
|
File without changes
|
{scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/pipeline/decode_and_execute.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{scientiflow_cli-0.4.9 → scientiflow_cli-0.4.11}/scientiflow_cli/services/request_handler.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|