truefoundry 0.10.6__tar.gz → 0.10.7__tar.gz

{truefoundry-0.10.6 → truefoundry-0.10.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.10.6
+Version: 0.10.7
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1

{truefoundry-0.10.6 → truefoundry-0.10.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.10.6"  # This is a placeholder version, it will be replaced when releasing
+version = "0.10.7"  # 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" }]

{truefoundry-0.10.6 → truefoundry-0.10.7}/truefoundry/cli/util.py

@@ -7,6 +7,7 @@ import questionary
 import rich_click as click
 from packaging.version import parse as parse_version
 from requests.exceptions import ConnectionError, Timeout
+from rich.markup import escape
 from rich.padding import Padding
 from rich.panel import Panel
 from rich.table import Table
@@ -15,6 +16,14 @@ from truefoundry.cli.config import CliConfig
 from truefoundry.cli.console import console
 from truefoundry.common.exceptions import HttpRequestException
 
+try:
+    import importlib.metadata as importlib_metadata
+except ImportError:
+    import importlib_metadata
+
+
+_CLICK_VERSION = None
+
 
 def setup_rich_click():
     click.rich_click.STYLE_ERRORS_SUGGESTION = "blue italic"
@@ -28,7 +37,10 @@ def handle_exception(exception):
         console.print_exception(show_locals=True)
     if isinstance(exception, HttpRequestException):
         print_dict_as_table_panel(
-            {"Status Code": str(exception.status_code), "Error": exception.message},
+            {
+                "Status Code": str(exception.status_code),
+                "Error": escape(exception.message),
+            },
             title="Command Failed",
             border_style="red",
         )
@@ -57,7 +69,7 @@ def handle_exception(exception):
         console.print_exception(show_locals=False, max_frames=1)
     else:
         print_dict_as_table_panel(
-            {"Error": str(exception)},
+            {"Error": escape(str(exception))},
             title="Command Failed",
             border_style="red",
         )
@@ -128,11 +140,17 @@ def unzip_package(path_to_package, destination):
         zip_ref.extractall(destination)
 
 
-def _prompt_if_no_value_and_supported(prompt: str, hide_input: bool = True):
-    import click as _click
-
+def prompt_if_no_value_and_supported(prompt: str, hide_input: bool = True):
+    global _CLICK_VERSION
     kwargs = {}
-    if parse_version(_click.__version__).major >= 8:
+
+    if _CLICK_VERSION is None:
+        try:
+            _CLICK_VERSION = parse_version(importlib_metadata.version("click"))
+        except Exception:
+            _CLICK_VERSION = parse_version("0.0.0")
+
+    if _CLICK_VERSION.major >= 8:
         kwargs = {"prompt": prompt, "hide_input": hide_input, "prompt_required": False}
 
     return kwargs

{truefoundry-0.10.6 → truefoundry-0.10.7}/truefoundry/deploy/cli/commands/login_command.py

@@ -2,8 +2,8 @@ import rich_click as click
 
 from truefoundry.cli.const import COMMAND_CLS
 from truefoundry.cli.util import (
-    _prompt_if_no_value_and_supported,
     handle_exception_wrapper,
+    prompt_if_no_value_and_supported,
 )
 from truefoundry.common.constants import TFY_HOST_ENV_KEY
 from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
@@ -24,7 +24,7 @@ from truefoundry.deploy.lib.session import login
     "--api_key",
     type=click.STRING,
     default=None,
-    **_prompt_if_no_value_and_supported(prompt="API Key", hide_input=True),
+    **prompt_if_no_value_and_supported(prompt="API Key", hide_input=True),
 )
 @handle_exception_wrapper
 def login_command(relogin: bool, host: str, api_key: str):

{truefoundry-0.10.6 → truefoundry-0.10.7}/truefoundry/deploy/lib/diff_utils.py

@@ -1,3 +1,4 @@
+import copy
 import difflib
 from typing import Any, Dict, Optional
 
@@ -7,6 +8,25 @@ from rich.markdown import Markdown
 from rich.panel import Panel
 
 
+def _normalize_manifest_for_diff(obj: Any) -> Any:
+    """
+    Normalize a manifest object for consistent diffing.
+    Only sorts the 'integrations' field by name
+    """
+    if isinstance(obj, dict):
+        _type = obj.get("type") or ""
+        integrations = obj.get("integrations")
+        if (
+            _type.startswith("provider-account/")
+            and isinstance(integrations, list)
+            and all(isinstance(item, dict) and "name" in item for item in integrations)
+        ):
+            result = copy.deepcopy(obj)
+            result["integrations"] = sorted(integrations, key=lambda x: x["name"])
+            return result
+    return obj
+
+
 def format_manifest_for_diff(manifest: Dict[str, Any]) -> str:
     """
     Format a manifest for diffing with consistent formatting.
@@ -17,7 +37,9 @@ def format_manifest_for_diff(manifest: Dict[str, Any]) -> str:
     Returns:
         A consistently formatted YAML string suitable for diffing
     """
-    return yaml.dump(manifest, sort_keys=True, indent=2)
+    # Normalize the manifest for diffing
+    normalized_manifest = _normalize_manifest_for_diff(manifest)
+    return yaml.dump(normalized_manifest, sort_keys=True, indent=2)
 
 
 def generate_manifest_diff(

{truefoundry-0.10.6 → truefoundry-0.10.7}/truefoundry/deploy/v2/lib/deploy.py

@@ -200,7 +200,7 @@ def _deploy_wait_handler(  # noqa: C901
             time_elapsed = time.monotonic() - start_time
             if time_elapsed > total_timeout_time:
                 logger.warning(
-                    "Polled server for %s secs. Disconnecting from server, the deployment will still continue.",
+                    "Polled build logs for %s secs. Disconnecting from server, the deployment will still continue.",
                     int(time_elapsed),
                 )
                 if socket and socket.connected:

truefoundry-0.10.7/truefoundry/version.py

@@ -0,0 +1,9 @@
+try:
+    import importlib.metadata as importlib_metadata
+except ImportError:
+    import importlib_metadata
+
+try:
+    __version__ = importlib_metadata.version("truefoundry")
+except Exception:
+    __version__ = "NA"

truefoundry-0.10.6/truefoundry/version.py

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