Update app.py

app.py

@@ -202,16 +202,9 @@ def _(client_instantiation_form, os):
 def client_instantiation(
     APIClient,
     Credentials,
-    client,
-    client_key,
-    client_options,
-    client_selector,
     client_setup,
-    get_key_by_value,
-    mo,
     project_id,
     space_id,
-    wrap_with_spaces,
     wx_api_key,
     wx_url,
 ):
@@ -219,57 +212,77 @@ def client_instantiation(
     if client_setup:
         try:
             wx_credentials = Credentials(url=wx_url, api_key=wx_api_key)
-
             project_client = (
                 APIClient(credentials=wx_credentials, project_id=project_id)
                 if project_id
                 else None
             )
-
             deployment_client = (
                 APIClient(credentials=wx_credentials, space_id=space_id)
                 if space_id
                 else None
             )
+            instantiation_success = True
+            instantiation_error = None
+        except Exception as e:
+            instantiation_success = False
+            instantiation_error = str(e)
+            wx_credentials = project_client = deployment_client = None
+    else:
+        wx_credentials = project_client = deployment_client = None
+        instantiation_success = None
+        instantiation_error = None
+    
+    return (
+        deployment_client,
+        instantiation_error,
+        instantiation_success,
+        project_client,
+    )
+
+@app.cell
+def _(client_callout_kind, client_instantiation_form, client_status, mo):
+    client_callout = mo.callout(client_status, kind=client_callout_kind)
+
+    client_section = mo.hstack([client_instantiation_form, client_callout], align="center", justify="space-around")
+    return (client_section,)
 
-            active_client_name = get_key_by_value(client_options, client_key)
+def _(
+    client,
+    client_key,
+    client_options,
+    client_selector,
+    client_setup,
+    get_key_by_value,
+    instantiation_error,
+    instantiation_success,
+    mo,
+    wrap_with_spaces,
+):
+    active_client_name = get_key_by_value(client_options, client_key)
+    
+    if client_setup:
+        if instantiation_success:
             client_status = mo.md(
                 f"### ✅ Client Instantiation Successful ✅\n\n"
                 f"{client_selector}\n\n"
                 f"**Active Client:**{wrap_with_spaces(active_client_name, prefix_spaces=5)}"
             )
             client_callout_kind = "success"
-
-        except Exception as e:
-            error_message = str(e)
+        else:
             client_status = mo.md(
-                f"### ❌ Client Instantiation Failed\n**Error:** {error_message}\n\nCheck your region selection and credentials"
+                f"### ❌ Client Instantiation Failed\n**Error:** {instantiation_error}\n\nCheck your region selection and credentials"
             )
             client_callout_kind = "danger"
-            wx_credentials = project_client = deployment_client = None
     else:
-        wx_credentials = project_client = deployment_client = None
-        active_client_name = get_key_by_value(client_options, client_key)
         client_status = mo.md(
             f"### Client Instantiation Status will turn Green When Ready\n\n"
             f"{client_selector}\n\n"
             f"**Active Client:**{wrap_with_spaces(active_client_name, prefix_spaces=5)}"
         )
         client_callout_kind = "neutral"
-
-    return (
-        client_callout_kind,
-        client_status,
-        deployment_client,
-        project_client,
-    )
-
-@app.cell
-def _(client_callout_kind, client_instantiation_form, client_status, mo):
-    client_callout = mo.callout(client_status, kind=client_callout_kind)
-
-    client_section = mo.hstack([client_instantiation_form, client_callout], align="center", justify="space-around")
-    return (client_section,)
+    
+    return active_client_name, client_callout_kind, client_status
 
 
 @app.cell