Update visualizer_app.py

visualizer_app.py

@@ -70,94 +70,94 @@ with app.setup:
 
 @app.cell
 def client_variables(client_instantiation_form):
-    if client_instantiation_form.value:
-        client_setup = client_instantiation_form.value
-    else:
-        client_setup = None
-
+    client_setup = client_instantiation_form.value or None
+    
     ### Extract Credential Variables:
-    if client_setup is not None:
-        wx_url = client_setup["wx_region"]
-        wx_api_key = client_setup["wx_api_key"].strip()
-        os.environ["WATSONX_APIKEY"] = wx_api_key
-
-        if client_setup["project_id"] is not None:
-            project_id = client_setup["project_id"].strip()
-        else:
-            project_id = None
-
-        if client_setup["space_id"] is not None:
-            space_id = client_setup["space_id"].strip()
-        else:
-            space_id = None
-
+    if client_setup:
+        wx_url = client_setup["wx_region"] if if client_setup["wx_region"] else "EU"
+        wx_api_key = client_setup["wx_api_key"].strip() if client_setup["wx_api_key"] else None
+        os.environ["WATSONX_APIKEY"] = wx_api_key or ""
+        
+        project_id = client_setup["project_id"].strip() if client_setup["project_id"] else None
+        space_id = client_setup["space_id"].strip() if client_setup["space_id"] else None
     else:
         os.environ["WATSONX_APIKEY"] = ""
-        project_id = None
-        space_id = None
-        wx_api_key = None
-        wx_url = None
+        project_id = space_id = wx_api_key = wx_url = None
+        
     return client_setup, project_id, space_id, wx_api_key, wx_url
 
 
-@app.cell
-def _(client_setup, wx_api_key):
-    if client_setup:
-        token = get_iam_token(wx_api_key)
-    else:
-        token = None
-    return
+# @app.cell
+# def _(client_setup, wx_api_key):
+#     if client_setup:
+#         token = get_iam_token(wx_api_key)
+#     else:
+#         token = None
+#     return
 
 @app.cell
 def _():
-    baked_in_creds = {
-            "api_key": os.environ.get("WX_APIKEY"),
-            "project_id": os.environ.get("WX_PROJECT_ID"),
-            "space_id": "",
-        }
-    return baked_in_creds
+    from baked_in_credentials.creds import credentials
+    return credentials
 
 
 @app.cell
 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,
 ):
     ### Instantiate the watsonx.ai client
     if client_setup:
         try:
-            wx_credentials = Credentials(
-                url=wx_url,
-                api_key=wx_api_key
+            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
             )
-    
-            if project_id:
-                project_client = APIClient(credentials=wx_credentials, project_id=project_id)
-            else:
-                project_client = None
-    
-            if space_id:
-                deployment_client = APIClient(credentials=wx_credentials, space_id=space_id)
-            else:
-                deployment_client = None
 
-            client_status = mo.md("### ✅ Client Instantiation Successful ✅")
+            active_client_name = get_key_by_value(client_options, client_key)
+            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)
-            client_status = mo.md(f"### ❌ Client Instantiation Failed\n**Error:** {error_message}\n\nCheck your region selection and credentials")
+            client_status = mo.md(
+                f"### ❌ Client Instantiation Failed\n**Error:** {error_message}\n\nCheck your region selection and credentials"
+            )
             client_callout_kind = "danger"
-            project_client = None
-            deployment_client = None            
+            wx_credentials = project_client = deployment_client = None
     else:
-        wx_credentials = None
-        project_client = None
-        deployment_client = None
-        client_status = mo.md("### This box will turn Green if client instantiation is successful")
+        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 (
@@ -366,7 +366,7 @@ def client_instantiation_form():
         "AU": "https://au-syd.ml.cloud.ibm.com",
         "CA": "https://ca-tor.ml.cloud.ibm.com"
     }
-
+    baked_in_creds = credentials
     # Create a form with multiple elements
     client_instantiation_form = (
         mo.md('''
@@ -384,13 +384,30 @@ def client_instantiation_form():
         > If you provide both you can switch the active one in the dropdown.
     ''')
         .batch(
-            wx_region = mo.ui.dropdown(regions, label="Select your watsonx.ai region:", value="EU", searchable=True),
-            wx_api_key = mo.ui.text(placeholder="Add your IBM Cloud api-key...", label="IBM Cloud Api-key:", 
-                                    kind="password", value=get_cred_value('api_key', creds_var_name='baked_in_creds')),
-            project_id = mo.ui.text(placeholder="Add your watsonx.ai project_id...", label="Project_ID:", 
-                                    kind="password", value=get_cred_value('project_id', creds_var_name='baked_in_creds')),
-            space_id = mo.ui.text(placeholder="Add your watsonx.ai space_id...", label="Space_ID:", 
-                                  kind="password", value=get_cred_value('space_id', creds_var_name='baked_in_creds'))
+            wx_region = mo.ui.dropdown(
+                wx_regions, 
+                label="Select your watsonx.ai region:", 
+                value=get_cred_value('region', creds_var_name='baked_in_creds'),
+                searchable=True
+            ),
+            wx_api_key = mo.ui.text(
+                placeholder="Add your IBM Cloud api-key...", 
+                label="IBM Cloud Api-key:", 
+                kind="password", 
+                value=get_cred_value('api_key', creds_var_name='baked_in_creds')
+            ),
+            project_id = mo.ui.text(
+                placeholder="Add your watsonx.ai project_id...", 
+                label="Project_ID:", 
+                kind="text", 
+                value=get_cred_value('project_id', creds_var_name='baked_in_creds')
+            ),
+            space_id = mo.ui.text(
+                placeholder="Add your watsonx.ai space_id...", 
+                label="Space_ID:", 
+                kind="text",
+                value=get_cred_value('space_id', creds_var_name='baked_in_creds')
+            )
         ,)
         .form(show_clear_button=True, bordered=False)
     )