truefoundry 0.2.0rc1__py3-none-any.whl → 0.2.0rc3__py3-none-any.whl

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/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/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/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/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/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/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()

{truefoundry-0.2.0rc1.dist-info → truefoundry-0.2.0rc3.dist-info}/METADATA

@@ -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.dist-info → truefoundry-0.2.0rc3.dist-info}/RECORD

@@ -1,32 +1,33 @@
 truefoundry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/autodeploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/autodeploy/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/autodeploy/agents/base.py,sha256=TAUIdT8MO07Mb3QcBjjtb0Qa3LHXnOPD9fVNsxTTkR0,6321
+truefoundry/autodeploy/agents/base.py,sha256=woCry229x7WX0IZmBopW_e_NB76aCLQRLXZBs2QBklk,6405
 truefoundry/autodeploy/agents/developer.py,sha256=u1BfjaMDX6Ad32vWYOEFZPWFK33ux0Ro8JztrRAFviY,4126
 truefoundry/autodeploy/agents/project_identifier.py,sha256=m8xg7U5D2zSLEKp5QyPZRldw4VPuTFM8omPCRC0Ri-w,4428
-truefoundry/autodeploy/agents/tester.py,sha256=j-zuKhVGOIpBCgahYF759c6Z8OsVh_dNGKq9FhOiV1I,2289
-truefoundry/autodeploy/cli.py,sha256=sF9eIM8y3z26v50BtnLBsWJdcreBIznxp002990BJ4g,10660
+truefoundry/autodeploy/agents/tester.py,sha256=iSnWHubzHPO36Je2nYQYsdxL64xVQ3DxvEnakEJAW1Q,2348
+truefoundry/autodeploy/cli.py,sha256=QWOf3YrUzgfvglaS43MYyi3LnmWLBbZF8ntZsvVKTN0,10572
 truefoundry/autodeploy/constants.py,sha256=4ZHn08CCs_6ti-8Y6zaM_5IhI9mrB-1eDALhbn36oIw,435
 truefoundry/autodeploy/exception.py,sha256=BHqbkN-RdEsrfqPHQhWwSHiWnwQ6eaBc7PGGEXjJ3RY,54
 truefoundry/autodeploy/logger.py,sha256=tkV2UKcOTFl5nz0cn4eRbzxF-2CZd8b7MK9vnhaflYw,325
 truefoundry/autodeploy/tools/__init__.py,sha256=9zJiC1d4bv9EL-p5XTCa9fAQ6ZKV--AbgeLz9bBBkyQ,875
-truefoundry/autodeploy/tools/ask.py,sha256=pTW6LBkfmNQIO9bD9LVOQKymRBXWDaDUYiJwTEtShGQ,787
+truefoundry/autodeploy/tools/ask.py,sha256=fOKZiN7xI11OyGXG7RABwy6OPf_KGx48NhY8vggB-g4,854
 truefoundry/autodeploy/tools/base.py,sha256=X7bBhJ2-mkc1_uo9dLtIoZOgKsvoCsmvCzdh_j0rdys,665
-truefoundry/autodeploy/tools/commit.py,sha256=ECWRb8AOlbi26IZeAK-S8HrVDqwAVvGqJWy-7p7yh_w,5823
+truefoundry/autodeploy/tools/commit.py,sha256=gmA_TFPGVtXHYTHeeca8OXI9c11BSCTSywQjkiAeqDQ,5890
 truefoundry/autodeploy/tools/docker_build.py,sha256=6LfWLJYh3Y3kCIVOC8lFcZjWHIk3iWEuw_qoAxx642k,3931
-truefoundry/autodeploy/tools/docker_run.py,sha256=9O_uqSVM7zp1Hd72h64jniLS5p5E3TiOtAAKLE3YjIY,5059
+truefoundry/autodeploy/tools/docker_run.py,sha256=9TpT4rcpeJTpsSg0YwQpqF-mYPyxnUUCKcHkD-VoO_M,5076
 truefoundry/autodeploy/tools/file_type_counts.py,sha256=4p6IHp-j1vBzELpepFhNwfmB88cUUAFdVDQdzv4lGtM,2288
 truefoundry/autodeploy/tools/list_files.py,sha256=9z_Nih_N8v7qe14znl7_-3MKZjw5RylVyy7L8qvU1es,2577
 truefoundry/autodeploy/tools/read_file.py,sha256=h1xdwRMxuRTLX4ZprzSgfkpuu52FbYNrQUJDBW3Ck4A,1751
 truefoundry/autodeploy/tools/send_request.py,sha256=5q_fAo0tXRiHg9M3XpdwhCzUtDUWVh17239oU4LkZfI,1614
 truefoundry/autodeploy/tools/write_file.py,sha256=EcYetnJ4X-NWsd_CdYUKfOnAdz2XXiRukTzJfb_GzFs,3130
 truefoundry/autodeploy/utils/diff.py,sha256=Ef8Y-VffDKel_-q-GxRam6gqiv8qTLMcqVg6iifXfcA,5358
+truefoundry/autodeploy/utils/pydantic_compat.py,sha256=hEAUy5kLjhPdzw7yGZ2iXGMXbbMVXVlGzIofmyHafXQ,412
 truefoundry/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/cli/__main__.py,sha256=gSKVAG41klzNpe0IrURtRlR7zDo430tX0nEqR02L2SU,1585
 truefoundry/deploy/__init__.py,sha256=rY-AcjgSmu0r072rdUNpRkMmDFC7hH9drF5_pIN5jnw,29
 truefoundry/langchain/__init__.py,sha256=R1h2DkLLsVLPh3xVVzU2H_kpN4LNgzx3mPCcGVr2u5g,39
 truefoundry/ml/__init__.py,sha256=SJiI5QimXJETfME2x0iXz8gPn6C22YNiLiEdHIV1g7c,151
-truefoundry-0.2.0rc1.dist-info/METADATA,sha256=NUNcCj2RH_bsLtK8XT7DdH8-zehEg10l21sETQwZ22Q,2060
-truefoundry-0.2.0rc1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-truefoundry-0.2.0rc1.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.2.0rc1.dist-info/RECORD,,
+truefoundry-0.2.0rc3.dist-info/METADATA,sha256=CuNSdxJPNngMDunPDi-FFb4hULsoPeqZ9_a85jgwbp0,1838
+truefoundry-0.2.0rc3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+truefoundry-0.2.0rc3.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.2.0rc3.dist-info/RECORD,,