synapse-sdk 1.0.0a98__py3-none-any.whl → 1.0.0b2__py3-none-any.whl

synapse_sdk/cli/devtools.py

@@ -1,5 +1,7 @@
 import os
+import subprocess
 import sys
+import time
 
 import click
 
@@ -14,10 +16,10 @@ def devtools(host, port, debug):
     """Start the Synapse devtools web interface"""
 
     try:
-        from synapse_sdk.devtools.config import get_server_config
-        from synapse_sdk.devtools.server import create_devtools_server
-        from synapse_sdk.devtools.utils import find_available_port, is_port_available
+        import importlib.util
 
+        if not importlib.util.find_spec('streamlit') or not importlib.util.find_spec('streamlit_ace'):
+            raise ImportError('Missing dependencies')
     except ImportError:
         click.echo(
             click.style(
@@ -25,46 +27,64 @@ def devtools(host, port, debug):
             ),
             err=True,
         )
+        click.echo(
+            click.style(_('Specifically, you need: pip install streamlit streamlit-ace'), fg='yellow'),
+            err=True,
+        )
+        sys.exit(1)
+
+    click.echo('Starting Synapse DevTools...')
+
+    # Get the path to the streamlit app
+    from pathlib import Path
+
+    app_path = Path(__file__).parent.parent / 'devtools' / 'streamlit_app.py'
+
+    if not app_path.exists():
+        click.echo(click.style(f'Streamlit app not found at {app_path}', fg='red'), err=True)
         sys.exit(1)
 
-    click.echo('Building assets...')
-    from synapse_sdk.cli import build_frontend
+    # Build streamlit command
+    cmd = ['streamlit', 'run', str(app_path)]
 
-    if not build_frontend():
-        click.echo(click.style('Build failed, continuing with existing assets...', fg='yellow'))
+    # Add host and port if specified
+    if host:
+        cmd.extend(['--server.address', host])
+    else:
+        cmd.extend(['--server.address', '0.0.0.0'])
+
+    if port:
+        cmd.extend(['--server.port', str(port)])
+    else:
+        cmd.extend(['--server.port', '8080'])  # Default port
+
+    cmd.extend(['--server.headless', 'false'])
 
     if debug:
-        click.echo(_('Starting devtools in debug mode...'))
-        os.environ['UVICORN_LOG_LEVEL'] = 'debug'
-
-    click.echo('Starting Synapse Devtools...')
-
-    # Get server configuration from config file
-    server_config = get_server_config()
-
-    # Use CLI arguments if provided, otherwise use config defaults
-    final_host = host if host is not None else server_config['host']
-    final_port = port if port is not None else server_config['port']
-
-    # Check if the port is available, fallback to next available port if not
-    if not is_port_available(final_host, final_port):
-        try:
-            fallback_port = find_available_port(final_host, final_port + 1)
-            click.echo(click.style(f'Port {final_port} is in use, falling back to port {fallback_port}', fg='yellow'))
-            final_port = fallback_port
-        except RuntimeError as e:
-            click.echo(click.style(f'Failed to find available port: {e}', fg='red'), err=True)
-            sys.exit(1)
-
-    # Create and start the devtools server
-    # Pass the current working directory as the plugin directory
+        cmd.extend(['--logger.level', 'debug'])
+    else:
+        cmd.extend(['--logger.level', 'error'])
+
+    # Set working directory to current directory (plugin directory)
     plugin_directory = os.getcwd()
-    server = create_devtools_server(host=final_host, port=final_port, plugin_directory=plugin_directory)
 
     try:
-        server.start_server()
+        # Add a small delay to ensure clean output
+        time.sleep(0.5)
+
+        # Start streamlit
+        process = subprocess.Popen(cmd, cwd=plugin_directory, env=os.environ.copy())
+
+        click.echo('Press Ctrl+C to stop')
+
+        # Wait for process
+        process.wait()
+
     except KeyboardInterrupt:
-        click.echo(_('\nDevtools stopped.'))
+        click.echo(_('\nDevTools stopped.'))
+        if process:
+            process.terminate()
+            process.wait()
     except Exception as e:
         click.echo(click.style(f'Failed to start devtools: {e}', fg='red'), err=True)
         sys.exit(1)

synapse_sdk/clients/base.py

@@ -1,5 +1,4 @@
 import json
-import os
 from pathlib import Path
 
 import requests
@@ -16,7 +15,7 @@ class BaseClient:
     page_size = 100
 
     def __init__(self, base_url, timeout=None):
-        self.base_url = base_url
+        self.base_url = base_url.rstrip('/')
         # Set reasonable default timeouts for better UX
         self.timeout = timeout or {
             'connect': 5,  # Connection timeout: 5 seconds
@@ -41,8 +40,8 @@ class BaseClient:
         self.requests_session = requests_session
 
     def _get_url(self, path):
-        if not path.startswith(self.base_url):
-            return os.path.join(self.base_url, path)
+        if not path.startswith('http'):
+            return f'{self.base_url}/{path.lstrip("/")}'
         return path
 
     def _get_headers(self):