truefoundry 0.2.0rc1__tar.gz → 0.2.0rc3__tar.gz

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.2.0rc1
+Version: 0.2.0rc3
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhichoudhary06@gmail.com
@@ -11,17 +11,16 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Provides-Extra: autodeploy
 Provides-Extra: ml
-Requires-Dist: docker (>=7.0.0,<8.0.0) ; extra == "autodeploy"
-Requires-Dist: gitignorefile (>=1.1.2,<2.0.0) ; extra == "autodeploy"
-Requires-Dist: gitpython (>=3.1.43,<4.0.0) ; extra == "autodeploy"
+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: mlfoundry (==0.10.9) ; extra == "ml"
-Requires-Dist: openai (>=1.16.2,<2.0.0) ; extra == "autodeploy"
-Requires-Dist: pydantic (>=2.6.4,<3.0.0) ; extra == "autodeploy"
-Requires-Dist: python-dotenv (>=1.0.1,<2.0.0) ; extra == "autodeploy"
-Requires-Dist: requests (>=2.31.0,<3.0.0) ; extra == "autodeploy"
-Requires-Dist: rich (>=13.7.1,<14.0.0) ; extra == "autodeploy"
+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)
 Description-Content-Type: text/markdown
 

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.2.0rc1"
+version = "0.2.0rc3"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhichoudhary06@gmail.com>"]
 readme = "README.md"
@@ -9,18 +9,17 @@ readme = "README.md"
 python = "^3.8,<3.13"
 servicefoundry = "0.10.6"
 mlfoundry = { version = "0.10.9", optional = true }
-openai = {version = "^1.16.2", optional = true}
-docker = {version = "^7.0.0", optional = true}
-pydantic = {version = "^2.6.4", optional = true}
-rich = {version = "^13.7.1", optional = true}
-requests = {version = "^2.31.0", optional = true}
-python-dotenv = {version = "^1.0.1", optional = true}
-gitignorefile = {version = "^1.1.2", optional = true}
-gitpython = {version = "^3.1.43", optional = true}
+openai = "^1.16.2"
+docker = "^7.0.0"
+pydantic = ">=1.10.0,<3"
+rich = "^13.7.1"
+requests = "^2.31.0"
+python-dotenv = "^1.0.1"
+gitignorefile = "^1.1.2"
+gitpython = "^3.1.43"
 
 [tool.poetry.extras]
 ml = ["mlfoundry"]
-autodeploy = ["openai", "docker", "pydantic", "rich", "requests", "python-dotenv", "gitignorefile", "gitpython"]
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.3.5"

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/truefoundry/autodeploy/agents/base.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel, ValidationError
 from truefoundry.autodeploy.constants import AUTODEPLOY_MODEL_NAME
 from truefoundry.autodeploy.logger import logger
 from truefoundry.autodeploy.tools import Event, RequestEvent, Tool
+from truefoundry.autodeploy.utils.pydantic_compat import model_dump, model_json_schema
 
 
 def llm(
@@ -50,7 +51,7 @@ def format_tool_response(
 ) -> ChatCompletionToolMessageParam:
     return ChatCompletionToolMessageParam(
         role="tool",
-        content=json.dumps(response.model_dump(), indent=1),
+        content=json.dumps(model_dump(response), indent=1),
         tool_call_id=tool_call_id,
     )
 
@@ -72,7 +73,7 @@ def get_tool_descriptions(
             function=FunctionDefinition(
                 name=tool.__class__.__name__,
                 description=tool.description.strip(),
-                parameters=tool.Request.model_json_schema(),
+                parameters=model_json_schema(tool.Request),
             ),
         )
         descriptions.append(tool)
@@ -82,7 +83,7 @@ def get_tool_descriptions(
             type="function",
             function=FunctionDefinition(
                 name="Response",
-                parameters=response.model_json_schema(),
+                parameters=model_json_schema(response),
             ),
         )
         descriptions.append(tool)

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/truefoundry/autodeploy/agents/tester.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Dict
+from typing import Dict, Optional
 
 import docker
 from openai import OpenAI
@@ -39,6 +39,7 @@ Return response once you are done testing.
         project_identity: ProjectIdentifier.Response
         image_tag: str
         command: str
+        port_to_be_exposed: Optional[int] = None
 
     class Response(ResponseEvent):
         successful: bool = Field(..., description="is everything fine?")

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/truefoundry/autodeploy/cli.py

@@ -138,7 +138,8 @@ def _check_repo(project_root_path: str, console: Console):
 
     except InvalidGitRepositoryError:
         console.print(
-            "[red]Error:[/] This operation can only be performed inside a Git repository."
+            "[red]Error:[/] This operation can only be performed inside a Git repository.\n"
+            "Execute 'git init' to create a new repository."
         )
         sys.exit(1)
 
@@ -198,9 +199,8 @@ def cli(project_root_path: str, deploy: bool):
         "[bold magenta]TFY-Agent[/]: A tool for building and deploying [magenta]Jobs/Services[/] to the Truefoundry platform."
     )
     console.print(
-        "[bold reverse red]DISCLAIMER:[/] The [bold magenta]TFY-Agent[/] may use LLM resources outside of your organization. Please proceed only if you accept this."
+        "[bold reverse red]DISCLAIMER:[/] The contents of the project will be sent to OpenAI."
     )
