cloudos-cli 2.37.0__tar.gz → 2.37.1__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 (35) hide show
  1. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/PKG-INFO +1 -1
  2. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/__main__.py +37 -19
  3. cloudos_cli-2.37.1/cloudos_cli/_version.py +1 -0
  4. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/configure/configure.py +13 -4
  5. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli.egg-info/PKG-INFO +1 -1
  6. cloudos_cli-2.37.0/cloudos_cli/_version.py +0 -1
  7. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/LICENSE +0 -0
  8. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/README.md +0 -0
  9. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/__init__.py +0 -0
  10. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/clos.py +0 -0
  11. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/configure/__init__.py +0 -0
  12. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/datasets/__init__.py +0 -0
  13. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/datasets/datasets.py +0 -0
  14. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/import_wf/__init__.py +0 -0
  15. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/import_wf/import_wf.py +0 -0
  16. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/jobs/__init__.py +0 -0
  17. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/jobs/job.py +0 -0
  18. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/queue/__init__.py +0 -0
  19. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/queue/queue.py +0 -0
  20. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/utils/__init__.py +0 -0
  21. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/utils/array_job.py +0 -0
  22. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/utils/cloud.py +0 -0
  23. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/utils/details.py +0 -0
  24. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/utils/errors.py +0 -0
  25. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/utils/requests.py +0 -0
  26. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli/utils/resources.py +0 -0
  27. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli.egg-info/SOURCES.txt +0 -0
  28. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli.egg-info/dependency_links.txt +0 -0
  29. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli.egg-info/entry_points.txt +0 -0
  30. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli.egg-info/requires.txt +0 -0
  31. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/cloudos_cli.egg-info/top_level.txt +0 -0
  32. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/setup.cfg +0 -0
  33. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/setup.py +0 -0
  34. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/tests/__init__.py +0 -0
  35. {cloudos_cli-2.37.0 → cloudos_cli-2.37.1}/tests/functions_for_pytest.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cloudos_cli
3
- Version: 2.37.0
3
+ Version: 2.37.1
4
4
  Summary: Python package for interacting with CloudOS
5
5
  Home-page: https://github.com/lifebit-ai/cloudos-cli
6
6
  Author: David Piñeyro
@@ -46,7 +46,10 @@ def run_cloudos_cli(ctx):
46
46
  config_manager = ConfigurationProfile()
47
47
  profile_to_use = config_manager.determine_default_profile()
48
48
  if profile_to_use is None:
