solace-agent-mesh 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

solace_agent_mesh/cli/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.7"
+__version__ = "1.0.9"

solace_agent_mesh/cli/commands/add_cmd/web_add_agent_step.py

@@ -3,7 +3,8 @@ import multiprocessing
 import sys
 import webbrowser
 from pathlib import Path
-from time import sleep
+from cli.utils import wait_for_server
+
 
 from config_portal.backend.server import run_flask
 
@@ -31,9 +32,17 @@ def launch_add_agent_web_portal(cli_options: dict):
                 fg="green",
             )
         )
-        sleep(1)
         try:
-            webbrowser.open(portal_url)
+            if wait_for_server(portal_url):
+                click.echo(
+                    click.style(
+                        f"Opening your browser to '{portal_url}'...",
+                        fg="green",
+                    )
+                )
+                webbrowser.open(portal_url)
+            else:
+                raise TimeoutError("Server did not start in time.")
         except Exception:
             click.echo(
                 click.style(

solace_agent_mesh/cli/commands/add_cmd/web_add_gateway_step.py

@@ -2,7 +2,8 @@ import click
 import multiprocessing
 import webbrowser
 from pathlib import Path
-from time import sleep
+from cli.utils import wait_for_server
+
 
 from config_portal.backend.server import run_flask
 
@@ -40,22 +41,17 @@ def launch_add_gateway_web_portal(cli_options: dict):
                 fg="cyan",
             )
         )
-        sleep(2)
         try:
-            if not add_gateway_gui_process.is_alive():
+            if wait_for_server(portal_url):
                 click.echo(
-                    click.style("Web server failed to start.", fg="red"), err=True
-                )
-                add_gateway_gui_process.join(timeout=1)
-                return None
-
-            click.echo(
-                click.style(
-                    f"Opening your browser to '{portal_url}'...",
-                    fg="green",
+                    click.style(
+                        f"Opening your browser to '{portal_url}'...",
+                        fg="green",
+                    )
                 )
-            )
-            webbrowser.open(portal_url)
+                webbrowser.open(portal_url)
+            else:
+                raise TimeoutError("Server did not start in time.")
         except Exception as e:
             click.echo(
                 click.style(

solace_agent_mesh/cli/commands/init_cmd/web_init_step.py

@@ -1,9 +1,9 @@
 import click
 import multiprocessing
-from time import sleep
 import sys
 import webbrowser
-import requests
+from ...utils import wait_for_server
+
 
 try:
     from config_portal.backend.server import run_flask
@@ -19,19 +19,6 @@ except ImportError as e:
     sys.exit(1)
 
 
-def wait_for_server(url, timeout=30):
-    start = 0
-    while start < timeout:
-        try:
-            r = requests.get(url)
-            if r.status_code == 200:
-                return True
-        except Exception:
-            pass
-        sleep(0.5)
-        start += 0.5
-    return False
-
 
 def perform_web_init(current_cli_params: dict) -> dict:
     """

solace_agent_mesh/cli/commands/plugin_cmd/catalog_cmd.py

@@ -4,7 +4,8 @@ import webbrowser
 import os
 import time
 from pathlib import Path
-from cli.utils import error_exit
+from cli.utils import error_exit, wait_for_server
+
 
 config_portal_host = "CONFIG_PORTAL_HOST"
 
@@ -108,7 +109,10 @@ def catalog(port: int, installer_command: str):
         click.echo(f"Opening Plugin Catalog at: {portal_url}")
 
         try:
-            webbrowser.open(portal_url)
+            if wait_for_server(portal_url):
+                webbrowser.open(portal_url)
+            else:
+                raise TimeoutError("Server did not start in time.")
         except Exception:
             click.echo(
                 click.style(

solace_agent_mesh/cli/utils.py

@@ -3,6 +3,8 @@ from pathlib import Path
 import importlib
 import click
 import re
+import requests
+from time import sleep
 
 
 def ask_yes_no_question(question: str, default=False) -> bool:
@@ -189,3 +191,16 @@ def indent_multiline_string(
         )
     else:
         return "\n".join(indentation + line for line in text.splitlines()).lstrip()
+
+def wait_for_server(url, timeout=30):
+    start = 0
+    while start < timeout:
+        try:
+            r = requests.get(url)
+            if r.status_code == 200:
+                return True
+        except Exception:
+            pass
+        sleep(0.5)
+        start += 0.5
+    return False

solace_agent_mesh/client/webui/frontend/static/assets/{authCallback-DvlO62me.js → authCallback-BmF2l6vg.js}

@@ -1 +1 @@
-import{r,j as s,d as a}from"./client-bp6u3qVZ.js";function c(){return r.useEffect(()=>{const n=window.location.hash.substring(1),e=new URLSearchParams(n),o=e.get("access_token"),t=e.get("refresh_token");o?(localStorage.setItem("access_token",o),t&&localStorage.setItem("refresh_token",t),window.location.href="/"):console.error("AuthCallback: No access token found in URL hash.")},[]),s.jsx("div",{children:"Loading..."})}a.createRoot(document.getElementById("root")).render(s.jsx(c,{}));
+import{r,j as s,d as a}from"./client-D881Dttc.js";function c(){return r.useEffect(()=>{const n=window.location.hash.substring(1),e=new URLSearchParams(n),o=e.get("access_token"),t=e.get("refresh_token");o?(localStorage.setItem("access_token",o),t&&localStorage.setItem("refresh_token",t),window.location.href="/"):console.error("AuthCallback: No access token found in URL hash.")},[]),s.jsx("div",{children:"Loading..."})}a.createRoot(document.getElementById("root")).render(s.jsx(c,{}));