Merge remote-tracking branch 'team/impl/sky_lauch' into impl/demo/100724

Author: chris-aeviator

examples/cluster/dev.yaml

@@ -8,7 +8,7 @@ resources:
   ports : 80
 
 workdir: ./src/pymc_server/workDir_test
-pymc_module: pymc-marketing
+module_name: pymc-marketing
 run: |
   echo "Hello, SkyPilot!"
   uname -a

requirements.txt

@@ -1,4 +1,3 @@
-pymc-marketing
 nutpie
 lifetimes
 numba

src/pymc_server/cli.py

@@ -2,17 +2,20 @@
 import sky
 from typing import Any, Dict, List, Optional, Tuple, Union
 from pymc_server.utils.yaml import merge_yaml
-from pymc_server.launch_cli import launch as cli_launch
+from pymc_server.launch_cli import launch as cli_launch,cli_launch_
+from pymc_server.launch_cli import launch_2
+from pymc_server.down_cli import down as down_cli
 from pymc_server.cli_factory import setup_launch_factory, setup_status_factory
 from sky.usage import usage_lib
+from sky.cli import _get_shell_complete_args, _get_click_major_version, _complete_cluster_name, _NaturalOrderGroup, _DocumentedCodeCommand
+from pymc_server.utils.cli_ex import jobs_launch as ex_launch
 
 
 from sky.cli import (
     status as sky_status,
     launch as sky_launch,
     check as sky_check
 )
-   
 
 # TODO: remove, check pyproject.py for a reference to this function
 @click.group()
@@ -24,7 +27,14 @@ def cli():
 def status(*args, **kwargs):
     """ calls the sky status command by passing the click context"""
     ctx = click.get_current_context()
-    ctx.invoke(sky_status, *args, **kwargs)
+    #ctx.invoke(_status_test, *args, **kwargs)
+    print("*args",*args)
+
+
+    data = ctx.invoke(sky_status, *args, **kwargs)
+    print("DATA",data)
+
+    #ctx.invoke(sky_status, *args, **kwargs)
 
 
 @setup_launch_factory
@@ -40,7 +50,8 @@ def launch(*args, **kwargs):
     """
     #  cli_launch(*args, **kwargs)
     ctx = click.get_current_context()
-    ctx.invoke(cli_launch, *args, **kwargs)
+    ctx.invoke(launch_2, *args, **kwargs)
+    #ctx.invoke(sky_launch, *args, **kwargs)
 
 @setup_status_factory
 @usage_lib.entrypoint
@@ -51,6 +62,42 @@ def check(*args, **kwargs):
     ctx.invoke(sky_check, *args, **kwargs)
 
 
+@cli.command(cls=_DocumentedCodeCommand)
+@click.argument('clusters',
+                nargs=-1,
+                required=False,
+                **_get_shell_complete_args(_complete_cluster_name))
+@click.option('--all',
+              '-a',
+              default=None,
+              is_flag=True,
+              help='Tear down all existing clusters.')
+@click.option('--yes',
+              '-y',
+              is_flag=True,
+              default=False,
+              required=False,
+              help='Skip confirmation prompt.')
+@click.option(
+    '--purge',
+    '-p',
+    is_flag=True,
+    default=False,
+    required=False,
+    help=('(Advanced) Forcefully remove the cluster(s) from '
+          'SkyPilot\'s cluster table, even if the actual cluster termination '
+          'failed on the cloud. WARNING: This flag should only be set sparingly'
+          ' in certain manual troubleshooting scenarios; with it set, it is the'
+          ' user\'s responsibility to ensure there are no leaked instances and '
+          'related resources.'))
+@usage_lib.entrypoint
+def down(*args, **kwargs):
+    ctx = click.get_current_context()
+    #sky_check(*args, **kwargs)
+    ctx.invoke(down_cli, *args, **kwargs)
+    """Deletes a local cluster."""
+
+
 cli.add_command(status)
 cli.add_command(launch)
 cli.add_command(check)

src/pymc_server/cli_factory.py

@@ -79,11 +79,18 @@ def setup_launch_factory(func):
                         type=str,
                         nargs=-1,
                         **_get_shell_complete_args(_complete_file_name)),
-        click.option('--pymc_module',
+        click.option('--module-name',
                       '-m',
+                      #default='pymc-marketing',
                       required=False,
                       type=str,
-                      help=('Define the PyMC module / project you need tu use')),
+                      help=('Define the PyMC module / project you need tu use. '
+                            'pymc-marketing is default.')),
+        click.option('--base-config-folder',
+                     '-b',
+                     required=False,
+                     type=str,
+                     help=('define config base Folder')),
         click.option('--cluster',
                       '-c',
                       default=None,
@@ -164,7 +171,18 @@ def setup_launch_factory(func):
             **_get_shell_complete_args(_complete_cluster_name),
             help=('[Experimental] Clone disk from an existing cluster to launch '
                   'a new one. This is useful when the new cluster needs to have '
-                  'the same data on the boot disk as an existing cluster.'))
+                  'the same data on the boot disk as an existing cluster.')),
+        click.option(
+            '--down',
+            default=False,
+            is_flag=True,
+            required=False,
+            help=
+            ('Autodown the cluster: tear down the cluster after all jobs finish '
+             '(successfully or abnormally). If --idle-minutes-to-autostop is also set, '
+             'the cluster will be torn down after the specified idle time. '
+             'Note that if errors occur during provisioning/data syncing/setting up, '
+             'the cluster will not be torn down for debugging purposes.'))
     ]
 
     for option in reversed(options):

src/pymc_server/config/_default/base.yaml

@@ -0,0 +1,22 @@
+resources:
+  # Optional; if left out, automatically pick the cheapest cloud.
+  cloud: aws
+  #disk_tier: medium
+  # 1x NVIDIA V100 GPU
+  #accelerators: V100:1
+  ports: 9000
+
+# Working directory (optional) containing the project codebase.
+# Its contents are synced to ~/sky_workdir/ on the cluster.
+workdir: .
+
+# Typical use: pip install -r requirements.txt
+# Invoked under the workdir (i.e., can use its files).
+setup: |
+  echo "Running setup."
+
+# Typical use: make use of resources, such as running training.
+# Invoked under the workdir (i.e., can use its files).
+run: |
+  echo "Hello, SkyPilot!"
+  #conda env list