truefoundry 0.10.2rc1__py3-none-any.whl → 0.10.4__py3-none-any.whl

truefoundry/_ask/client.py

@@ -94,7 +94,6 @@ class AskClient:
         """Generate authorization headers for connecting to the SSE server."""
         return {
             "Authorization": f"Bearer {self.token}",
-            "X-TFY-Cluster-Id": self.cluster,
             "X-TFY-Session-Id": self._session_id,
         }
 
@@ -317,6 +316,10 @@ class AskClient:
                     turn += 1
                     message = response.choices[0].message
 
+                    if not message.content and not message.tool_calls:
+                        self._log_message("No assistant response. Try again.", log=True)
+                        break
+
                     if message.content:
                         self._append_message(
                             ChatCompletionAssistantMessageParam(
@@ -327,8 +330,7 @@ class AskClient:
                     if message.tool_calls:
                         await self._handle_tool_calls(message, spinner)
 
-                    if not message.content and not message.tool_calls:
-                        self._log_message("No assistant response.")
+                    if message.content and not message.tool_calls:
                         break
                 except Exception as e:
                     self._log_message(f"OpenAI call failed: {e}", log=True)
@@ -402,10 +404,16 @@ class AskClient:
 
     async def chat_loop(self):
         """Interactive loop: accepts user queries and returns responses until interrupted or 'exit' is typed."""
+        self._append_message(
+            ChatCompletionUserMessageParam(
+                role="user",
+                content=f"Selected cluster: {self.cluster}",
+            )
+        )
         self._append_message(
             ChatCompletionAssistantMessageParam(
                 role="assistant",
-                content="Hello! How can I help you with your Kubernetes cluster?",
+                content="Hello! How can I help you with this Kubernetes cluster?",
             )
         )
 

truefoundry/cli/util.py

@@ -109,7 +109,7 @@ def print_dict_as_table_panel(
 ):
     table = Table(show_header=False, box=None)
     table.add_column("Key", style=f"bold {key_color}", width=15)
-    table.add_column("Value")
+    table.add_column("Value", overflow="fold")
     for key, value in dct.items():
         table.add_row(key, value)
     console.print(

truefoundry/deploy/__init__.py

@@ -118,6 +118,7 @@ from truefoundry.deploy.v2.lib.patched_models import (
     SparkImageBuild,
     SparkJobJavaEntrypoint,
     SparkJobPythonEntrypoint,
+    SparkJobPythonNotebookEntrypoint,
     SparkJobScalaEntrypoint,
     SQSInputConfig,
     SQSOutputConfig,

truefoundry/deploy/_autogen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2025-06-09T12:01:27+00:00
+#   timestamp: 2025-06-18T21:24:37+00:00
 
 from __future__ import annotations
 
@@ -908,7 +908,7 @@ class SparkImageBuild(BaseModel):
         None,
         description="FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
     )
-    build_source: GitSource
+    build_source: Union[GitSource, RemoteSource] = Field(..., description="")
     build_spec: SparkBuild
 
 
@@ -936,6 +936,14 @@ class SparkJobPythonEntrypoint(BaseModel):
     )
 
 
+class SparkJobPythonNotebookEntrypoint(BaseModel):
+    type: Literal["python-notebook"] = Field(..., description="")
+    main_application_file: str = Field(
+        ...,
+        description="The main application file to be executed by the spark job. Relative path in case of git repository.",
+    )
+
+
 class SparkJobScalaEntrypoint(BaseModel):
     type: Literal["scala"] = Field(..., description="")
     main_application_file: str = Field(
@@ -1449,7 +1457,10 @@ class SparkJob(BaseModel):
         description="The image to use for driver and executors. Must have spark installed. Spark version must match the version in the image.",
     )
     entrypoint: Union[
-        SparkJobPythonEntrypoint, SparkJobScalaEntrypoint, SparkJobJavaEntrypoint
+        SparkJobPythonEntrypoint,
+        SparkJobScalaEntrypoint,
+        SparkJobJavaEntrypoint,
+        SparkJobPythonNotebookEntrypoint,
     ] = Field(..., description="")
     driver_config: SparkDriverConfig
     executor_config: SparkExecutorConfig

truefoundry/deploy/builder/builders/tfy_spark_buildpack/tfy_execute_notebook.py

@@ -31,6 +31,11 @@ def execute_notebook(notebook_path, output_path="/tmp/output.ipynb", parameters=
         parameters=parameters,
         # TODO(gw): Replace with kernel name for venv
         kernel_name="python3",
+        # Log cell by cell execution output
+        # TODO(gw): Output logs to a file instead, so that they aren't merged with the container's logs
+        log_output=True,
+        stdout_file=sys.stdout,
+        stderr_file=sys.stderr,
     )
     print(f"Successfully executed notebook: {notebook_path}")
 

truefoundry/deploy/python_deploy_codegen.py

@@ -2,12 +2,13 @@ import ast
 import io
 import json
 import re
-from typing import Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional
 
 from rich.console import Console
 from rich.pretty import pprint
 
 from truefoundry.deploy import Application, LocalSource
+from truefoundry.pydantic_v1 import BaseModel
 
 
 def generate_deployment_code(
@@ -16,7 +17,7 @@ def generate_deployment_code(
     spec_repr: str,
     workspace_fqn: str,
 ):
-    symbols = ",".join(symbols_to_import)
+    symbols = ", ".join(symbols_to_import)
     application_type = application_type.replace(" ", "").replace("-", "_")
     code = f"""\
 import logging
@@ -71,7 +72,7 @@ def remove_none_type_fields(code):
 
 def remove_type_field(code):
     lines = code.split("\n")
-    new_lines = [re.sub(r'^[ \t]*type=[\'"][^"]*[\'"],', "", line) for line in lines]
+    new_lines = [re.sub(r'^[ \t]*type=[\'"][^"]*[\'"],?', "", line) for line in lines]
     return "\n".join(new_lines)
 
 
@@ -102,7 +103,7 @@ def add_local_source_comment(code):
     return "\n".join(new_lines)
 
 
-def convert_deployment_config_to_python(workspace_fqn: str, application_spec: dict):
+def _convert_deployment_config_to_python(workspace_fqn: str, application_spec: dict):
     """
     Convert a deployment config to a python file that can be used to deploy to a workspace
     """
@@ -142,6 +143,49 @@ def convert_deployment_config_to_python(workspace_fqn: str, application_spec: di
     return generated_code
 
 
+def _default_exclude_fn(model: BaseModel, name: str) -> bool:
+    return False
+
+
+def convert_deployment_config_to_python(
+    workspace_fqn: str,
+    application_spec: Dict[str, Any],
+    exclude_fn: Callable[[BaseModel, str], bool] = _default_exclude_fn,
+    exclude_unset: bool = False,
+    exclude_defaults: bool = False,
+):
+    original_repr_args = BaseModel.__repr_args__
+
+    def _patched_repr_args(self: BaseModel):
+        _missing = object()
+        pairs = []
+        for name, value in original_repr_args(self):
+            if name is not None:
+                if exclude_fn(self, name):
+                    continue
+                if exclude_unset and name not in self.__fields_set__:
+                    continue
+                model_field = self.__fields__.get(name)
+                if model_field is None:
+                    continue
+                if (
+                    exclude_defaults
+                    and not getattr(model_field, "required", True)
+                    and getattr(model_field, "default", _missing) == value
+                ):
+                    continue
+            pairs.append((name, value))
+        return pairs
+
+    try:
+        BaseModel.__repr_args__ = _patched_repr_args
+        return _convert_deployment_config_to_python(
+            workspace_fqn=workspace_fqn, application_spec=application_spec
+        )
+    finally:
+        BaseModel.__repr_args__ = original_repr_args
+
+
 def generate_python_snippet_for_trigger_job(
     application_fqn: str, command: Optional[str], params: Optional[Dict[str, str]]
 ):

truefoundry/deploy/v2/lib/patched_models.py

@@ -520,3 +520,9 @@ class SparkJobPythonEntrypoint(models.SparkJobPythonEntrypoint, PatchedModelBase
 
 class SparkJobJavaEntrypoint(models.SparkJobJavaEntrypoint, PatchedModelBase):
     type: Literal["java"] = "java"
+
+
+class SparkJobPythonNotebookEntrypoint(
+    models.SparkJobPythonNotebookEntrypoint, PatchedModelBase
+):
+    type: Literal["python-notebook"] = "python-notebook"

{truefoundry-0.10.2rc1.dist-info → truefoundry-0.10.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.10.2rc1
+Version: 0.10.4
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1
@@ -30,7 +30,7 @@ Requires-Dist: requirements-parser<0.12.0,>=0.11.0
 Requires-Dist: rich-click<2.0.0,>=1.2.1
 Requires-Dist: rich<14.0.0,>=13.7.1
 Requires-Dist: tqdm<5.0.0,>=4.0.0
-Requires-Dist: truefoundry-sdk<0.2.0,>=0.1.1
+Requires-Dist: truefoundry-sdk<0.2.0,>=0.1.3
 Requires-Dist: typing-extensions>=4.0
 Requires-Dist: urllib3<3,>=1.26.18
 Requires-Dist: yq<4.0.0,>=3.1.0

{truefoundry-0.10.2rc1.dist-info → truefoundry-0.10.4.dist-info}/RECORD

@@ -5,7 +5,7 @@ truefoundry/pydantic_v1.py,sha256=jSuhGtz0Mbk1qYu8jJ1AcnIDK4oxUsdhALc4spqstmM,34
 truefoundry/version.py,sha256=bqiT4Q-VWrTC6P4qfK43mez-Ppf-smWfrl6DcwV7mrw,137
 truefoundry/_ask/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/_ask/cli.py,sha256=zPaDvxhX2dITmPTtut2Iu6WAIaizrwR-U_dDZ6xv2io,5814
-truefoundry/_ask/client.py,sha256=4vWO04jWbSF0XD3q8DwXjvL4HW-WBg7nsQ0DydNwHmM,18479
+truefoundry/_ask/client.py,sha256=QWQRiDwmtIlLaZsyGcLZaQstYFzpmJeCRdATMapjL-8,18740
 truefoundry/_ask/llm_utils.py,sha256=ayjz7JtVu142lrm8t0cVoxLxUpx76b71y8R62z_WurY,13537
 truefoundry/autodeploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/autodeploy/cli.py,sha256=9ZxKu_MGIpraMzaW4ZyuQZhlKIQYE3biBrBV4S1h6Fo,14167
@@ -37,7 +37,7 @@ truefoundry/cli/config.py,sha256=f7z0_gmYZiNImB7Bxz0AnOlrxY2X4lFnX4jYW1I7NHQ,139
 truefoundry/cli/console.py,sha256=9-dMy4YPisCJQziRKTg8Qa0UJnOGl1soiUnJjsnLDvE,242
 truefoundry/cli/const.py,sha256=dVHPo1uAiDSSMXwXoT2mR5kNQjExT98QNVRz98Hz_Ts,510
 truefoundry/cli/display_util.py,sha256=9vzN3mbQqU6OhS7qRUiMRana4PTHa4sDTA0Hn7OVjCI,3108
-truefoundry/cli/util.py,sha256=pezUfF2GC6ru7s8VeH2a7uvXTU0xN9ka7yLXkIgC3dY,4998
+truefoundry/cli/util.py,sha256=sSKFZ5wGkForoRIiKD2gFlMyj9D1iinzdjQtMYJx8oU,5015
 truefoundry/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/common/auth_service_client.py,sha256=N3YxKlx63r6cPZqbgb2lqBOPI69ShB7D7RCIq4FSCjc,7949
 truefoundry/common/constants.py,sha256=nWd3Je71WmHEORRUTCupZy5fWADqEFftjYP6wiYhCIc,4627
@@ -52,9 +52,9 @@ truefoundry/common/storage_provider_utils.py,sha256=yURhMw8k0FLFvaviRHDiifhvc6Gn
 truefoundry/common/types.py,sha256=BMJFCsR1lPJAw66IQBSvLyV4I6o_x5oj78gVsUa9si8,188
 truefoundry/common/utils.py,sha256=j3QP0uOsaGD_VmDDR68JTwoYE1okkAq6OqpVkzVf48Q,6424
 truefoundry/common/warnings.py,sha256=rs6BHwk7imQYedo07iwh3TWEOywAR3Lqhj0AY4khByg,504
-truefoundry/deploy/__init__.py,sha256=2GNbI8IGJBotz_IKaqQ-DWYWZn_pSu7lN7aId15Gk7Q,2799
-truefoundry/deploy/python_deploy_codegen.py,sha256=AainOFR20XvhNeztJkLPWGZ40lAT_nwc-ZmG77Kum4o,6525
-truefoundry/deploy/_autogen/models.py,sha256=xt-DuaRDx5jeRwyGoQH2yyPZAep9Q2MHFW9XBuRzG8E,73161
+truefoundry/deploy/__init__.py,sha256=PVbGPU9S3-dTFn5LvLwaEnfsp2RrGT9iiM7_15kOV84,2837
+truefoundry/deploy/python_deploy_codegen.py,sha256=k19_m5DGsUyjOUCSKwIVP8vDna2sq01tHABsUfoVpW4,8019
+truefoundry/deploy/_autogen/models.py,sha256=8j_y0Yp8k8Sjj7iVtZDHeuxq9kDvD0xI8-iFnbf0370,73571
 truefoundry/deploy/builder/__init__.py,sha256=kgvlkVkiWpMVdim81tIeLrdoACqrFDgwCqHdQVsCsMo,4988
 truefoundry/deploy/builder/constants.py,sha256=amUkHoHvVKzGv0v_knfiioRuKiJM0V0xW0diERgWiI0,508
 truefoundry/deploy/builder/docker_service.py,sha256=sm7GWeIqyrKaZpxskdLejZlsxcZnM3BTDJr6orvPN4E,3948
@@ -67,7 +67,7 @@ truefoundry/deploy/builder/builders/tfy_python_buildpack/__init__.py,sha256=_fjq
 truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py,sha256=f4l3fH21E2b8W3-JotMKc0AdPcCxV7LRPxxYJa7z_UQ,9134
 truefoundry/deploy/builder/builders/tfy_spark_buildpack/__init__.py,sha256=NEPlM6_vTVxp4ITa18B8DBbgYCn1q5d8be21lbgu5oY,2888
 truefoundry/deploy/builder/builders/tfy_spark_buildpack/dockerfile_template.py,sha256=dAmWgAHcNdBLSedpz18r5r7n9hdXKV-PB7yFPMdaoww,5990
-truefoundry/deploy/builder/builders/tfy_spark_buildpack/tfy_execute_notebook.py,sha256=Orib09GBfAwQukt5wV_jyxL-fw_dWsuIqQ5TyTST188,1738
+truefoundry/deploy/builder/builders/tfy_spark_buildpack/tfy_execute_notebook.py,sha256=PKJWNlW76dRw_XtFkRnqpzwBGuXU4w6_kIJkgoBmZ5Q,1975
 truefoundry/deploy/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/cli/commands/__init__.py,sha256=qv818jxqSAygJ3h-6Ul8t-5VOgR_UrSgsVtNCl3e5G0,1408
 truefoundry/deploy/cli/commands/apply_command.py,sha256=DmXmKVokkauyKIiJDtErTwbJ5_LvQeJbTQsG5BjyKpo,2427
@@ -117,7 +117,7 @@ truefoundry/deploy/v2/lib/deploy.py,sha256=HfSUdAS3gSpFAFtV0Mq9LscfpkaXqA2LHW4VX
 truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=G5BzMIbap8pgDX1eY-TITruUxQdkKhYtBmRwLL6lDeY,14342
 truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=mUi-OjPf7bc8rzfrPLdFb79LKuDq7F36RxL4V-AXebs,6830
 truefoundry/deploy/v2/lib/models.py,sha256=ogc1UYs1Z2nBdGSKCrde9sk8d0GxFKMkem99uqO5CmM,1148
-truefoundry/deploy/v2/lib/patched_models.py,sha256=VkfS7akbUzMA4q15lQUcAirdTsyVE1rfMeCmjXJC6Zk,15394
+truefoundry/deploy/v2/lib/patched_models.py,sha256=oNsOr5ojVn2XHjATD3VLuuO6w_ljDL99siHXy6y3Y0g,15558
 truefoundry/deploy/v2/lib/source.py,sha256=d6-8_6Zn5koBglqrBrY6ZLG_7yyPuLdyEmK4iZTw6xY,9405
 truefoundry/ml/__init__.py,sha256=EEEHV7w58Krpo_W9Chd8Y3TdItfFO3LI6j6Izqc4-P8,2219
 truefoundry/ml/constants.py,sha256=vDq72d4C9FSWqr9MMdjgTF4TuyNFApvo_6RVsSeAjB4,2837
@@ -381,7 +381,7 @@ truefoundry/workflow/remote_filesystem/__init__.py,sha256=LQ95ViEjJ7Ts4JcCGOxMPs
 truefoundry/workflow/remote_filesystem/logger.py,sha256=em2l7D6sw7xTLDP0kQSLpgfRRCLpN14Qw85TN7ujQcE,1022
 truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=xcT0wQmQlgzcj0nP3tJopyFSVWT1uv3nhiTIuwfXYeg,12342
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=nSGPZu0Gyd_jz0KsEE-7w_BmnTD8CVF1S8cUJoxaCbc,13305
-truefoundry-0.10.2rc1.dist-info/METADATA,sha256=bvv_QGYYNpuoOuzv6fiFP7NQDSgk3CYKlGa_UgfthNs,2508
-truefoundry-0.10.2rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.10.2rc1.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.10.2rc1.dist-info/RECORD,,
+truefoundry-0.10.4.dist-info/METADATA,sha256=WrMuchpPgh57vtJ90hAo2hLj6bkILIbkD0SWTzJ29I4,2505
+truefoundry-0.10.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.10.4.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.10.4.dist-info/RECORD,,