truefoundry 0.2.10__py3-none-any.whl → 0.3.0rc2__py3-none-any.whl

truefoundry/deploy/cli/cli.py

@@ -2,34 +2,27 @@ import logging
 import sys
 
 import rich_click as click
-from servicefoundry import logger
-from servicefoundry.cli.commands import (
-    deploy_patch_v2_command,
+
+from truefoundry import logger
+from truefoundry.deploy.cli.commands import (
     get_apply_command,
+    get_build_command,
     get_delete_command,
+    get_deploy_command,
     get_login_command,
     get_logout_command,
+    get_patch_application_command,
     get_patch_command,
 )
-from servicefoundry.cli.config import CliConfig
-from servicefoundry.cli.const import GROUP_CLS
-from servicefoundry.cli.util import setup_rich_click
-from servicefoundry.lib.util import is_debug_env_set, is_experimental_env_set
-from servicefoundry.logger import logger as servicefoundry_logger
-
-from truefoundry.deploy.cli.deploy import deploy_v2_command
-from truefoundry.deploy.cli.version import __version__
-
-servicefoundry_logger.setLevel(level=logging.INFO)
-
+from truefoundry.deploy.cli.config import CliConfig
+from truefoundry.deploy.cli.const import GROUP_CLS
+from truefoundry.deploy.cli.util import setup_rich_click
+from truefoundry.deploy.lib.util import is_debug_env_set, is_internal_env_set
+from truefoundry.version import __version__
 
 click.rich_click.USE_RICH_MARKUP = True
 
 
-def _add_experimental_commands(cli):
-    pass
-
-
 def create_truefoundry_cli():
     """Generates CLI by combining all subcommands into a main CLI and returns in
 
@@ -38,17 +31,17 @@ def create_truefoundry_cli():
     """
     cli = truefoundry_cli
     cli.add_command(get_login_command())
-    cli.add_command(get_delete_command())
     cli.add_command(get_logout_command())
-    cli.add_command(deploy_v2_command)
-    cli.add_command(deploy_patch_v2_command)
     cli.add_command(get_apply_command())
+    cli.add_command(get_deploy_command())
+    cli.add_command(get_patch_application_command())
+    cli.add_command(get_delete_command())
 
     if not (sys.platform.startswith("win32") or sys.platform.startswith("cygwin")):
         cli.add_command(get_patch_command())
 
-    if is_experimental_env_set():
-        _add_experimental_commands(cli)
+    if is_internal_env_set():
+        cli.add_command(get_build_command())
     return cli
 
 
@@ -73,12 +66,12 @@ CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])  # noqa: C408
 @click.pass_context
 def truefoundry_cli(ctx, json, debug):
     """
-    Truefoundry provides an easy way to deploy your services, jobs and models.
+    TrueFoundry provides an easy way to deploy your Services, Jobs and Models.
     \b
 
-    To start, login to your Truefoundry account with [i]tfy login[/]
+    To start, login to your TrueFoundry account with [b]tfy login[/]
 
-    Then start deploying with [i]tfy deploy[/]
+    Then start deploying with [b]tfy deploy[/]
 
     And more: [link=https://docs.truefoundry.com/docs]https://docs.truefoundry.com/docs[/]
 

truefoundry/deploy/cli/commands/__init__.py

@@ -0,0 +1,18 @@
+from truefoundry.deploy.cli.commands.apply_command import get_apply_command
+from truefoundry.deploy.cli.commands.build_command import get_build_command
+from truefoundry.deploy.cli.commands.build_logs_command import get_build_logs_command
+from truefoundry.deploy.cli.commands.create_command import get_create_command
+from truefoundry.deploy.cli.commands.delete_command import get_delete_command
+from truefoundry.deploy.cli.commands.deploy_command import get_deploy_command
+from truefoundry.deploy.cli.commands.get_command import get_get_command
+from truefoundry.deploy.cli.commands.list_command import get_list_command
+from truefoundry.deploy.cli.commands.login_command import get_login_command
+from truefoundry.deploy.cli.commands.logout_command import get_logout_command
+from truefoundry.deploy.cli.commands.logs_command import get_logs_command
+from truefoundry.deploy.cli.commands.patch_application_command import (
+    get_patch_application_command,
+)
+from truefoundry.deploy.cli.commands.patch_command import get_patch_command
+from truefoundry.deploy.cli.commands.redeploy_command import get_redeploy_command
+from truefoundry.deploy.cli.commands.terminate_comand import get_terminate_command
+from truefoundry.deploy.cli.commands.trigger_command import get_trigger_command

truefoundry/deploy/cli/commands/apply_command.py

@@ -0,0 +1,52 @@
+from typing import List, Tuple
+
+import rich_click as click
+
+from truefoundry.deploy.cli.console import console
+from truefoundry.deploy.cli.const import GROUP_CLS
+from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.deploy.lib.clients.servicefoundry_client import (
+    ServiceFoundryServiceClient,
+)
+from truefoundry.deploy.lib.dao import apply as apply_lib
+from truefoundry.deploy.lib.messages import PROMPT_APPLYING_MANIFEST
+from truefoundry.deploy.lib.model.entity import ApplyResult
+
+
+@click.group(
+    name="apply",
+    cls=GROUP_CLS,
+    invoke_without_command=True,
+    help="Create resources by appling manifest locally from Truefoundry spec",
+    context_settings={"ignore_unknown_options": True, "allow_interspersed_args": True},
+)
+@click.option(
+    "-f",
+    "--file",
+    "files",
+    type=click.Path(exists=True, dir_okay=False, resolve_path=True),
+    help="Path to yaml manifest file (You can apply multiple files at once by providing multiple -f options)",
+    show_default=True,
+    required=True,
+    multiple=True,
+)
+@handle_exception_wrapper
+def apply_command(files: Tuple[str, ...]):
+    apply_results: List[ApplyResult] = []
+    client = ServiceFoundryServiceClient()
+    for file in files:
+        with console.status(PROMPT_APPLYING_MANIFEST.format(file), spinner="dots"):
+            for apply_result in apply_lib.apply_manifest_file(file, client):
+                if apply_result.success:
+                    console.print(f"[green]\u2714 {apply_result.message}[/]")
+                else:
+                    console.print(f"[red]\u2718 {apply_result.message}[/]")
+
+                apply_results.append(apply_result)
+
+    if not all(apply_result.success for apply_result in apply_results):
+        raise Exception("Failed to apply one or more manifests")
+
+
+def get_apply_command():
+    return apply_command

truefoundry/deploy/cli/commands/build_command.py

@@ -0,0 +1,45 @@
+import json
+
+import rich_click as click
+
+from truefoundry.deploy import builder
+from truefoundry.deploy.cli.console import console
+from truefoundry.deploy.cli.const import GROUP_CLS
+from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.version import __version__
+
+
+@click.group(
+    name="build",
+    cls=GROUP_CLS,
+    invoke_without_command=True,
+    help="Build docker image locally from Truefoundry spec",
+    context_settings={"ignore_unknown_options": True, "allow_interspersed_args": True},
+)
+@click.option(
+    "--name",
+    type=click.STRING,
+    required=True,
+    help="Name for the image being build - used as docker tag",
+)
+@click.option(
+    "--build-config",
+    "--build_config",
+    type=click.STRING,
+    required=True,
+    help="Build part of the spec as a json spec",
+)
+@click.argument("extra_opts", nargs=-1, type=click.UNPROCESSED)
+@handle_exception_wrapper
+def build_command(name, build_config, extra_opts):
+    if build_config:
+        console.print(rf"\[build] TrueFoundry CLI version: {__version__}")
+        builder.build(
+            build_configuration=json.loads(build_config),
+            tag=name,
+            extra_opts=extra_opts,
+        )
+
+
+def get_build_command():
+    return build_command

truefoundry/deploy/cli/commands/build_logs_command.py

@@ -0,0 +1,89 @@
+from typing import Optional
+
+import rich_click as click
+
+from truefoundry.deploy.cli.const import COMMAND_CLS
+from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
+from truefoundry.deploy.lib.clients.servicefoundry_client import (
+    ServiceFoundryServiceClient,
+)
+from truefoundry.deploy.lib.util import get_deployment_fqn_from_application_fqn
+from truefoundry.logger import logger
+
+
+@click.command(name="build-logs", cls=COMMAND_CLS)
+@click.option(
+    "--application-fqn",
+    "--application_fqn",
+    type=click.STRING,
+    help="Application FQN",
+    required=True,
+)
+@click.option(
+    "--version",
+    type=click.INT,
+    help="Deployment version. If no deployment version "
+    "given, logs will be fetched for the latest version",
+)
+@click.option("-f", "--follow", help="Follow log output", is_flag=True, default=False)
+@handle_exception_wrapper
+def build_logs_command(
+    application_fqn: str,
+    version: Optional[int],
+    follow: bool,
+) -> None:
+    """
+    Get build logs for application fqn and deployment version
+    """
+    output_hook = RichOutputCallBack()
+    tfs_client = ServiceFoundryServiceClient()
+
+    if not version:
+        app_fqn_response = tfs_client.get_application_info_by_fqn(application_fqn)
+        application_info = tfs_client.get_application_info(
+            app_fqn_response.applicationId
+        )
+        version = application_info.lastVersion
+
+    deployment_fqn = get_deployment_fqn_from_application_fqn(
+        application_fqn=application_fqn, version=version
+    )
+
+    deployment_fqn_response = tfs_client.get_deployment_info_by_fqn(
+        deployment_fqn=deployment_fqn
+    )
+
+    build_responses = tfs_client.get_deployment_build_response(
+        application_id=deployment_fqn_response.applicationId,
+        deployment_id=deployment_fqn_response.deploymentId,
+    )
+
+    if not build_responses:
+        raise Exception(
+            f"Unable to find a build version for application fqn {application_fqn} and version {version}"
+        )
+
+    build_response = build_responses[0]
+    if not follow:
+        tfs_client.fetch_build_logs(
+            build_response=build_response,
+            callback=output_hook,
+        )
+    else:
+        try:
+            logger.info(
+                "You can press Ctrl + C to exit the tailing of build "
+                "logs and deployment will continue on the server"
+            )
+            tfs_client.tail_build_logs(
+                build_response=build_response,
+                callback=output_hook,
+                wait=True,
+            )
+        except KeyboardInterrupt:
+            logger.info("Ctrl-C executed. The deployment will still continue.")
+
+
+def get_build_logs_command():
+    return build_logs_command

truefoundry/deploy/cli/commands/create_command.py

@@ -0,0 +1,75 @@
+from typing import Optional
+
+import rich_click as click
+
+from truefoundry.deploy.cli.const import COMMAND_CLS, GROUP_CLS
+from truefoundry.deploy.cli.display_util import print_obj
+from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.deploy.lib.dao import workspace as workspace_lib
+
+
+@click.group(name="create", cls=GROUP_CLS)
+def create_command():
+    # TODO (chiragjn): Figure out a way to update supported resources based on ENABLE_* flags
+    """
+    Create TrueFoundry resources
+
+    \b
+    Supported resources:
+    - Workspace
+    """
+    pass
+
+
+@click.command(name="workspace", cls=COMMAND_CLS, help="Create a new Workspace")
+@click.argument("name", type=click.STRING)
+@click.option(
+    "-c",
+    "--cluster-name",
+    "--cluster_name",
+    type=click.STRING,
+    required=True,
+    help="Cluster to create this workspace in",
+)
+@click.option(
+    "--cpu-limit",
+    "--cpu_limit",
+    type=click.FLOAT,
+    default=None,
+    help="CPU Limit",
+)
+@click.option(
+    "--memory-limit",
+    "--memory_limit",
+    type=click.INT,
+    default=None,
+    help="Memory Limit in MB",
+)
+@click.option(
+    "--ephemeral-storage-limit",
+    "--ephemeral_storage_limit",
+    type=click.INT,
+    default=None,
+    help="Ephemeral Storage Limit in GB",
+)
+@handle_exception_wrapper
+def create_workspace(
+    name: str,
+    cluster_name: str,
+    cpu_limit: Optional[float],
+    memory_limit: Optional[int],
+    ephemeral_storage_limit: Optional[int],
+):
+    workspace = workspace_lib.create_workspace(
+        name=name,
+        cpu_limit=cpu_limit,
+        memory_limit=memory_limit,
+        ephemeral_storage_limit=ephemeral_storage_limit,
+        cluster_name=cluster_name,
+    )
+    print_obj("Workspace", workspace.dict())
+
+
+def get_create_command():
+    create_command.add_command(create_workspace)
+    return create_command

truefoundry/deploy/cli/commands/delete_command.py

@@ -0,0 +1,77 @@
+import rich_click as click
+
+from truefoundry.deploy.cli.config import CliConfig
+from truefoundry.deploy.cli.const import COMMAND_CLS, GROUP_CLS
+from truefoundry.deploy.cli.display_util import print_json
+from truefoundry.deploy.cli.util import handle_exception_wrapper
+from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
+from truefoundry.deploy.lib.dao import application as application_lib
+from truefoundry.deploy.lib.dao import workspace as workspace_lib
+from truefoundry.deploy.lib.messages import (
+    PROMPT_DELETED_APPLICATION,
+    PROMPT_DELETED_WORKSPACE,
+)
+
+# TODO (chiragjn): --json should disable all non json console prints
+
+
+@click.group(name="delete", cls=GROUP_CLS)
+def delete_command():
+    """
+    Delete TrueFoundry resources
+
+    \b
+    Supported resources:
+    - Workspace
+    - Application
+    """
+    pass
+
+
+@click.command(name="workspace", cls=COMMAND_CLS, help="Delete a Workspace")
+@click.option(
+    "-w",
+    "--workspace-fqn",
+    "--workspace_fqn",
+    type=click.STRING,
+    default=None,
+    help="FQN of the Workspace to delete",
+    required=True,
+)
+@click.confirmation_option(prompt="Are you sure you want to delete this workspace?")
+@handle_exception_wrapper
+def delete_workspace(workspace_fqn):
+    deleted_workspace = workspace_lib.delete_workspace(
+        workspace_fqn=workspace_fqn,
+    )
+    output_hook = RichOutputCallBack()
+    output_hook.print_line(PROMPT_DELETED_WORKSPACE.format(workspace_fqn))
+    if CliConfig.get("json"):
+        print_json(data=deleted_workspace.dict())
+
+
+@click.command(name="application", cls=COMMAND_CLS, help="Delete an Application")
+@click.option(
+    "--application-fqn",
+    "--application_fqn",
+    type=click.STRING,
+    default=None,
+    help="FQN of the Application to delete",
+    required=True,
+)
+@click.confirmation_option(prompt="Are you sure you want to delete this application?")
+@handle_exception_wrapper
+def delete_application(application_fqn):
+    response = application_lib.delete_application(
+        application_fqn=application_fqn,
+    )
+    output_hook = RichOutputCallBack()
+    output_hook.print_line(PROMPT_DELETED_APPLICATION.format(application_fqn))
+    if CliConfig.get("json"):
+        print_json(data=response)
+
+
+def get_delete_command():
+    delete_command.add_command(delete_workspace)
+    delete_command.add_command(delete_application)
+    return delete_command

truefoundry/deploy/cli/commands/deploy_command.py

@@ -0,0 +1,99 @@
+import os
+import sys
+
+import rich_click as click
+import yaml
+from click import UsageError
+from click.exceptions import ClickException
+
+from truefoundry.autodeploy.cli import cli as autodeploy_cli
+from truefoundry.autodeploy.exception import InvalidRequirementsException
+from truefoundry.deploy.cli.const import GROUP_CLS
+
+
+def _get_default_spec_file():
+    paths = [
+        "./truefoundry.yaml",
+        "./truefoundry.yml",
+        "./servicefoundry.yaml",
+        "./servicefoundry.yml",
+    ]
+    for path in paths:
+        if os.path.exists(path):
+            return path
+
+
+@click.group(
+    name="deploy",
+    cls=GROUP_CLS,
+    invoke_without_command=True,
+    help="Deploy application to Truefoundry",
+)
+@click.option(
+    "-f",
+    "--file",
+    type=click.Path(exists=True, dir_okay=False, resolve_path=True),
+    default=_get_default_spec_file(),
+    help="Path to truefoundry.yaml file",
+    show_default=True,
+)
+@click.option(
+    "-w",
+    "--workspace-fqn",
+    "--workspace_fqn",
+    required=True,
+    help="FQN of the Workspace to deploy to",
+)
+@click.option(
+    "--wait/--no-wait",
+    "--wait/--no_wait",
+    is_flag=True,
+    show_default=True,
+    default=True,
+    help="Wait and tail the deployment progress",
+)
+def deploy_command(file: str, workspace_fqn: str, wait: bool):
+    from truefoundry.deploy.lib.auth.servicefoundry_session import ServiceFoundrySession
+    from truefoundry.deploy.v2.lib.deployable_patched_models import Application
+
+    try:
+        _ = ServiceFoundrySession()
+    except Exception as e:
+        raise ClickException(message=str(e)) from e
+
+    if file:
+        with open(file, "r") as f:
+            application_definition = yaml.safe_load(f)
+
+        application = Application.parse_obj(application_definition)
+        application.deploy(workspace_fqn=workspace_fqn, wait=wait)
+        sys.exit(0)
+
+    click.echo(
+        click.style(
+            "We did not find any truefoundry.yaml or servicefoundry.yaml at the root path.",
+            fg="red",
+        ),
+        color=True,
+    )
+
+    if not sys.stdout.isatty():
+        click.echo(
+            click.style(
+                'Please create a truefoundry.yaml or pass the file name with "--file file_name"',
+                fg="yellow",
+            ),
+            color=True,
+        )
+        sys.exit(1)
+
+    try:
+        autodeploy_cli(project_root_path=".", deploy=True, workspace_fqn=workspace_fqn)
+    except InvalidRequirementsException as e:
+        raise UsageError(message=e.message) from e
+    except Exception as e:
+        raise UsageError(message=str(e)) from e
+
+
+def get_deploy_command():
+    return deploy_command