synapse-sdk 1.0.0b6__py3-none-any.whl → 1.0.0b7__py3-none-any.whl

synapse_sdk/cli/code_server.py

@@ -2,7 +2,9 @@
 
 import os
 import shutil
+import socket
 import subprocess
+import webbrowser
 from pathlib import Path
 from typing import Optional
 from urllib.parse import quote
@@ -141,6 +143,169 @@ def detect_and_encrypt_plugin(workspace_path: str) -> Optional[dict]:
         return None
 
 
+def is_ssh_session() -> bool:
+    """Check if we're in an SSH session.
+
+    Returns:
+        bool: True if in SSH session, False otherwise
+    """
+    return bool(os.environ.get('SSH_CONNECTION') or os.environ.get('SSH_CLIENT'))
+
+
+def is_vscode_terminal() -> bool:
+    """Check if we're running in a VSCode terminal.
+
+    Returns:
+        bool: True if in VSCode terminal, False otherwise
+    """
+    return os.environ.get('TERM_PROGRAM') == 'vscode'
+
+
+def is_vscode_ssh_session() -> bool:
+    """Check if we're in a VSCode terminal over SSH.
+
+    Returns:
+        bool: True if in VSCode terminal via SSH, False otherwise
+    """
+    return is_vscode_terminal() and is_ssh_session()
+
+
+def get_ssh_tunnel_instructions(port: int) -> str:
+    """Get SSH tunnel setup instructions for VSCode users.
+
+    Args:
+        port: The port number code-server is running on
+
+    Returns:
+        str: Instructions for setting up SSH tunnel
+    """
+    ssh_client = os.environ.get('SSH_CLIENT', '').split()[0] if os.environ.get('SSH_CLIENT') else 'your_server'
+
+    instructions = f"""
+📡 VSCode SSH Tunnel Setup:
+
+Since you're using VSCode's integrated terminal over SSH, you can access code-server locally by:
+
+1. Using VSCode's built-in port forwarding:
+   • Open Command Palette (Cmd/Ctrl+Shift+P)
+   • Type "Forward a Port"
+   • Enter port: {port}
+   • VSCode will automatically forward the port
+
+2. Or manually forward the port in a new local terminal:
+   ssh -L {port}:localhost:{port} {ssh_client}
+
+3. Then open in your local browser:
+   http://localhost:{port}
+"""
+    return instructions
+
+
+def open_browser_smart(url: str) -> bool:
+    """Open browser with smart fallback handling.
+
+    Attempts to open a browser using multiple methods, with appropriate
+    handling for SSH sessions and headless environments.
+
+    Args:
+        url: URL to open
+
+    Returns:
+        bool: True if browser was opened successfully, False otherwise
+    """
+    # Don't even try to open browser in SSH sessions (except VSCode can handle it)
+    if is_ssh_session() and not is_vscode_terminal():
+        return False
+
+    # Try Python's webbrowser module first (cross-platform)
+    try:
+        if webbrowser.open(url):
+            return True
+    except Exception:
+        pass
+
+    # Try platform-specific commands
+    commands = []
+
+    # Check for macOS
+    if shutil.which('open'):
+        commands.append(['open', url])
+
+    # Check for Linux with display
+    if os.environ.get('DISPLAY'):
+        if shutil.which('xdg-open'):
+            commands.append(['xdg-open', url])
+        if shutil.which('gnome-open'):
+            commands.append(['gnome-open', url])
+        if shutil.which('kde-open'):
+            commands.append(['kde-open', url])
+
+    # Try each command
+    for cmd in commands:
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, timeout=2)
+            if result.returncode == 0:
+                return True
+        except Exception:
+            continue
+
+    return False
+
+
+def is_port_in_use(port: int) -> bool:
+    """Check if a port is already in use.
+
+    Args:
+        port: Port number to check
+
+    Returns:
+        bool: True if port is in use, False otherwise
+    """
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        try:
+            s.bind(('127.0.0.1', port))
+            return False
+        except socket.error:
+            return True
+
+
+def get_process_on_port(port: int) -> Optional[str]:
+    """Get the name of the process using a specific port.
+
+    Args:
+        port: Port number to check
+
+    Returns:
+        str: Process name if found, None otherwise
+    """
+    try:
+        # Use lsof to find the process
+        result = subprocess.run(['lsof', '-i', f':{port}', '-t'], capture_output=True, text=True, timeout=2)
+
+        if result.returncode == 0 and result.stdout.strip():
+            # Get the PID
+            pid = result.stdout.strip().split('\n')[0]
+
+            # Get process details
+            proc_result = subprocess.run(['ps', '-p', pid, '-o', 'comm='], capture_output=True, text=True, timeout=2)
+
+            if proc_result.returncode == 0:
+                process_name = proc_result.stdout.strip()
+                # Check if it's a code-server process
+                if 'node' in process_name or 'code-server' in process_name:
+                    # Try to get more details
+                    cmd_result = subprocess.run(
+                        ['ps', '-p', pid, '-o', 'args='], capture_output=True, text=True, timeout=2
+                    )
+                    if cmd_result.returncode == 0 and 'code-server' in cmd_result.stdout:
+                        return 'code-server'
+                return process_name
+    except Exception:
+        pass
+
+    return None
+
+
 def is_code_server_installed() -> bool:
     """Check if code-server is installed locally.
 
@@ -154,7 +319,7 @@ def get_code_server_port() -> int:
     """Get code-server port from config file.
 
     Returns:
-        int: Port number from config, defaults to 8880 if not found
+        int: Port number from config, defaults to 8070 if not found
     """
     config_path = Path.home() / '.config' / 'code-server' / 'config.yaml'
 
@@ -163,7 +328,7 @@ def get_code_server_port() -> int:
             with open(config_path, 'r') as f:
                 config = yaml.safe_load(f)
 
-            # Parse bind-addr which can be in format "127.0.0.1:8880" or just ":8880"
+            # Parse bind-addr which can be in format "127.0.0.1:8070" or just ":8070"
             bind_addr = config.get('bind-addr', '')
             if ':' in bind_addr:
                 port_str = bind_addr.split(':')[-1]
@@ -176,31 +341,133 @@ def get_code_server_port() -> int:
         pass
 
     # Default port if config not found or invalid
-    return 8880
+    return 8070
 
 
-def launch_local_code_server(workspace_path: str, open_browser: bool = True) -> None:
+def launch_local_code_server(workspace_path: str, open_browser: bool = True, custom_port: Optional[int] = None) -> None:
     """Launch local code-server instance.
 
     Args:
         workspace_path: Directory to open in code-server
         open_browser: Whether to open browser automatically
+        custom_port: Optional custom port to use instead of config/default
     """
     try:
-        # Get port from config
-        port = get_code_server_port()
+        # Use custom port if provided, otherwise get from config
+        port = custom_port if custom_port else get_code_server_port()
+
+        # Check if port is already in use
+        if is_port_in_use(port):
+            process_name = get_process_on_port(port)
+
+            if process_name == 'code-server':
+                # Code-server is already running
+                click.echo(f'⚠️  Code-server is already running on port {port}')
+
+                # Create URL with folder query parameter
+                encoded_path = quote(workspace_path)
+                url_with_folder = f'http://localhost:{port}/?folder={encoded_path}'
+
+                # Ask user what to do
+                questions = [
+                    inquirer.List(
+                        'action',
+                        message='What would you like to do?',
+                        choices=[
+                            ('Use existing code-server instance', 'use_existing'),
+                            ('Stop existing and start new instance', 'restart'),
+                            ('Cancel', 'cancel'),
+                        ],
+                    )
+                ]
+
+                try:
+                    answers = inquirer.prompt(questions)
+
+                    if not answers or answers['action'] == 'cancel':
+                        click.echo('Cancelled')
+                        return
+
+                    if answers['action'] == 'use_existing':
+                        click.echo('\n✅ Using existing code-server instance')
+                        click.echo(f'   URL: {url_with_folder}')
+
+                        # Optionally open browser
+                        if open_browser:
+                            if is_vscode_ssh_session():
+                                # Special handling for VSCode SSH sessions
+                                click.echo(get_ssh_tunnel_instructions(port))
+                                click.echo(f'🔗 Remote URL: {url_with_folder}')
+                                click.echo(f'\n✨ After port forwarding, access at: http://localhost:{port}')
+                            elif is_ssh_session():
+                                click.echo('📝 SSH session detected - please open the URL in your local browser')
+                                click.echo(f'👉 URL: {url_with_folder}')
+                            elif open_browser_smart(url_with_folder):
+                                click.echo('✅ Browser opened successfully')
+                            else:
+                                click.echo('⚠️  Could not open browser automatically')
+                                click.echo(f'👉 URL: {url_with_folder}')
+                        return
+
+                    if answers['action'] == 'restart':
+                        # Stop existing code-server
+                        click.echo('Stopping existing code-server...')
+                        try:
+                            # Get PID of code-server process
+                            result = subprocess.run(
+                                ['lsof', '-i', f':{port}', '-t'], capture_output=True, text=True, timeout=2
+                            )
+
+                            if result.returncode == 0 and result.stdout.strip():
+                                pid = result.stdout.strip().split('\n')[0]
+                                subprocess.run(['kill', pid], timeout=5)
+
+                                # Wait a moment for process to stop
+                                import time
+
+                                time.sleep(2)
+
+                                click.echo('✅ Existing code-server stopped')
+                        except Exception as e:
+                            click.echo(f'⚠️  Could not stop existing code-server: {e}')
+                            click.echo('Please stop it manually and try again')
+                            return
+
+                except (KeyboardInterrupt, EOFError):
+                    click.echo('\nCancelled')
+                    return
+
+            else:
+                # Another process is using the port
+                click.echo(f'❌ Port {port} is already in use by: {process_name or "unknown process"}')
+                if not custom_port:
+                    click.echo('\nYou can:')
+                    click.echo('1. Stop the process using the port')
+                    click.echo('2. Use a different port with --port option (e.g., --port 8071)')
+                    click.echo('3. Change the default port in ~/.config/code-server/config.yaml')
+                else:
+                    click.echo(f'Please try a different port or stop the process using port {port}')
+                return
 
         # Create URL with folder query parameter
         encoded_path = quote(workspace_path)
         url_with_folder = f'http://localhost:{port}/?folder={encoded_path}'
 
         # Basic code-server command - let code-server handle the workspace internally
-        cmd = ['code-server', workspace_path]
+        cmd = ['code-server']
+
+        # Add custom port binding if specified
+        if custom_port:
+            cmd.extend(['--bind-addr', f'127.0.0.1:{port}'])
+
+        cmd.append(workspace_path)
 
         if not open_browser:
             cmd.append('--disable-getting-started-override')
 
         click.echo(f'🚀 Starting local code-server for workspace: {workspace_path}')
+        if custom_port:
+            click.echo(f'   Using custom port: {port}')
         click.echo(f'   URL: {url_with_folder}')
         click.echo('   Press Ctrl+C to stop the server')
 
@@ -221,17 +488,18 @@ def launch_local_code_server(workspace_path: str, open_browser: bool = True) ->
             time.sleep(3)
 
             # Open browser with folder parameter
-            try:
-                result = subprocess.run(['xdg-open', url_with_folder], capture_output=True, text=True, timeout=2)
-                if result.returncode != 0:
-                    click.echo('⚠️  Could not open browser automatically (no display?)')
-                    click.echo(f'👉 Please manually open: {url_with_folder}')
-                else:
-                    click.echo('✅ Browser opened successfully')
-            except (subprocess.TimeoutExpired, FileNotFoundError):
-                click.echo('⚠️  Could not open browser (headless environment)')
-                click.echo(f'👉 Please manually open: {url_with_folder}')
-            except Exception:
+            if is_vscode_ssh_session():
+                # Special handling for VSCode SSH sessions
+                click.echo(get_ssh_tunnel_instructions(port))
+                click.echo(f'🔗 Remote URL: {url_with_folder}')
+                click.echo(f'\n✨ After port forwarding, access at: http://localhost:{port}')
+            elif is_ssh_session():
+                click.echo('📝 SSH session detected - please open the URL in your local browser')
+                click.echo(f'👉 URL: {url_with_folder}')
+            elif open_browser_smart(url_with_folder):
+                click.echo('✅ Browser opened successfully')
+            else:
+                click.echo('⚠️  Could not open browser automatically')
                 click.echo(f'👉 Please manually open: {url_with_folder}')
 
             # Wait for the server thread (blocking)
@@ -333,19 +601,22 @@ def run_agent_code_server(agent: Optional[str], workspace: str, open_browser: bo
     if open_browser and url:
         click.echo('\nAttempting to open in browser...')
 
-        # Try to open browser, suppressing stderr to avoid xdg-open noise
-        try:
-            # Use subprocess to suppress xdg-open errors
-            result = subprocess.run(['xdg-open', url], capture_output=True, text=True, timeout=2)
-            if result.returncode != 0:
-                click.echo('⚠️  Could not open browser automatically (no display?)')
-                click.echo(f'👉 Please manually open: {url}')
-        except (subprocess.TimeoutExpired, FileNotFoundError):
-            # xdg-open not available or timed out
-            click.echo('⚠️  Could not open browser (headless environment)')
-            click.echo(f'👉 Please manually open: {url}')
-        except Exception:
-            # Fallback for other errors
+        if is_vscode_ssh_session():
+            # Extract port from URL for instructions
+            import re
+
+            port_match = re.search(r':(\d+)', url)
+            if port_match:
+                agent_port = int(port_match.group(1))
+                click.echo(get_ssh_tunnel_instructions(agent_port))
+            click.echo(f'🔗 Remote URL: {url}')
+        elif is_ssh_session():
+            click.echo('📝 SSH session detected - please open the URL in your local browser')
+            click.echo(f'👉 URL: {url}')
+        elif open_browser_smart(url):
+            click.echo('✅ Browser opened successfully')
+        else:
+            click.echo('⚠️  Could not open browser automatically')
             click.echo(f'👉 Please manually open: {url}')
 
     # Show additional instructions
@@ -364,7 +635,8 @@ def run_agent_code_server(agent: Optional[str], workspace: str, open_browser: bo
 @click.option('--agent', help='Agent name or ID')
 @click.option('--open-browser/--no-open-browser', default=True, help='Open in browser')
 @click.option('--workspace', help='Workspace directory path (defaults to current directory)')
-def code_server(agent: Optional[str], open_browser: bool, workspace: Optional[str]):
+@click.option('--port', type=int, help='Port to bind code-server (default: from config or 8070)')
+def code_server(agent: Optional[str], open_browser: bool, workspace: Optional[str], port: Optional[int]):
     """Open code-server either through agent or locally."""
 
     # Get current working directory if workspace not specified
@@ -405,7 +677,7 @@ def code_server(agent: Optional[str], open_browser: bool, workspace: Optional[st
 
         elif answers['option'] == 'local':
             click.echo('\n💻 Starting local code-server...')
-            launch_local_code_server(workspace, open_browser)
+            launch_local_code_server(workspace, open_browser, port)
 
         elif answers['option'] == 'install':
             show_code_server_installation_help()

synapse_sdk/plugins/categories/export/actions/export.py

@@ -41,7 +41,7 @@ class ExportRun(Run):
         """Log export file information.
 
         Args:
-            log_type (str): The type of log ('export_data_file' or 'export_original_file' or 'etc').
+            log_type (str): The type of log ('export_data_file' or 'export_original_file').
             target_id (int): The ID of the data file.
             data_file_info (dict): The JSON info of the data file.
             status (ExportStatus): The status of the data file.
@@ -89,16 +89,6 @@ class ExportRun(Run):
         """Log export origin data file."""
         self.log_file('export_original_file', target_id, data_file_info, status, error)
 
-    def export_log_etc_file(
-        self,
-        target_id: int,
-        data_file_info: dict,
-        status: ExportStatus = ExportStatus.STAND_BY,
-        error: str | None = None,
-    ):
-        """Log export etc file."""
-        self.log_file('etc', target_id, data_file_info, status, error)
-
 
 class ExportTargetHandler(ABC):
     """
@@ -302,11 +292,6 @@ class ExportAction(Action):
             'failed': 0,
             'success': 0,
         },
-        'etc': {
-            'stand_by': 0,
-            'failed': 0,
-            'success': 0,
-        },
     }
 
     def get_filtered_results(self, filters, handler):

{synapse_sdk-1.0.0b6.dist-info → synapse_sdk-1.0.0b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse-sdk
-Version: 1.0.0b6
+Version: 1.0.0b7
 Summary: synapse sdk
 Author-email: datamaker <developer@datamaker.io>
 License: MIT

{synapse_sdk-1.0.0b6.dist-info → synapse_sdk-1.0.0b7.dist-info}/RECORD

@@ -7,7 +7,7 @@ synapse_sdk/i18n.py,sha256=VXMR-Zm_1hTAg9iPk3YZNNq-T1Bhx1J2fEtRT6kyYbg,766
 synapse_sdk/loggers.py,sha256=xK48h3ZaDDZLaF-qsdnv1-6-4vw_cYlgpSCKHYUQw1g,6549
 synapse_sdk/types.py,sha256=khzn8KpgxFdn1SrpbcuX84m_Md1Mz_HIoUoPq8uok40,698
 synapse_sdk/cli/__init__.py,sha256=64Qaxak5rwhEKUj5xLkdg1vtBgyl4Do1Z97eNiqNqEE,11668
-synapse_sdk/cli/code_server.py,sha256=0AnyZSrHxfH7YU02PXPjcvekH-R1BRRrIA0NbA8Ckd8,15421
+synapse_sdk/cli/code_server.py,sha256=5m90k1JkvF13aGn5_fso23NVdzH6AdYnM5Eq7YOztzo,25309
 synapse_sdk/cli/config.py,sha256=2WVKeAdcDeiwRb4JnNEOeZoAVlTHrY2jx4NAUiAZO2c,16156
 synapse_sdk/cli/devtools.py,sha256=hi06utdLllptlUy3HhPfmfRqjc9bdiVGezY0U5s_0pY,2617
 synapse_sdk/cli/alias/__init__.py,sha256=jDy8N_KupVy7n_jKKWhjQOj76-mR-uoVvMoyzObUkuI,405
@@ -113,7 +113,7 @@ synapse_sdk/plugins/categories/data_validation/templates/plugin/validation.py,sh
 synapse_sdk/plugins/categories/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/export/enums.py,sha256=gtyngvQ1DKkos9iKGcbecwTVQQ6sDwbrBPSGPNb5Am0,127
 synapse_sdk/plugins/categories/export/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/export/actions/export.py,sha256=XxhFIebt9tGTNcj0N6guVhAPP4d2YZ5Lvsx22-va72Y,12263
+synapse_sdk/plugins/categories/export/actions/export.py,sha256=YM8xu_mv4HTAG3DgqTYxu8oH8kBLmrNOoxPd5-iWJkU,11849
 synapse_sdk/plugins/categories/export/templates/config.yaml,sha256=N7YmnFROb3s3M35SA9nmabyzoSb5O2t2TRPicwFNN2o,56
 synapse_sdk/plugins/categories/export/templates/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/export/templates/plugin/export.py,sha256=GDb6Ucodsr5aBPMU4alr68-DyFoLR5TyhC_MCaJrkF0,6411
@@ -211,9 +211,9 @@ synapse_sdk/utils/storage/providers/gcp.py,sha256=i2BQCu1Kej1If9SuNr2_lEyTcr5M_n
 synapse_sdk/utils/storage/providers/http.py,sha256=2DhIulND47JOnS5ZY7MZUex7Su3peAPksGo1Wwg07L4,5828
 synapse_sdk/utils/storage/providers/s3.py,sha256=ZmqekAvIgcQBdRU-QVJYv1Rlp6VHfXwtbtjTSphua94,2573
 synapse_sdk/utils/storage/providers/sftp.py,sha256=_8s9hf0JXIO21gvm-JVS00FbLsbtvly4c-ETLRax68A,1426
-synapse_sdk-1.0.0b6.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0b6.dist-info/METADATA,sha256=mU8-WwXY45NYGlXdk_mS1P9P8Ip21Q_9RqLZ9joe9hc,3718
-synapse_sdk-1.0.0b6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-synapse_sdk-1.0.0b6.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0b6.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0b6.dist-info/RECORD,,
+synapse_sdk-1.0.0b7.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
+synapse_sdk-1.0.0b7.dist-info/METADATA,sha256=wxCAnhyKInbnikbhOkyYMsILdiqmrizaCmNbFzaynZw,3718
+synapse_sdk-1.0.0b7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+synapse_sdk-1.0.0b7.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
+synapse_sdk-1.0.0b7.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
+synapse_sdk-1.0.0b7.dist-info/RECORD,,