truefoundry 0.2.0rc5__tar.gz → 0.2.0rc7__tar.gz

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.2.0rc5
+Version: 0.2.0rc7
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhichoudhary06@gmail.com
-Requires-Python: >=3.8,<3.13
+Requires-Python: >=3.8.1,<3.13
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -15,13 +14,14 @@ Provides-Extra: ml
 Requires-Dist: docker (>=7.0.0,<8.0.0)
 Requires-Dist: gitignorefile (>=1.1.2,<2.0.0)
 Requires-Dist: gitpython (>=3.1.43,<4.0.0)
+Requires-Dist: inquirer (>=3.2.4,<4.0.0)
 Requires-Dist: mlfoundry (==0.10.9) ; extra == "ml"
 Requires-Dist: openai (>=1.16.2,<2.0.0)
 Requires-Dist: pydantic (>=1.10.0,<3)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: rich (>=13.7.1,<14.0.0)
-Requires-Dist: servicefoundry (==0.10.6)
+Requires-Dist: servicefoundry (==0.10.10)
 Description-Content-Type: text/markdown
 
 # Truefoundry

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.2.0rc5"
+version = "0.2.0rc7"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhichoudhary06@gmail.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.8,<3.13"
-servicefoundry = "0.10.6"
+python = "^3.8.1,<3.13"
+servicefoundry = "0.10.10"
 mlfoundry = { version = "0.10.9", optional = true }
 openai = "^1.16.2"
 docker = "^7.0.0"
@@ -17,6 +17,7 @@ requests = "^2.31.0"
 python-dotenv = "^1.0.1"
 gitignorefile = "^1.1.2"
 gitpython = "^3.1.43"
+inquirer = "^3.2.4"
 
 [tool.poetry.extras]
 ml = ["mlfoundry"]

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/truefoundry/autodeploy/agents/project_identifier.py

@@ -94,20 +94,20 @@ pip, poetry, yarn, go.mod, cargo.toml, npm, setup.py.
         def render(self, console: Console):
             if self.primary_programming_language is not None:
                 console.print(
-                    f"[bold magenta]TFY-Agent:[/] Identified a project using [bold cyan]{self.primary_programming_language}[/]."
+                    f"[bold magenta]TrueFoundry:[/] Identified a project using [bold cyan]{self.primary_programming_language}[/]."
                 )
                 console.print(
-                    f"[bold magenta]TFY-Agent:[/] Framework Identified: [bold cyan]{'Not applicable' if self.framework is None else self.framework}[/]"
+                    f"[bold magenta]TrueFoundry:[/] Framework Identified: [bold cyan]{'Not applicable' if self.framework is None else self.framework}[/]"
                 )
                 console.print(
-                    f"[bold magenta]TFY-Agent:[/] Dependency Manager Identified: [bold cyan]{'Not applicable' if self.dependency_manager is None else self.dependency_manager}[/]"
+                    f"[bold magenta]TrueFoundry:[/] Dependency Manager Identified: [bold cyan]{'Not applicable' if self.dependency_manager is None else self.dependency_manager}[/]"
                 )
             else:
                 console.print(
-                    "[bold magenta]TFY-Agent:[/] Unable to identify any programming language in the project."
+                    "[bold magenta]TrueFoundry:[/] Unable to identify any programming language in the project."
                 )
             console.print(
-                f"[bold magenta]TFY-Agent:[/] [italic]{self.justification}[/]"
+                f"[bold magenta]TrueFoundry:[/] [italic]{self.justification}[/]"
             )
 
     def __init__(self, project_root_path: str, openai_client: OpenAI):

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/truefoundry/autodeploy/agents/tester.py

@@ -53,10 +53,10 @@ Why was the testing a failure or successful?
 
         def render(self, console: Console):
             console.print(
-                f"[bold cyan]TFY-Agent:[/] The given project has been {'[bold green]successfully built[/]' if self.successful else '[bold red]failed to build[/]'}"
+                f"[bold cyan]TrueFoundry:[/] The given project has been {'[bold green]successfully built[/]' if self.successful else '[bold red]failed to build[/]'}"
             )
             console.print(
-                f"[bold magenta]TFY-Agent:[/] [italic]{self.justification}[/]"
+                f"[bold magenta]TrueFoundry:[/] [italic]{self.justification}[/]"
             )
             if not self.successful:
                 console.print(f"[cyan]logs:[/] {self.logs}")

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/truefoundry/autodeploy/cli.py

