truefoundry 0.2.0rc8__tar.gz → 0.2.0rc10__tar.gz

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.2.0rc8
+Version: 0.2.0rc10
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhichoudhary06@gmail.com
-Requires-Python: >=3.8.1,<3.13
+Requires-Python: >=3.8,<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
@@ -14,14 +15,13 @@ 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.10)
+Requires-Dist: servicefoundry (==0.10.11)
 Description-Content-Type: text/markdown
 
 # Truefoundry

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.2.0rc8"
+version = "0.2.0rc10"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhichoudhary06@gmail.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.8.1,<3.13"
-servicefoundry = "0.10.10"
+python = "^3.8,<3.13"
+servicefoundry = "0.10.11"
 mlfoundry = { version = "0.10.9", optional = true }
 openai = "^1.16.2"
 docker = "^7.0.0"
@@ -17,7 +17,6 @@ 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.0rc8 → truefoundry-0.2.0rc10}/truefoundry/autodeploy/cli.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import re
 import sys
@@ -6,19 +5,10 @@ from typing import Dict, Optional
 
 import click
 import docker
-import inquirer
-from dotenv import dotenv_values
-
-from truefoundry.autodeploy.exception import GitBinaryNotFoundException
-
-try:
-    from git import GitCommandError, Repo
-    from git.exc import InvalidGitRepositoryError
-except ImportError as ex:
-    raise GitBinaryNotFoundException from ex
-
+import questionary
 import requests
-from click.exceptions import ClickException
+import yaml
+from dotenv import dotenv_values
 from openai import OpenAI
 from rich.console import Console
 from rich.prompt import Prompt
@@ -26,6 +16,9 @@ from rich.status import Status
 from servicefoundry import Build, DockerFileBuild, Job, LocalSource, Port, Service
 from servicefoundry.cli.const import COMMAND_CLS
 from servicefoundry.lib.auth.servicefoundry_session import ServiceFoundrySession