-    console.print("Let's get started! Please answer the following questions:")
     console.print(
         "[bold cyan]Note:[/] All changes will be committed to a new branch. Please ensure you have a repository."
     )
@@ -298,7 +298,7 @@ def cli(project_root_path: str, deploy: bool):
     "--deploy",
     type=click.BOOL,
     is_flag=True,
-    default=False,
+    default=True,
     show_default=True,
     help="Deploy the project after successfully building it.",
 )

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/truefoundry/autodeploy/tools/ask.py

@@ -5,6 +5,7 @@ from typing import Iterable
 from rich.console import Console
 
 from truefoundry.autodeploy.tools.base import Event, RequestEvent, ResponseEvent, Tool
+from truefoundry.autodeploy.utils.pydantic_compat import model_dump
 
 
 class AskQuestion(Event):
@@ -28,5 +29,5 @@ Ask a question to the user.
         response: str
 
     def run(self, request: Ask.Request) -> Iterable[Event]:
-        response = yield AskQuestion(**request.model_dump())
+        response = yield AskQuestion(**model_dump(request))
         return Ask.Response(response=response)

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/truefoundry/autodeploy/tools/commit.py

@@ -19,6 +19,7 @@ from truefoundry.autodeploy.tools.base import (
     Tool,
 )
 from truefoundry.autodeploy.utils.diff import LLMDiff
+from truefoundry.autodeploy.utils.pydantic_compat import model_dump
 
 
 class CommitConfirmation(Event):
@@ -116,7 +117,7 @@ The patch should have any changes that is not described in the commit message.
     ) -> Generator[Event, Any, ResponseEvent]:
         fp = tempfile.NamedTemporaryFile(mode="w", delete=False)
         try:
-            interaction_response = yield CommitConfirmation(**request.model_dump())
+            interaction_response = yield CommitConfirmation(**model_dump(request))
             if isinstance(interaction_response, Commit.Response):
                 return interaction_response
             fp.write(request.patch)

{truefoundry-0.2.0rc1 → truefoundry-0.2.0rc3}/truefoundry/autodeploy/tools/docker_run.py

@@ -40,6 +40,7 @@ Run a docker image
         ports: Optional[Dict[str, int]] = Field(
             None,
             description="""
+Ports to expose.
 The keys of the dictionary are the ports to bind inside the container in 'port'.
 The values are the ports to open on the host""",
         )

truefoundry-0.2.0rc3/truefoundry/autodeploy/utils/pydantic_compat.py

@@ -0,0 +1,19 @@
+from typing import Any, Dict, Type
+
+import pydantic
+
+PYDANTIC_V2 = pydantic.VERSION.startswith("2.")
+
+
+def model_dump(
+    model: pydantic.BaseModel,
+) -> Dict[str, Any]:
+    if PYDANTIC_V2:
+        return model.model_dump()
+    return model.dict()
+
+
+def model_json_schema(model: Type[pydantic.BaseModel]) -> Dict[str, Any]:
+    if PYDANTIC_V2:
+        return model.model_json_schema()
+    return model.schema()