truefoundry 0.10.2rc1__tar.gz → 0.10.4__tar.gz

{truefoundry-0.10.2rc1 → truefoundry-0.10.4}/PKG-INFO

@@ -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 → truefoundry-0.10.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.10.2rc1"  # This is a placeholder version, it will be replaced when releasing
+version = "0.10.4"  # This is a placeholder version, it will be replaced when releasing
 requires-python = ">=3.8.1,<3.14"
 description = "TrueFoundry CLI"
 authors = [{ name = "TrueFoundry Team", email = "abhishek@truefoundry.com" }]
@@ -31,7 +31,7 @@ dependencies = [
   "rich-click>=1.2.1,<2.0.0",
   "rich>=13.7.1,<14.0.0",
   "tqdm>=4.0.0,<5.0.0",
-  "truefoundry-sdk>=0.1.1,<0.2.0",
+  "truefoundry-sdk>=0.1.3,<0.2.0",
   "typing-extensions>=4.0",
   "urllib3>=1.26.18,<3",
   "yq>=3.1.0,<4.0.0",

{truefoundry-0.10.2rc1 → truefoundry-0.10.4}/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-0.10.2rc1 → truefoundry-0.10.4}/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-0.10.2rc1 → truefoundry-0.10.4}/truefoundry/deploy/__init__.py

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

{truefoundry-0.10.2rc1 → truefoundry-0.10.4}/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-0.10.2rc1 → truefoundry-0.10.4}/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-0.10.2rc1 → truefoundry-0.10.4}/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-0.10.2rc1 → truefoundry-0.10.4}/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"