+from servicefoundry.lib.clients.service_foundry_client import (
+    ServiceFoundryServiceClient,
+)
 
 from truefoundry.autodeploy.agents.developer import Developer
 from truefoundry.autodeploy.agents.project_identifier import (
@@ -40,9 +33,13 @@ from truefoundry.autodeploy.constants import (
     AUTODEPLOY_OPENAI_BASE_URL,
     AUTODEPLOY_TFY_BASE_URL,
 )
+from truefoundry.autodeploy.exception import InvalidRequirementsException
 from truefoundry.autodeploy.tools.ask import AskQuestion
 from truefoundry.autodeploy.tools.commit import CommitConfirmation
 from truefoundry.autodeploy.tools.docker_run import DockerRun, DockerRunLog
+from truefoundry.autodeploy.utils.client import get_git_binary
+
+git = get_git_binary()
 
 
 def _get_openai_client() -> OpenAI:
@@ -62,11 +59,38 @@ 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 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
+        if http_error.response.status_code in [401, 403]:
+            raise InvalidRequirementsException(
+                message='Unauthorized access to Truefoundry server. Please verify your credentials and ensure you have the necessary access rights.\nIf you wish to proceed without Truefoundry AI, you need to either have a truefoundry.yaml file in your project root or pass the path to a yaml file using the "--file file_name" option.'
+            ) from http_error
+
+        raise http_error
+
     except Exception as e:
-        raise ClickException(message=str(e)) from e
+        raise InvalidRequirementsException(message=str(e)) from e
+
+
+def _get_service_port(name: str, workspace_fqn: str, port: int) -> Port:
+    client = ServiceFoundryServiceClient()
+    workspaces = client.get_workspace_by_fqn(workspace_fqn=workspace_fqn)
+    if len(workspaces) == 0:
+        raise click.UsageError("Invalid workspace")
+    workspace = workspaces[0]
+    cluster = client.get_cluster(cluster_id=workspace.clusterId)
+
+    generated_name = name + "-" + workspace.name
+    base_domain_urls = cluster["metadata"].get("baseDomainURLs")
+    if not base_domain_urls:
+        return Port(port=port, expose=False)
+
+    base_domain_url = base_domain_urls[0]
+
+    if "*" in base_domain_url:
+        return Port(
+            port=port, host=base_domain_url.replace("*", generated_name).strip("/")
+        )
+
+    return Port(port=port, host=base_domain_url, path=f"/{generated_name}/")
 
 
 def deploy_component(
@@ -79,8 +103,6 @@ def deploy_component(
     command: Optional[str] = None,
     port: Optional[int] = None,
 ):
-    logging.basicConfig(level=logging.INFO)
-
     if not os.path.exists(os.path.join(project_root_path, dockerfile_path)):
         raise FileNotFoundError("Dockerfile not found in the project.")
 
@@ -94,14 +116,20 @@ def deploy_component(
     if component_type == ComponentType.SERVICE:
         if port is None:
             raise ValueError("Port is required for deploying service")
+        service_port = _get_service_port(
+            name=name, workspace_fqn=workspace_fqn, port=port
+        )
+
         app = Service(
             name=name,
             image=image,
-            ports=[Port(port=port, expose=False)],
+            ports=[service_port],
             env=env,
         )
     else:
         app = Job(name=name, image=image, env=env)
+    with open("truefoundry.yaml", "w") as application_spec:
+        yaml.dump(app.dict(), application_spec, indent=2)
     app.deploy(workspace_fqn=workspace_fqn)
 
 
@@ -117,7 +145,7 @@ def _parse_env(project_root_path: str, env_path: str) -> Dict:
 
 def _check_repo(project_root_path: str, console: Console):
     try:
-        repo = Repo(project_root_path)
+        repo = git.Repo(path=project_root_path, search_parent_directories=True)
         if repo.is_dirty():
             console.print(
                 "[bold red]Error:[/] The repository has uncommitted changes. Please commit or stash them before proceeding."
@@ -142,14 +170,14 @@ def _check_repo(project_root_path: str, console: Console):
                 f"[bold magenta]TrueFoundry:[/] Continuing on [green]{current_active_branch!r}[/]"
             )
 
-    except InvalidGitRepositoryError:
+    except git.exc.InvalidGitRepositoryError:
         console.print(
             "[red]Error:[/] This operation can only be performed inside a Git repository.\n"
             "Execute 'git init' to create a new repository."
         )
         sys.exit(1)
 
-    except GitCommandError as gce:
+    except git.GitCommandError as gce:
         console.print(
             f"Command execution failed due to the following error:[red]{gce.stderr}[/]".replace(
                 "\n  stderr:", ""
@@ -184,7 +212,7 @@ def _update_status(event, status: Status):
 
     if isinstance(event, DockerRunLog):
         status.update(
-            "[bold cyan]Running:[/] [bold magenta]TrueFoundry[/] 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..."
         )
 
 
@@ -199,12 +227,10 @@ def _get_default_project_name(project_root_path: str):
 def _get_docker(console: Console) -> docker.DockerClient:
     try:
         return docker.from_env()
-    except Exception:
-        console.print_exception(extra_lines=0, max_frames=1)
-        console.print(
-            "[bold red]Error:[/] Could not connect to Docker, please check whether the Docker daemon is running."
-        )
-        sys.exit(1)
+    except Exception as e:
+        raise InvalidRequirementsException(
+            message="Could not connect to Docker, please check whether the Docker daemon is running."
+        ) from e
 
 
 def cli(project_root_path: str, deploy: bool, workspace_fqn: str = None):
@@ -239,21 +265,17 @@ def cli(project_root_path: str, deploy: bool, workspace_fqn: str = None):
         "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 = questionary.select(
+        "TrueFoundry: Is your project a", choices=choices.keys()
+    ).ask()
     component_type = ComponentType[choices[component]]
     while True:
         name = Prompt.ask(
-            "[bold magenta]TrueFoundry:[/] Name of deployment",
+            "[bold magenta]TrueFoundry:[/] Name of deployment, or press [green]Enter[/] to select default. "
+            f"default: [green]{_get_default_project_name(project_root_path)}",
             console=console,
             default=_get_default_project_name(project_root_path),
+            show_default=False,
         )
         if not re.match(r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$", name):
             console.print(
@@ -263,7 +285,7 @@ def cli(project_root_path: str, deploy: bool, workspace_fqn: str = None):
         else:
             break
     command = Prompt.ask(
-        "[bold magenta]TrueFoundry:[/] Command to run the application",
+        "[bold magenta]TrueFoundry:[/] Command to run the application or press [green]Enter[/] to skip",
         console=console,
         show_default=False,
         default=None,

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/truefoundry/autodeploy/constants.py

@@ -20,3 +20,9 @@ ABOUT_AUTODEPLOY = """To deploy your project, we will generate the deployment co
 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.
 """
+# The maximum file size to read is set to 10KB.
+# This limit is determined by the token limit of the LLM used, which is 128,000 tokens.
+# Given that one token is approximately equivalent to 4 English characters,
+# a 10KB file size limit (or ~10,000 characters |  ~2500 tokens) ensures that the file content,
+# along with any additional context and instructions for the LLM, fits within the model's token limit.
+MAX_FILE_SIZE_READ = 10 * 1024

truefoundry-0.2.0rc10/truefoundry/autodeploy/exception.py

@@ -0,0 +1,4 @@
+class InvalidRequirementsException(Exception):
+    def __init__(self, message: str) -> None:
+        super().__init__(message)
+        self.message = message

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/truefoundry/autodeploy/tools/commit.py

@@ -4,7 +4,6 @@ import os
 import tempfile
 from typing import Any, Generator, Optional
 
-from git import Repo
 from pydantic import Field
 from rich.console import Console
 from rich.padding import Padding
@@ -18,9 +17,12 @@ from truefoundry.autodeploy.tools.base import (
     ResponseEvent,
     Tool,
 )
+from truefoundry.autodeploy.utils.client import get_git_binary
 from truefoundry.autodeploy.utils.diff import LLMDiff
 from truefoundry.autodeploy.utils.pydantic_compat import model_dump
 
+git = get_git_binary()
+
 
 class CommitConfirmation(Event):
     patch: str
@@ -109,7 +111,9 @@ The patch should have any changes that is not described in the commit message.
 
     def __init__(self, project_root_path: str):
         self.project_root_path = project_root_path
-        self.repo = Repo(path=self.project_root_path, search_parent_directories=False)
+        self.repo = git.Repo(
+            path=self.project_root_path, search_parent_directories=True
+        )
 
     def run(
         self,

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/truefoundry/autodeploy/tools/docker_run.py

@@ -20,14 +20,10 @@ from truefoundry.autodeploy.tools.base import (
 
 
 class DockerRunLog(Event):
-    index: int
     log: str
 
     def render(self, console: Console):
-        # if self.index > 1:
-        #     print("\r", end="")
         console.print(Padding.indent(renderable=Text.from_ansi(self.log), level=2))
-        # console.print("Press control-c to stop waiting for more logs", end="")
 
 
 class DockerRun(Tool):
@@ -128,13 +124,15 @@ This will not be passed if the container is still running.
         exit_code = None
 
         all_logs = []
-        logs = container.logs(stream=True)
 
         try:
-            for i, log in enumerate(logs):
+            # This acts as a signal to update status.
+            yield DockerRunLog(log="")
+            logs = container.logs(stream=True)
+            for log in logs:
                 log = log.decode()
                 all_logs.append(log)
-                yield DockerRunLog(index=i, log=log)
+                yield DockerRunLog(log=log)
         except KeyboardInterrupt:
             pass
         else:

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/truefoundry/autodeploy/tools/read_file.py

@@ -5,6 +5,7 @@ from typing import Any, Generator, List, Optional
 
 from pydantic import BaseModel, Field
 
+from truefoundry.autodeploy.constants import MAX_FILE_SIZE_READ
 from truefoundry.autodeploy.tools.base import (
     Event,
     Message,
@@ -52,15 +53,22 @@ Avoid reading *.lock type files as they tend to be large
         yield Message(
             message=f"[bold cyan]Processing:[/] Reading file at [magenta]{request.path}[/] and extracting details..."
         )
+
         try:
-            with open(
-                os.path.join(self.project_root_path, request.path),
-                "r",
-                encoding="utf8",
-            ) as f:
+            file_path = os.path.join(self.project_root_path, request.path)
+            file_size = os.path.getsize(file_path)
+
+            if file_size > MAX_FILE_SIZE_READ:
+                return ReadFile.Response(error=f"File size exceeds {MAX_FILE_SIZE_READ} bytes limit")
+
+            with open(file_path, "r", encoding="utf8") as f:
                 response = ReadFile.Response(data=[])
                 for i, line in enumerate(f):
                     response.data.append(Line(line_number=i + 1, content=line))
                 return response
         except FileNotFoundError as ex:
             return ReadFile.Response(error=str(ex))
+        except UnicodeDecodeError as ex:
+            return ReadFile.Response(
+                error="This is a binary file, reading it is prohibited."
+            )

truefoundry-0.2.0rc10/truefoundry/autodeploy/utils/client.py

@@ -0,0 +1,12 @@
+from truefoundry.autodeploy.exception import InvalidRequirementsException
+
+
+def get_git_binary():
+    try:
+        import git
+
+        return git
+    except Exception as ex:
+        raise InvalidRequirementsException(
+            message="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."
+        ) from ex

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/truefoundry/deploy/cli/cli.py

@@ -13,10 +13,14 @@ 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 servicefoundry.version import __version__
 
 from truefoundry.deploy.cli.deploy import deploy_v2_command
 
+servicefoundry_logger.setLevel(level=logging.INFO)
+
+
 click.rich_click.USE_RICH_MARKUP = True
 
 

{truefoundry-0.2.0rc8 → truefoundry-0.2.0rc10}/truefoundry/deploy/cli/deploy.py

@@ -9,24 +9,20 @@ 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
+from truefoundry.autodeploy.cli import cli as autodeploy_cli
+from truefoundry.autodeploy.exception import InvalidRequirementsException
 
-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
+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(
@@ -38,10 +34,10 @@ def _get_yaml_file():
 @click.option(
     "-f",
     "--file",
-    type=click.STRING,
-    default=default_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=False,
+    show_default=True,
 )
 @click.option(
     "-w",
@@ -67,53 +63,45 @@ def deploy_v2_command(file: str, workspace_fqn: str, wait: bool):
     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 file:
+        with open(file, "r") as f:
+            application_definition = yaml.safe_load(f)
 
-        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)
+        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(
-                '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.',
+                'Please create a truefoundry.yaml or pass the file name with "--file file_name"',
                 fg="yellow",
             ),
+            color=True,
         )
+        sys.exit(1)
 
-        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)
+    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",
+        ),
+    )
 
-        application = Application.parse_obj(application_definition)
-        application.deploy(workspace_fqn=workspace_fqn, wait=wait)
+    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
 
 
 @click.group(

truefoundry-0.2.0rc8/truefoundry/autodeploy/exception.py

@@ -1,2 +0,0 @@
-class GitBinaryNotFoundException(Exception):
-    pass