49
- print('[Warning] No profile found. Please create one with "cloudos configure".\n')
49
+ console = Console()
50
+ console.print(
51
+ "[bold yellow][Warning] No profile found. Please create one with \"cloudos configure\"."
52
+ )
50
53
  shared_config = dict({
51
54
  'apikey': '',
52
55
  'cloudos_url': CLOUDOS_URL,
@@ -211,7 +214,6 @@ def configure(ctx, profile, make_default):
211
214
  if make_default:
212
215
  config_manager.make_default_profile(profile_name=profile)
213
216
 
214
-
215
217
  @job.command('run')
216
218
  @click.option('-k',
217
219
  '--apikey',
@@ -220,7 +222,8 @@ def configure(ctx, profile, make_default):
220
222
  @click.option('-c',
221
223
  '--cloudos-url',
222
224
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
223
- default=CLOUDOS_URL)
225
+ default=CLOUDOS_URL,
226
+ required=True)
224
227
  @click.option('--workspace-id',
225
228
  help='The specific CloudOS workspace id.',
226
229
  required=True)
@@ -655,7 +658,8 @@ def run(ctx,
655
658
  @click.option('-c',
656
659
  '--cloudos-url',
657
660
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
658
- default=CLOUDOS_URL)
661
+ default=CLOUDOS_URL,
662
+ required=True)
659
663
  @click.option('--job-id',
660
664
  help='The job id in CloudOS to search for.',
661
665
  required=True)
@@ -726,7 +730,8 @@ def job_status(ctx,
726
730
  @click.option('-c',
727
731
  '--cloudos-url',
728
732
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
729
- default=CLOUDOS_URL)
733
+ default=CLOUDOS_URL,
734
+ required=True)
730
735
  @click.option('--workspace-id',
731
736
  help='The specific CloudOS workspace id.',
732
737
  required=True)
@@ -799,7 +804,8 @@ def job_logs(ctx,
799
804
  @click.option('-c',
800
805
  '--cloudos-url',
801
806
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
802
- default=CLOUDOS_URL)
807
+ default=CLOUDOS_URL,
808
+ required=True)
803
809
  @click.option('--workspace-id',
804
810
  help='The specific CloudOS workspace id.',
805
811
  required=True)
@@ -872,7 +878,8 @@ def job_results(ctx,
872
878
  @click.option('-c',
873
879
  '--cloudos-url',
874
880
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
875
- default=CLOUDOS_URL)
881
+ default=CLOUDOS_URL,
882
+ required=True)
876
883
  @click.option('--job-id',
877
884
  help='The job id in CloudOS to search for.',
878
885
  required=True)
@@ -1096,7 +1103,8 @@ def job_details(ctx,
1096
1103
  @click.option('-c',
1097
1104
  '--cloudos-url',
1098
1105
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1099
- default=CLOUDOS_URL)
1106
+ default=CLOUDOS_URL,
1107
+ required=True)
1100
1108
  @click.option('--workspace-id',
1101
1109
  help='The specific CloudOS workspace id.',
1102
1110
  required=True)
@@ -1226,7 +1234,8 @@ def list_jobs(ctx,
1226
1234
  @click.option('-c',
1227
1235
  '--cloudos-url',
1228
1236
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1229
- default=CLOUDOS_URL)
1237
+ default=CLOUDOS_URL,
1238
+ required=True)
1230
1239
  @click.option('--workspace-id',
1231
1240
  help='The specific CloudOS workspace id.',
1232
1241
  required=True)
@@ -1319,7 +1328,8 @@ def abort_jobs(ctx,
1319
1328
  @click.option('-c',
1320
1329
  '--cloudos-url',
1321
1330
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1322
- default=CLOUDOS_URL)
1331
+ default=CLOUDOS_URL,
1332
+ required=True)
1323
1333
  @click.option('--workspace-id',
1324
1334
  help='The specific CloudOS workspace id.',
1325
1335
  required=True)
@@ -1417,7 +1427,8 @@ def list_workflows(ctx,
1417
1427
  '--cloudos-url',
1418
1428
  help=('The CloudOS url you are trying to access to. ' +
1419
1429
  f'Default={CLOUDOS_URL}.'),
1420
- default=CLOUDOS_URL)
1430
+ default=CLOUDOS_URL,
1431
+ required=True)
1421
1432
  @click.option('--workspace-id',
1422
1433
  help='The specific CloudOS workspace id.',
1423
1434
  required=True)
@@ -1497,7 +1508,8 @@ def import_wf(ctx,
1497
1508
  @click.option('-c',
1498
1509
  '--cloudos-url',
1499
1510
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1500
- default=CLOUDOS_URL)
1511
+ default=CLOUDOS_URL,
1512
+ required=True)
1501
1513
  @click.option('--workspace-id',
1502
1514
  help='The specific CloudOS workspace id.',
1503
1515
  required=True)
@@ -1619,7 +1631,8 @@ def list_projects(ctx,
1619
1631
  @click.option('-c',
1620
1632
  '--cloudos-url',
1621
1633
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1622
- default=CLOUDOS_URL)
1634
+ default=CLOUDOS_URL,
1635
+ required=True)
1623
1636
  @click.option('--workspace-id',
1624
1637
  help='The specific CloudOS workspace id.',
1625
1638
  required=True)
@@ -1694,7 +1707,8 @@ def cromwell_status(ctx,
1694
1707
  @click.option('-c',
1695
1708
  '--cloudos-url',
1696
1709
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1697
- default=CLOUDOS_URL)
1710
+ default=CLOUDOS_URL,
1711
+ required=True)
1698
1712
  @click.option('--workspace-id',
1699
1713
  help='The specific CloudOS workspace id.',
1700
1714
  required=True)
@@ -1796,7 +1810,8 @@ def cromwell_restart(ctx,
1796
1810
  @click.option('-c',
1797
1811
  '--cloudos-url',
1798
1812
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1799
- default=CLOUDOS_URL)
1813
+ default=CLOUDOS_URL,
1814
+ required=True)
1800
1815
  @click.option('--workspace-id',
1801
1816
  help='The specific CloudOS workspace id.',
1802
1817
  required=True)
@@ -1869,7 +1884,8 @@ def cromwell_stop(ctx,
1869
1884
  @click.option('-c',
1870
1885
  '--cloudos-url',
1871
1886
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1872
- default=CLOUDOS_URL)
1887
+ default=CLOUDOS_URL,
1888
+ required=True)
1873
1889
  @click.option('--workspace-id',
1874
1890
  help='The specific CloudOS workspace id.',
1875
1891
  required=True)
@@ -1977,7 +1993,8 @@ def remove_profile(ctx, profile):
1977
1993
  @click.option('-c',
1978
1994
  '--cloudos-url',
1979
1995
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
1980
- default=CLOUDOS_URL)
1996
+ default=CLOUDOS_URL,
1997
+ required=True)
1981
1998
  @click.option('--workspace-id',
1982
1999
  help='The specific CloudOS workspace id.',
1983
2000
  required=True)
