truefoundry 0.10.6__py3-none-any.whl → 0.10.7__py3-none-any.whl

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/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/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/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/version.py

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

{truefoundry-0.10.6.dist-info → truefoundry-0.10.7.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ truefoundry/__init__.py,sha256=z9iNNI3mqVWkvzBXMRu096jXaYloYSN6rnlTbfmKcJE,1056
 truefoundry/_client.py,sha256=Y3qHi_Lg4Sx6GNvsjAHIoAfFr8PJnqgCrXmpNAI3ECg,1417
 truefoundry/logger.py,sha256=u-YCNjg5HBwE70uQcpjIG64Ghos-K2ulTWaxC03BSj4,714
 truefoundry/pydantic_v1.py,sha256=jSuhGtz0Mbk1qYu8jJ1AcnIDK4oxUsdhALc4spqstmM,345
-truefoundry/version.py,sha256=bqiT4Q-VWrTC6P4qfK43mez-Ppf-smWfrl6DcwV7mrw,137
+truefoundry/version.py,sha256=xaf13PCnuYzw9j8IqtCn6XVEVbgBba6sLn_u_NLFfrs,214
 truefoundry/_ask/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/_ask/cli.py,sha256=RDi1lwbUMYw0CnvaYG4o6o1phmnKjuggdQ5I8sllTlA,5812
 truefoundry/_ask/client.py,sha256=QWQRiDwmtIlLaZsyGcLZaQstYFzpmJeCRdATMapjL-8,18740
@@ -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=sSKFZ5wGkForoRIiKD2gFlMyj9D1iinzdjQtMYJx8oU,5015
+truefoundry/cli/util.py,sha256=kEjC20-n_jwxZV9jq-78CxDk4xAySxAoYIXTxZfJzLM,5423
 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
@@ -78,7 +78,7 @@ truefoundry/deploy/cli/commands/deploy_init_command.py,sha256=g-jBfrEmhZ0TDWsyqP
 truefoundry/deploy/cli/commands/get_command.py,sha256=bR8tAjQQhimzaTQ57L6BPJwcxQ_SGWCF5CqHDpxgG90,837
 truefoundry/deploy/cli/commands/k8s_exec_credential_command.py,sha256=EknpdufMAEnjSGMG7a-Jj7tkoiS5zmbJRREafb14Alw,2160
 truefoundry/deploy/cli/commands/kubeconfig_command.py,sha256=WTYCv_itwUb6kwlsGkq3hwn5i-Gjd7cVrbBhoLZDnJI,3146
-truefoundry/deploy/cli/commands/login_command.py,sha256=kbEs4leyMYK2kz7L9ql2PXVgLVmCYo-LWtnntVVYLFY,1065
+truefoundry/deploy/cli/commands/login_command.py,sha256=GdFrH2zgFFrSZi35p6MPDkQi4h4ScYX5UqDnyhe1cLg,1063
 truefoundry/deploy/cli/commands/logout_command.py,sha256=u3kfrEp0ETbrz40KjD4GCC3XEZ5YRAlrca_Df4U_mk0,536
 truefoundry/deploy/cli/commands/logs_command.py,sha256=osl2z5VaIceB9sYa6GtwsuyAPZKcw-A0oVEt3g1f62Q,4140
 truefoundry/deploy/cli/commands/patch_application_command.py,sha256=aRTHu2OmxQd7j9iE0RavsFCkCILp0rGh4DJO51Oij5I,2591
@@ -95,7 +95,7 @@ truefoundry/deploy/io/output_callback.py,sha256=_q79-dpFxnU762VPM9Ryy2gnuJnIotZ2
 truefoundry/deploy/io/rich_output_callback.py,sha256=m99RodkILXCgy_LJujEcojbpW1tL0H5Fjb0lqe6X_PQ,958
 truefoundry/deploy/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/const.py,sha256=Wg0GDnfFu-g1fJr4lU80NH2ULw0R0dYjV7LnW-PbOeM,173
-truefoundry/deploy/lib/diff_utils.py,sha256=SszFgzBQ7GPwpgJKWjLDT-IQ_AcMB9mW8OP27Uj37HE,2627
+truefoundry/deploy/lib/diff_utils.py,sha256=J1sAf5O4rHNHS_MOkcB0CyaeQFtU_ALI-wd--g8ZDZA,3417
 truefoundry/deploy/lib/logs_utils.py,sha256=SQxRv3jDDmgHdOUMhlMaAPGYskybnBUMpst7QU_i_sc,1469
 truefoundry/deploy/lib/messages.py,sha256=8424kj3kqCyDCX5Nr2WJZZ_UEutPoaSs_y2f9-O4yy8,1001
 truefoundry/deploy/lib/session.py,sha256=fLdgR6ZDp8-hFl5NTON4ngnWLsMzGxvKtfpDOOw_7lo,4963
@@ -113,7 +113,7 @@ truefoundry/deploy/lib/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 truefoundry/deploy/lib/model/entity.py,sha256=eBfA4trO0jUuDy0wifiu2rB_HryZrx5Kf-tRMwIQ_9g,8716
 truefoundry/deploy/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/v2/lib/__init__.py,sha256=WEiVMZXOVljzEE3tpGJil14liIn_PCDoACJ6b3tZ6sI,188
-truefoundry/deploy/v2/lib/deploy.py,sha256=HfSUdAS3gSpFAFtV0Mq9LscfpkaXqA2LHW4VXqk9Y0g,12707
+truefoundry/deploy/v2/lib/deploy.py,sha256=Ltm7cpIW14IbmEsR3EAIeWQUch2Z6HLej7heuFLRAnE,12711
 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
@@ -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.6.dist-info/METADATA,sha256=CN96HcoQd_5lWHozK46eDlDnN1l_ZIrTXHHKwHS8eKc,2505
-truefoundry-0.10.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.10.6.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.10.6.dist-info/RECORD,,
+truefoundry-0.10.7.dist-info/METADATA,sha256=11sG5XlP_FSog6uFEZ2yMAPOPrByJLBn8H9L_RIvW3A,2505
+truefoundry-0.10.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.10.7.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.10.7.dist-info/RECORD,,