@@ -6,6 +6,7 @@ from typing import Dict, Optional
 
 import click
 import docker
+import inquirer
 from dotenv import dotenv_values
 
 from truefoundry.autodeploy.exception import GitBinaryNotFoundException
@@ -17,6 +18,7 @@ except ImportError as ex:
     raise GitBinaryNotFoundException from ex
 
 import requests
+from click.exceptions import ClickException
 from openai import OpenAI
 from rich.console import Console
 from rich.prompt import Prompt
@@ -32,6 +34,8 @@ from truefoundry.autodeploy.agents.project_identifier import (
 )
 from truefoundry.autodeploy.agents.tester import Tester
 from truefoundry.autodeploy.constants import (
+    ABOUT_AUTODEPLOY,
+    AUTODEPLOY_INTRO_MESSAGE,
     AUTODEPLOY_OPENAI_API_KEY,
     AUTODEPLOY_OPENAI_BASE_URL,
     AUTODEPLOY_TFY_BASE_URL,
@@ -42,12 +46,12 @@ from truefoundry.autodeploy.tools.docker_run import DockerRun, DockerRunLog
 
 
 def _get_openai_client() -> OpenAI:
-    session = ServiceFoundrySession()
     if AUTODEPLOY_OPENAI_BASE_URL is not None and AUTODEPLOY_OPENAI_API_KEY is not None:
         return OpenAI(
             api_key=AUTODEPLOY_OPENAI_API_KEY, base_url=AUTODEPLOY_OPENAI_BASE_URL
         )
     try:
+        session = ServiceFoundrySession()
         resp = requests.get(
             f"{AUTODEPLOY_TFY_BASE_URL}/api/svc/v1/llm-gateway/access-details",
             headers={
@@ -58,9 +62,11 @@ def _get_openai_client() -> OpenAI:
         resp = resp.json()
         return OpenAI(api_key=resp["jwtToken"], base_url=resp["inferenceBaseURL"])
     except requests.exceptions.HTTPError as http_error:
-        raise Exception(
-            "Error occured while connecting to servicefoundry server"
+        raise ClickException(
+            f"An error occurred while connecting to the Truefoundry server.\nThe server responded with status code {http_error.response.status_code}."
         ) from http_error
+    except Exception as e:
+        raise ClickException(message=str(e)) from e
 
 
 def deploy_component(
@@ -119,21 +125,21 @@ def _check_repo(project_root_path: str, console: Console):
             sys.exit(1)
         current_active_branch = repo.active_branch.name
         console.print(
-            f"[bold magenta]TFY-Agent:[/] Current branch [green]{current_active_branch!r}[/]"
+            f"[bold magenta]TrueFoundry:[/] Current branch [green]{current_active_branch!r}[/]"
         )
         branch_name = Prompt.ask(
-            "[bold magenta]TFY-Agent:[/] Enter a branch name if you want to checkout to a new branch. "
+            "[bold magenta]TrueFoundry:[/] Enter a branch name if you want to checkout to a new branch. "
             f"Press enter to continue on [green]{current_active_branch!r}[/]",
             console=console,
         )
         if branch_name:
             repo.git.checkout("-b", branch_name)
             console.print(
-                f"[bold magenta]TFY-Agent:[/] Switched to branch: [green]{repo.active_branch}[/]"
+                f"[bold magenta]TrueFoundry:[/] Switched to branch: [green]{repo.active_branch}[/]"
             )
         else:
             console.print(
-                f"[bold magenta]TFY-Agent:[/] Continuing on [green]{current_active_branch!r}[/]"
+                f"[bold magenta]TrueFoundry:[/] Continuing on [green]{current_active_branch!r}[/]"
             )
 
     except InvalidGitRepositoryError:
@@ -163,22 +169,22 @@ def _update_status(event, status: Status):
         event, (Developer.Request, ProjectIdentifier.Response, Tester.Response)
     ):
         status.update(
-            "[bold magenta]TFY-Agent[/] is currently building the project. Please wait..."
+            "[bold magenta]TrueFoundry[/] is currently building the project. Please wait..."
         )
 
     if isinstance(event, ProjectIdentifier.Request):
         status.update(
-            "[bold magenta]TFY-Agent[/] is currently identifying the project..."
+            "[bold magenta]TrueFoundry[/] is currently identifying the project..."
         )
 
     if isinstance(event, (Tester.Request, DockerRun.Response)):
         status.update(
-            "[bold magenta]TFY-Agent[/] is currently running tests on the project..."
+            "[bold magenta]TrueFoundry[/] is currently running tests on the project..."
         )
 
     if isinstance(event, DockerRunLog):
         status.update(
-            "[bold cyan]Running:[/] [bold magenta]TFY-Agent[/] is executing the Docker container. Press [yellow]control-c[/] to stop waiting for additional logs..."
+            "[bold cyan]Running:[/] [bold magenta]TrueFoundry[/] is executing the Docker container. Press [yellow]control-c[/] to stop waiting for additional logs..."
         )
 
 
@@ -201,26 +207,24 @@ def _get_docker(console: Console) -> docker.DockerClient:
         sys.exit(1)
 
 
-def cli(project_root_path: str, deploy: bool):
+def cli(project_root_path: str, deploy: bool, workspace_fqn: str = None):
     console = Console()
     openai_client = _get_openai_client()
     docker_client = _get_docker(console)
     project_root_path = os.path.abspath(project_root_path)
+    console.print(ABOUT_AUTODEPLOY)
+    console.print(AUTODEPLOY_INTRO_MESSAGE)
     console.print(
-        "[bold magenta]TFY-Agent[/]: A tool for building and deploying [magenta]Jobs/Services[/] to the Truefoundry platform."
+        "[bold reverse]You will need to have Docker and Git installed on your machine for this to work[/]"
     )
     if AUTODEPLOY_OPENAI_BASE_URL is not None and AUTODEPLOY_OPENAI_API_KEY is not None:
         console.print(
             "[bold green]OpenAI credentials found in environment variables.[/]"
         )
         console.print(
-            "[bold reverse red]DISCLAIMER:[/] The contents of your project will be sent to OpenAI.",
             "This operation will use tokens from your provided OpenAI account and may incur costs.",
         )
     else:
-        console.print(
-            "[bold reverse red]DISCLAIMER:[/] The contents of the project will be sent to OpenAI."
-        )
         console.print(
             "[dim]To use your own LLM, set the environment variables [dim italic green]AUTODEPLOY_OPENAI_BASE_URL[/],[/]",
             "[dim][dim italic green]AUTODEPLOY_OPENAI_API_KEY[/], and [dim italic green]AUTODEPLOY_MODEL_NAME[/] for URL, API key, and LLM model name respectively.[/]",
@@ -228,41 +232,52 @@ def cli(project_root_path: str, deploy: bool):
     console.print(
         "[bold cyan]Note:[/] All changes will be committed to a new branch. Please ensure you have a repository."
     )
+    console.print("[bright_green]Let's get started[/]")
     _check_repo(project_root_path=project_root_path, console=console)
 
-    component_type = ComponentType[
-        Prompt.ask(
-            "[bold magenta]TFY-Agent:[/] Is your project a Service? Or a Job?",
-            choices=[k.value.lower() for k in ComponentType],
-            console=console,
-            default="service",
-        ).upper()
-    ]
+    choices = {
+        "Service: An application that runs continuously. Example: web servers, workers polling a job queue, etc.": "SERVICE",
+        "Job: An application that runs once and then stops. Example: Training an ML model, running a script, etc.": "JOB",
+    }
+    component = inquirer.prompt(
+        [
+            inquirer.List(
+                "component",
+                message="TrueFoundry: Is your project a",
+                choices=choices.keys(),
+            )
+        ]
+    )["component"]
+    component_type = ComponentType[choices[component]]
     while True:
         name = Prompt.ask(
-            "[bold magenta]TFY-Agent:[/] Name of deployment",
+            "[bold magenta]TrueFoundry:[/] Name of deployment",
             console=console,
             default=_get_default_project_name(project_root_path),
         )
         if not re.match(r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$", name):
             console.print(
-                "[bold magenta]TFY-Agent:[/] The name should be between 2-30 alphaneumaric"
+                "[bold magenta]TrueFoundry:[/] The name should be between 2-30 alphaneumaric"
                 " characters and '-'. The first character should not be a digit."
             )
         else:
             break
     command = Prompt.ask(
-        "[bold magenta]TFY-Agent:[/] Command to run the application",
+        "[bold magenta]TrueFoundry:[/] Command to run the application",
         console=console,
         show_default=False,
         default=None,
     )
 
     env_path = Prompt.ask(
-        "[bold magenta]TFY-Agent:[/] Enter .env file location for environment variables, "
+        "[bold magenta]TrueFoundry:[/] Enter .env file location for environment variables, "
         "or press [green]Enter[/] to skip.",
         console=console,
     )
+    if workspace_fqn is None:
+        workspace_fqn = Prompt.ask(
+            "[bold magenta]TrueFoundry:[/] Enter the Workspace FQN where you would like to deploy, [dim]Ex: cluster-name:workspace-name[/]"
+        )
     while True:
         try:
             env = _parse_env(project_root_path, env_path) if env_path else {}
@@ -270,13 +285,13 @@ def cli(project_root_path: str, deploy: bool):
         except FileNotFoundError:
             console.print("[red]Invalid location for .env[/]")
             env_path = Prompt.ask(
-                "[bold magenta]TFY-Agent:[/]Please provide the correct path,"
+                "[bold magenta]TrueFoundry:[/]Please provide the correct path,"
                 "or press [green]Enter[/] to skip.",
                 console=console,
             )
             continue
     status = console.status(
-        "[bold cyan]Starting up:[/] [bold magenta]TFY-Agent[/] is initializing. Please wait..."
+        "[bold cyan]Starting up:[/] [bold magenta]TrueFoundry[/] is initializing. Please wait..."
     )
     with status:
         developer = Developer(
@@ -299,9 +314,6 @@ def cli(project_root_path: str, deploy: bool):
                 break
 
     if deploy:
-        workspace_fqn = Prompt.ask(
-            "Enter the Workspace FQN where you would like to deploy"
-        )
         deploy_component(
             workspace_fqn=workspace_fqn,
             project_root_path=project_root_path,

truefoundry-0.2.0rc7/truefoundry/autodeploy/constants.py

@@ -0,0 +1,22 @@
+import os
+
+DEBUG = os.getenv("AUTODEPLOY_DEBUG", "")
+
+AUTODEPLOY_TFY_BASE_URL = os.getenv(
+    "AUTODEPLOY_TFY_BASE_URL", "https://app.truefoundry.com"
+).strip("/")
+AUTODEPLOY_OPENAI_BASE_URL = os.environ.get("AUTODEPLOY_OPENAI_BASE_URL")
+AUTODEPLOY_OPENAI_API_KEY = os.environ.get("AUTODEPLOY_OPENAI_API_KEY")
+AUTODEPLOY_MODEL_NAME = os.environ.get(
+    "AUTODEPLOY_MODEL_NAME", "auto-deploy-openai/gpt-4-turbo-2024-04-09"
+)
+AUTODEPLOY_INTRO_MESSAGE = """Truefoundry will first check for a [blue]Dockerfile[/] in your project.
+If it's not present, Truefoundry will generate one for you.
+Then, it will attempt to build a Docker image on your machine.
+If any issues are encountered during this process, Truefoundry will attempt to automatically fix them.
+Finally, it will run the application to verify that everything is set up correctly.
+"""
+ABOUT_AUTODEPLOY = """To deploy your project, we will generate the deployment configuration using AI.
+We will analyze your codebase using our AI agent and make the required changes so that we can build and deploy the code.
+We will confirm all the changes with you.
+"""

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/truefoundry/autodeploy/tools/ask.py

@@ -12,7 +12,7 @@ class AskQuestion(Event):
     question: str
 
     def render(self, console: Console) -> str:
-        console.print(f"[bold magenta]TFY-Agent:[/] {self.question}")
+        console.print(f"[bold magenta]TrueFoundry:[/] {self.question}")
         response = console.input("[bold green]You:[/] ")
         return response
 

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/truefoundry/autodeploy/tools/commit.py

@@ -27,7 +27,7 @@ class CommitConfirmation(Event):
     commit_message: str
 
     def render(self, console: Console) -> Optional["Commit.Response"]:
-        console.print("[bold magenta]TFY Agent[/] wants to make a commit,", end=" ")
+        console.print("[bold magenta]TrueFoundry[/] wants to make a commit,", end=" ")
         console.print(f"with Commit Message: [green]{self.commit_message}[/]")
         console.print("[yellow]Displaying changes to be made by the patch[/]")
         console.print(Padding.indent(renderable=LLMDiff(self.patch), level=2))

{truefoundry-0.2.0rc5 → truefoundry-0.2.0rc7}/truefoundry/autodeploy/tools/docker_run.py

@@ -48,7 +48,7 @@ The values are the ports to open on the host""",
 
         def render(self, console: Console):
             console.print(
-                f"[bold magenta]TFY-Agent[/] is executing the Docker container. Image Tag: [bold green]{self.image_tag}[/], Exposed Port: [bold green]{str(self.ports) if self.ports is not None else 'Not exposed'}[/], Command: [bold green]{self.command}[/]"
+                f"[bold magenta]TrueFoundry[/] is executing the Docker container. Image Tag: [bold green]{self.image_tag}[/], Exposed Port: [bold green]{str(self.ports) if self.ports is not None else 'Not exposed'}[/], Command: [bold green]{self.command}[/]"
             )
 
     class Response(ResponseEvent):

truefoundry-0.2.0rc7/truefoundry/cli/__main__.py

@@ -0,0 +1,37 @@
+import sys
+
+import click
+
+from truefoundry.deploy.cli.cli import create_truefoundry_cli
+
+MLFOUNDRY_INSTALLED = True
+
+
+try:
+    from mlfoundry.cli.commands import download
+except ImportError:
+    MLFOUNDRY_INSTALLED = False
+
+
+@click.group()
+def ml():
+    """MlFoundry CLI"""
+
+
+def main():
+    # Exit the interpreter by raising SystemExit(status).
+    # If the status is omitted or None, it defaults to zero (i.e., success).
+    # If the status is an integer, it will be used as the system exit status.
+    # If it is another kind of object, it will be printed and the system exit status will be one (i.e., failure).
+    try:
+        cli = create_truefoundry_cli()
+        if MLFOUNDRY_INSTALLED:
+            ml.add_command(download)
+            cli.add_command(ml)
+    except Exception as e:
+        raise click.exceptions.UsageError(message=str(e)) from e
+    sys.exit(cli())
+
+
+if __name__ == "__main__":
+    main()

truefoundry-0.2.0rc7/truefoundry/deploy/cli/cli.py

@@ -0,0 +1,99 @@
+import logging
+import sys
+
+import rich_click as click
+from servicefoundry import logger
+from servicefoundry.cli.commands import (
+    deploy_patch_v2_command,
+    get_login_command,
+    get_logout_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.version import __version__
+
+from truefoundry.deploy.cli.deploy import deploy_v2_command
+
+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
+
+    Returns:
+        function: main CLI functions will all added sub-commands
+    """
+    cli = truefoundry_cli
+    cli.add_command(get_login_command())
+    # cli.add_command(get_get_command())
+    # cli.add_command(get_list_command())
+    # cli.add_command(get_delete_command())
+    # cli.add_command(get_create_command())
+    # cli.add_command(get_redeploy_command())
+    cli.add_command(get_logout_command())
+    # cli.add_command(get_build_command())
+    cli.add_command(deploy_v2_command)
+    cli.add_command(deploy_patch_v2_command)
+    # cli.add_command(get_build_logs_command())
+    # cli.add_command(get_logs_command())
+    # cli.add_command(get_trigger_command())
+    # cli.add_command(get_terminate_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)
+    return cli
+
+
+CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])  # noqa: C408
+
+
+@click.group(
+    cls=GROUP_CLS, context_settings=CONTEXT_SETTINGS, invoke_without_command=True
+)
+@click.option(
+    "--json",
+    is_flag=True,
+    help="Output entities in json format instead of formatted tables",
+)
+@click.option(
+    "--debug",
+    is_flag=True,
+    default=is_debug_env_set,
+    help="Set logging level to Debug. Can also be set using environment variable. E.g. SFY_DEBUG=1",
+)
+@click.version_option(__version__)
+@click.pass_context
+def truefoundry_cli(ctx, json, debug):
+    """
+    Truefoundry provides an easy way to deploy your services, jobs and models.
+    \b
+
+    To start, login to your Truefoundry account with [i]tfy login[/]
+
+    Then start deploying with [i]tfy deploy[/]
+
+    And more: [link=https://docs.truefoundry.com/docs]https://docs.truefoundry.com/docs[/]
+
+    """
+    setup_rich_click()
+    # TODO (chiragjn): Change this to -o json|yaml|table|pager
+    CliConfig.set("json", json)
+    if ctx.invoked_subcommand is None:
+        click.echo(ctx.get_help())
+    log_level = logging.INFO
+    # no info logs while outputting json
+    if json:
+        log_level = logging.ERROR
+    if debug:
+        log_level = logging.DEBUG
+    logger.add_cli_handler(level=log_level)

truefoundry-0.2.0rc7/truefoundry/deploy/cli/deploy.py

@@ -0,0 +1,184 @@
+import json
+import os
+import sys
+
+import rich_click as click
+import yaml
+from click import UsageError
+from click.exceptions import ClickException
+from servicefoundry.cli.const import GROUP_CLS
+from servicefoundry.lib.dao import application as application_lib
+
+from truefoundry.autodeploy.exception import GitBinaryNotFoundException
+
+GIT_BINARY = True
+
+try:
+    from truefoundry.autodeploy.cli import cli as autodeploy_cli
+except GitBinaryNotFoundException:
+    GIT_BINARY = False
+
+default_file = "default"
+
+
+def _get_yaml_file():
+    files = ["truefoundry.yaml", "servicefoundry.yaml"]
+    for file in files:
+        if os.path.exists(file):
+            return file
+    return None
+
+
+@click.group(
+    name="deploy",
+    cls=GROUP_CLS,
+    invoke_without_command=True,
+    help="Deploy application to Truefoundry",
+)
+@click.option(
+    "-f",
+    "--file",
+    type=click.STRING,
+    default=default_file,
+    help="Path to truefoundry.yaml file",
+    show_default=False,
+)
+@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_v2_command(file: str, workspace_fqn: str, wait: bool):
+    from servicefoundry.lib.auth.servicefoundry_session import ServiceFoundrySession
+    from servicefoundry.v2.lib.deployable_patched_models import Application
+
+    try:
+        _ = ServiceFoundrySession()
+    except Exception as e:
+        raise ClickException(message=str(e)) from e
+
+    if file != default_file and not os.path.exists(file):
+        raise UsageError(
+            f"The file {file} does not exist. Please check the file path and try again."
+        )
+
+    file = _get_yaml_file()
+
+    if file is None:
+        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)
+
+        click.echo(
+            click.style(
+                'We will be using TrueFoundry AI to build your project.\nIf you wish to proceed without TrueFoundry AI,\nyou need to either have a truefoundry.yaml file in your project root or\npass the path to a yaml file using the "--file file_name" option.',
+                fg="yellow",
+            ),
+        )
+
+        if GIT_BINARY:
+            autodeploy_cli(
+                project_root_path=".", deploy=True, workspace_fqn=workspace_fqn
+            )
+        else:
+            raise UsageError(
+                "We cannot find the 'git' command. We use Git to track changes made while automatically building your project. Please install Git to use this feature or manually create a 'truefoundry.yaml' file."
+            )
+    else:
+        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)
+
+
+@click.group(
+    name="patch-application",
+    cls=GROUP_CLS,
+    invoke_without_command=True,
+    help="Deploy application with patches to Truefoundry",
+)
+@click.option(
+    "-f",
+    "--patch-file",
+    "--patch_file",
+    type=click.Path(exists=True, dir_okay=False, resolve_path=True),
+    help="Path to yaml patch file",
+    show_default=True,
+)
+@click.option(
+    "-p",
+    "--patch",
+    type=click.STRING,
+    help="Patch in JSON format provided as a string.",
+    show_default=True,
+)
+@click.option(
+    "-a",
+    "--application_fqn",
+    "--application-fqn",
+    type=click.STRING,
+    required=True,
+    help="FQN of the Application to patch and deploy",
+)
+@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_patch_v2_command(
+    patch_file: str, application_fqn: str, patch: str, wait: bool
+):
+    from servicefoundry.v2.lib.deployable_patched_models import Application
+
+    manifest_patch_obj = None
+    if not patch_file and not patch:
+        raise Exception("You need to either provide --file or --patch.")
+    elif patch and patch_file:
+        raise Exception("You can only provide one of --file and --patch")
+    elif patch:
+        try:
+            manifest_patch_obj = json.loads(patch)
+        except json.decoder.JSONDecodeError as e:
+            raise Exception("Invalid JSON provided as --patch") from e
+    elif patch_file:
+        with open(patch_file, "r") as f:
+            manifest_patch_obj = yaml.safe_load(f)
+
+    if not manifest_patch_obj or not isinstance(manifest_patch_obj, dict):
+        raise Exception("Invalid patch, aborting deployment.")
+
+    tfy_application = application_lib.get_application(application_fqn=application_fqn)
+    patched_application_obj = application_lib.get_patched_application_definition(
+        application=tfy_application, manifest_patch=manifest_patch_obj
+    )
+
+    application = Application.parse_obj(patched_application_obj)
+    application.deploy(workspace_fqn=tfy_application.workspace.fqn, wait=wait)

truefoundry-0.2.0rc5/truefoundry/autodeploy/constants.py

@@ -1,12 +0,0 @@
-import os
-
-DEBUG = os.getenv("AUTODEPLOY_DEBUG", "")
-
-AUTODEPLOY_TFY_BASE_URL = os.getenv(
-    "AUTODEPLOY_TFY_BASE_URL", "https://app.devtest.truefoundry.tech"
-).strip("/")
-AUTODEPLOY_OPENAI_BASE_URL = os.environ.get("AUTODEPLOY_OPENAI_BASE_URL")
-AUTODEPLOY_OPENAI_API_KEY = os.environ.get("AUTODEPLOY_OPENAI_API_KEY")
-AUTODEPLOY_MODEL_NAME = os.environ.get(
-    "AUTODEPLOY_MODEL_NAME", "auto-deploy-openai/gpt-4-turbo-2024-04-09"
-)

truefoundry-0.2.0rc5/truefoundry/cli/__main__.py

@@ -1,60 +0,0 @@
-import sys
-
-import click
-from servicefoundry.cli import create_servicefoundry_cli
-from servicefoundry.cli.const import COMMAND_CLS
-
-from truefoundry.autodeploy.exception import GitBinaryNotFoundException
-
-AUTODEPLOY_INSTALLED = True
-MLFOUNDRY_INSTALLED = True
-GIT_BINARY = True
-
-try:
-    from mlfoundry.cli.commands import download
-except ImportError:
-    MLFOUNDRY_INSTALLED = False
-
-try:
-    from truefoundry.autodeploy.cli import autodeploy_cli
-except ImportError:
-    AUTODEPLOY_INSTALLED = False
-except GitBinaryNotFoundException:
-    GIT_BINARY = False
-
-
-@click.group()
-def ml():
-    """MlFoundry CLI"""
-
-
-@click.command(name="auto-deploy", cls=COMMAND_CLS)
-def handle_git_error():
-    """
-    Build and deploy projects using Truefoundry
-    """
-    raise click.UsageError(
-        "The 'git' command could not be found. Please ensure Git is available in your system to run auto-deploy."
-    )
-
-
-def main():
-    # Exit the interpreter by raising SystemExit(status).
-    # If the status is omitted or None, it defaults to zero (i.e., success).
-    # If the status is an integer, it will be used as the system exit status.
-    # If it is another kind of object, it will be printed and the system exit status will be one (i.e., failure).
-    cli = create_servicefoundry_cli()
-    if MLFOUNDRY_INSTALLED:
-        ml.add_command(download)
-        cli.add_command(ml)
-    if AUTODEPLOY_INSTALLED:
-        if GIT_BINARY:
-            cli.add_command(autodeploy_cli)
-        else:
-            cli.add_command(handle_git_error)
-
-    sys.exit(cli())
-
-
-if __name__ == "__main__":
-    main()