@@ -2204,7 +2221,8 @@ def run_bash_job(ctx,
2204
2221
  @click.option('-c',
2205
2222
  '--cloudos-url',
2206
2223
  help=(f'The CloudOS url you are trying to access to. Default={CLOUDOS_URL}.'),
2207
- default=CLOUDOS_URL)
2224
+ default=CLOUDOS_URL,
2225
+ required=True)
2208
2226
  @click.option('--workspace-id',
2209
2227
  help='The specific CloudOS workspace id.',
2210
2228
  required=True)
@@ -2696,7 +2714,7 @@ def list_files(ctx,
2696
2714
  @click.argument("source_path", required=True)
2697
2715
  @click.argument("destination_path", required=True)
2698
2716
  @click.option('-k', '--apikey', required=True, help='Your CloudOS API key.')
2699
- @click.option('-c', '--cloudos-url', default=CLOUDOS_URL, required=False, help='The CloudOS URL.')
2717
+ @click.option('-c', '--cloudos-url', default=CLOUDOS_URL, required=True, help='The CloudOS URL.')
2700
2718
  @click.option('--workspace-id', required=True, help='The CloudOS workspace ID.')
2701
2719
  @click.option('--project-name', required=True, help='The source project name.')
2702
2720
  @click.option('--destination-project-name', required=False,
@@ -0,0 +1 @@
1
+ __version__ = '2.37.1'
@@ -457,8 +457,7 @@ class ConfigurationProfile:
457
457
  profile_data = self.load_profile(profile_name=profile)
458
458
  apikey = self.get_param_value(ctx, apikey, 'apikey', profile_data['apikey'],
459
459
  required=required_dict['apikey'], missing_required_params=missing)
460
- cloudos_url = self.get_param_value(ctx, cloudos_url, 'cloudos_url',
461
- profile_data['cloudos_url']) or cloudos_url_default
460
+ resolved_cloudos_url = self.get_param_value(ctx, cloudos_url, 'cloudos_url', profile_data['cloudos_url'])
462
461
  workspace_id = self.get_param_value(ctx, workspace_id, 'workspace_id', profile_data['workspace_id'],
463
462
  required=required_dict['workspace_id'], missing_required_params=missing)
464
463
  workflow_name = self.get_param_value(ctx, workflow_name, 'workflow_name', profile_data['workflow_name'],
@@ -473,7 +472,8 @@ class ConfigurationProfile:
473
472
  # when no profile is used, we need to check if the user provided all required parameters
474
473
  apikey = self.get_param_value(ctx, apikey, 'apikey', apikey, required=required_dict['apikey'],
475
474
  missing_required_params=missing)
476
- cloudos_url = self.get_param_value(ctx, cloudos_url, 'cloudos_url', cloudos_url) or cloudos_url_default
475
+ resolved_cloudos_url = self.get_param_value(ctx, cloudos_url, 'cloudos_url', cloudos_url,
476
+ missing_required_params=missing)
477
477
  workspace_id = self.get_param_value(ctx, workspace_id, 'workspace_id', workspace_id,
478
478
  required=required_dict['workspace_id'],
479
479
  missing_required_params=missing)
@@ -486,10 +486,19 @@ class ConfigurationProfile:
486
486
  project_name = self.get_param_value(ctx, project_name, 'project_name', project_name,
487
487
  required=required_dict['project_name'],
488
488
  missing_required_params=missing)
489
+ if not resolved_cloudos_url:
490
+ click.secho(
491
+ f"[Warning] No CloudOS URL provided via CLI or profile. Falling back to default: {cloudos_url_default}",
492
+ fg="yellow",
493
+ bold=True
494
+ )
495
+ cloudos_url = cloudos_url_default
496
+ else:
497
+ cloudos_url = resolved_cloudos_url
489
498
  cloudos_url = cloudos_url.rstrip('/')
490
499
 
491
500
  # Raise once, after all checks
492
501
  if missing:
493
502
  formatted = ', '.join(p for p in missing)
494
- raise click.UsageError(f"Missing required option/s: {formatted}")
503
+ raise click.UsageError(f"Missing required option/s: {formatted} \nYou can configure the following parameters persistently by running cloudos configure:\n --apikey,\n --cloudos-url,\n --workspace-id,\n --workflow-name,\n --repository-platform,\n --execution-platform,\n --project-name\n For more information on the usage of the command, please run cloudos configure --help")
495
504
  return apikey, cloudos_url, workspace_id, workflow_name, repository_platform, execution_platform, project_name
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cloudos_cli
3
- Version: 2.37.0
3
+ Version: 2.37.1
4
4
  Summary: Python package for interacting with CloudOS
5
5
  Home-page: https://github.com/lifebit-ai/cloudos-cli
6
6
  Author: David Piñeyro
@@ -1 +0,0 @@
1
- __version__ = '2.37.0'
File without changes
File without changes
File without changes
File without changes