truefoundry 0.3.0rc14__tar.gz → 0.3.1__tar.gz

{truefoundry-0.3.0rc14 → truefoundry-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.3.0rc14
+Version: 0.3.1
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.3.0rc14 → truefoundry-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.3.0rc14"
+version = "0.3.1"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"

{truefoundry-0.3.0rc14 → truefoundry-0.3.1}/truefoundry/deploy/cli/util.py

@@ -1,12 +1,14 @@
 import functools
 import sys
 import zipfile
+from typing import Dict
 
 import rich_click as click
 from packaging.version import parse as parse_version
 from requests.exceptions import ConnectionError
 from rich.padding import Padding
 from rich.panel import Panel
+from rich.table import Table
 
 from truefoundry.deploy.cli.console import console
 from truefoundry.deploy.lib.exceptions import (
@@ -27,16 +29,29 @@ def handle_exception(exception):
     if is_debug_env_set():
         console.print_exception(show_locals=True)
     if isinstance(exception, BadRequestException):
-        print_error(
-            f"[cyan bold]status_code[/] {exception.status_code}\n"
-            f"[cyan bold]message[/]     {exception.message}"
+        print_dict_as_table_panel(
+            {"Status Code": str(exception.status_code), "Error": exception.message},
+            title="Command Failed",
+            border_style="red",
         )
     elif isinstance(exception, ConnectionError):
-        print_error("Couldn't connect to TrueFoundry.")
+        print_dict_as_table_panel(
+            {"Error": "Couldn't connect to TrueFoundry"},
+            title="Command Failed",
+            border_style="red",
+        )
     elif isinstance(exception, ConfigurationException):
-        print_error(f"[cyan bold]message[/]     {exception.message}")
+        print_dict_as_table_panel(
+            {"Error": exception.message},
+            title="Command Failed",
+            border_style="red",
+        )
     else:
-        console.print(f"[red][bold]Error:[/] {str(exception)}[/]")
+        print_dict_as_table_panel(
+            {"Error": str(exception)},
+            title="Command Failed",
+            border_style="red",
+        )
 
 
 def handle_exception_wrapper(fn):
@@ -77,6 +92,28 @@ def print_message(message):
     )
 
 
+def print_dict_as_table_panel(
+    dct: Dict[str, str],
+    title: str,
+    border_style: str = "cyan",
+    key_color: str = "cyan",
+):
+    table = Table(show_header=False, box=None)
+    table.add_column("Key", style=f"bold {key_color}", width=15)
+    table.add_column("Value")
+    for key, value in dct.items():
+        table.add_row(key, value)
+    console.print(
+        Panel(
+            table,
+            border_style=border_style,
+            title=title,
+            title_align="left",
+            width=click.rich_click.MAX_WIDTH,
+        )
+    )
+
+
 def unzip_package(path_to_package, destination):
     with zipfile.ZipFile(path_to_package, "r") as zip_ref:
         zip_ref.extractall(destination)

{truefoundry-0.3.0rc14 → truefoundry-0.3.1}/truefoundry/deploy/lib/exceptions.py

@@ -1,6 +1,9 @@
+from typing import Optional
+
+
 class BadRequestException(Exception):
-    def __init__(self, status_code, message=None):
-        super(BadRequestException, self).__init__()
+    def __init__(self, status_code: int, message: Optional[str] = None):
+        super().__init__()
         self.status_code = status_code
         self.message = message
 
@@ -12,8 +15,8 @@ class BadRequestException(Exception):
 
 
 class ConfigurationException(Exception):
-    def __init__(self, message=None):
-        super(ConfigurationException, self).__init__()
+    def __init__(self, message: Optional[str] = None):
+        super().__init__()
         self.message = message
 
     def __str__(self):

{truefoundry-0.3.0rc14 → truefoundry-0.3.1}/truefoundry/deploy/v2/lib/deploy.py

@@ -247,9 +247,16 @@ def deploy_component(
     )
     component.workspace_fqn = workspace_fqn
     workspace_id = get_workspace_by_fqn(workspace_fqn).id
-    updated_component = _handle_if_local_source(
-        component=component, workspace_fqn=workspace_fqn
-    )
+    if isinstance(component, auto_gen_models.ApplicationSet):
+        updated_component = component.copy(deep=True)
+        for i in range(len(updated_component.components)):
+            updated_component.components[i] = _handle_if_local_source(
+                component=component.components[i], workspace_fqn=workspace_fqn
+            )
+    else:
+        updated_component = _handle_if_local_source(
+            component=component, workspace_fqn=workspace_fqn
+        )
     client = ServiceFoundryServiceClient()
     response = client.deploy_application(
         workspace_id=workspace_id, application=updated_component