truefoundry 0.2.1__tar.gz → 0.2.2__tar.gz

{truefoundry-0.2.1 → truefoundry-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.2.1
+Version: 0.2.2
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhichoudhary06@gmail.com

{truefoundry-0.2.1 → truefoundry-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.2.1"
+version = "0.2.2"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhichoudhary06@gmail.com>"]
 readme = "README.md"

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/agents/project_identifier.py

@@ -92,6 +92,7 @@ pip, poetry, yarn, go.mod, cargo.toml, npm, setup.py.
         )
 
         def render(self, console: Console):
+            console.rule("[bold green]Project Identification[/]")
             if self.primary_programming_language is not None:
                 console.print(
                     f"[bold magenta]TrueFoundry:[/] Identified a project using [bold cyan]{self.primary_programming_language}[/]."

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/agents/tester.py

@@ -52,6 +52,7 @@ Why was the testing a failure or successful?
         logs: str
 
         def render(self, console: Console):
+            console.rule("[bold green]Result[/]")
             console.print(
                 f"[bold cyan]TrueFoundry:[/] The given project has been {'[bold green]successfully built[/]' if self.successful else '[bold red]failed to build[/]'}"
             )

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/cli.py

@@ -28,7 +28,6 @@ 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,
@@ -188,7 +187,7 @@ def _check_repo(project_root_path: str, console: Console):
         sys.exit(1)
 
 
-def _update_status(event, status: Status):
+def _update_status(event, status: Status, component_type: ComponentType):
     if isinstance(event, (AskQuestion, CommitConfirmation)):
         status.stop()
 
@@ -210,9 +209,14 @@ 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..."
-        )
+        if component_type == ComponentType.SERVICE:
+            status.update(
+                "[bold cyan]Running:[/] [bold magenta]TrueFoundry[/] is running your app in a Docker container. Press ctrl+c once your app is ready for testing."
+            )
+        else:
+            status.update(
+                "[bold cyan]Running:[/] [bold magenta]TrueFoundry[/] is running your app in a Docker container and waiting for completion."
+            )
 
 
 def _get_default_project_name(project_root_path: str):
@@ -238,7 +242,6 @@ def cli(project_root_path: str, deploy: bool, workspace_fqn: str = None):
     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 reverse]You will need to have Docker and Git installed on your machine for this to work[/]"
     )
@@ -328,13 +331,16 @@ def cli(project_root_path: str, deploy: bool, workspace_fqn: str = None):
             try:
                 status.start()
                 event = developer_run.send(inp)
-                _update_status(event=event, status=status)
+                _update_status(
+                    event=event, status=status, component_type=component_type
+                )
                 inp = event.render(console)
             except StopIteration as ex:
                 response = ex.value
                 break
 
     if deploy:
+        console.rule("[bold green]Deploying to Truefoundry[/]")
         deploy_component(
             workspace_fqn=workspace_fqn,
             project_root_path=project_root_path,

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/constants.py

@@ -10,15 +10,9 @@ 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.
+ABOUT_AUTODEPLOY = """We'll use AI to build and deploy your project automatically.
+Our AI Agent analyzes your codebase, checks for a Dockerfile, creates one if missing, builds a Docker image, fixes any issues, and runs the application to ensure we have built it correctly.
+If you don't want to use our AI Agent to deploy automatically, create a [green]truefoundry.yaml[/] file in your project's root.
 """
 # 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.

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/base.py

@@ -29,3 +29,10 @@ class Message(Event):
 
     def render(self, console: Console):
         console.print(self.message)
+
+
+class Rule(Event):
+    message: Any
+
+    def render(self, console: Console):
+        console.rule(self.message)

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/commit.py

@@ -27,6 +27,7 @@ class CommitConfirmation(Event):
     commit_message: str
 
     def render(self, console: Console) -> Optional["Commit.Response"]:
+        console.rule("[bold green]Commit[/]")
         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[/]")

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/docker_build.py

@@ -16,6 +16,7 @@ from truefoundry.autodeploy.tools.base import (
     Message,
     RequestEvent,
     ResponseEvent,
+    Rule,
     Tool,
 )
 
@@ -90,6 +91,7 @@ Build a docker image.
         self.docker_client = docker_client
 
     def run(self, request: DockerBuild.Request) -> Generator[Event, Any, ResponseEvent]:
+        yield Rule(message="[bold green] Docker Build[/]")
         yield Message(message="[bold cyan]Processing:[/] Building Docker image...")
         yield Message(message="[bold yellow]Docker build logs:[/]")
         try:

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/docker_run.py

@@ -15,6 +15,7 @@ from truefoundry.autodeploy.tools.base import (
     Message,
     RequestEvent,
     ResponseEvent,
+    Rule,
     Tool,
 )
 
@@ -104,6 +105,8 @@ This will not be passed if the container is still running.
 
     def run(self, request: DockerRun.Request) -> Generator[Event, Any, ResponseEvent]:
         self._kill_running_containers()
+
+        yield Rule(message="[bold green] Docker Run[/]")
         yield Message(message="[bold cyan]Testing:[/] Running Docker container...")
         try:
             container = self.docker_client.containers.run(

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/file_type_counts.py

@@ -14,6 +14,7 @@ from truefoundry.autodeploy.tools.base import (
     Message,
     RequestEvent,
     ResponseEvent,
+    Rule,
     Tool,
 )
 
@@ -53,7 +54,7 @@ Get counts of different types of file present.
         self, request: FileTypeCounts.Request
     ) -> Generator[Event, Any, ResponseEvent]:
         counter = Counter()
-
+        yield Rule(message="[bold green]File Counts[/]")
         yield Message(
             message="[bold cyan]Processing:[/] Scanning for various file types..."
         )

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/list_files.py

@@ -12,6 +12,7 @@ from truefoundry.autodeploy.tools.base import (
     Message,
     RequestEvent,
     ResponseEvent,
+    Rule,
     Tool,
 )
 
@@ -41,6 +42,7 @@ the subdir should be . and pattern will be *.json
         self.project_root_path = project_root_path
 
     def run(self, request: ListFiles.Request) -> Generator[Event, Any, ResponseEvent]:
+        yield Rule(message="[bold green]List Files[/]")
         yield Message(
             message=f"[bold cyan]Searching:[/] 🔍 Looking for files matching the pattern [magenta]{request.pattern}[/]"
         )

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/read_file.py

@@ -11,6 +11,7 @@ from truefoundry.autodeploy.tools.base import (
     Message,
     RequestEvent,
     ResponseEvent,
+    Rule,
     Tool,
 )
 
@@ -50,6 +51,7 @@ Avoid reading *.lock type files as they tend to be large
         self.project_root_path = project_root_path
 
     def run(self, request: ReadFile.Request) -> Generator[Event, Any, ResponseEvent]:
+        yield Rule(message="[bold green] Read files[/]")
         yield Message(
             message=f"[bold cyan]Processing:[/] Reading file at [magenta]{request.path}[/] and extracting details..."
         )

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/autodeploy/tools/send_request.py

@@ -10,6 +10,7 @@ from truefoundry.autodeploy.tools.base import (
     Message,
     RequestEvent,
     ResponseEvent,
+    Rule,
     Tool,
 )
 
@@ -33,8 +34,9 @@ Send an HTTP request.
 
     def run(self, request: SendRequest.Request) -> Generator[Event, Any, ResponseEvent]:
         self.call_count += 1
+        yield Rule(message="[bold green]Endpoint Verification[/]")
         yield Message(
-            message=f"[bold cyan]Testing:[/] Sending a [magenta]{request.method.upper()}[/] request to [magenta]{request.url}[/]..."
+            message=f"[bold cyan]Testing:[/] Sending a [magenta]{request.method.upper()}[/] request to [magenta]{request.url}[/]"
         )
         try:
             response = requests.request(request.method.lower(), url=request.url)

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/deploy/cli/cli.py

@@ -5,6 +5,7 @@ import rich_click as click
 from servicefoundry import logger
 from servicefoundry.cli.commands import (
     deploy_patch_v2_command,
+    get_delete_command,
     get_login_command,
     get_logout_command,
     get_patch_command,
@@ -14,9 +15,9 @@ 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
+from truefoundry.deploy.cli.version import __version__
 
 servicefoundry_logger.setLevel(level=logging.INFO)
 
@@ -38,7 +39,7 @@ def create_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_delete_command())
     # cli.add_command(get_create_command())
     # cli.add_command(get_redeploy_command())
     cli.add_command(get_logout_command())

{truefoundry-0.2.1 → truefoundry-0.2.2}/truefoundry/deploy/cli/deploy.py

@@ -89,13 +89,6 @@ def deploy_v2_command(file: str, workspace_fqn: str, wait: bool):
         )
         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",
-        ),
-    )
-
     try:
         autodeploy_cli(project_root_path=".", deploy=True, workspace_fqn=workspace_fqn)
     except InvalidRequirementsException as e:

truefoundry-0.2.2/truefoundry/deploy/cli/version.py

@@ -0,0 +1,6 @@
+from importlib_metadata import version
+
+try:
+    __version__ = version("truefoundry")
+except Exception:
+    __version__ = "NA"