orrin-cli 0.3.0b1__tar.gz → 0.3.0b3__tar.gz

orrin_cli-0.3.0b3/PKG-INFO

@@ -0,0 +1,16 @@
+Metadata-Version: 2.4
+Name: orrin-cli
+Version: 0.3.0b3
+Summary: Orrin CLI
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: typer[all]>=0.12.0
+Requires-Dist: click<8.2
+Dynamic: license-file
+
+# Orrin CLI v0.3.0b3
+
+## What's New
+
+In v0.3.0b3, we introduce the ability to mount custom handlers to Terminal Sessions, start mounted handlers, and unmount handlers.

orrin_cli-0.3.0b3/README.md

@@ -0,0 +1,5 @@
+# Orrin CLI v0.3.0b3
+
+## What's New
+
+In v0.3.0b3, we introduce the ability to mount custom handlers to Terminal Sessions, start mounted handlers, and unmount handlers.

{orrin_cli-0.3.0b1 → orrin_cli-0.3.0b3}/orrin/cli.py

@@ -1,16 +1,19 @@
 import webbrowser
-from click import Choice
-import typer
-import requests
+from click import Choice # type: ignore
+import typer # type: ignore
+import requests # type: ignore
 import json
 import os
 from pathlib import Path
-from platformdirs import user_config_dir
-import yaml, tomli, toml
+from platformdirs import user_config_dir # type: ignore
+import yaml, tomli, toml # type: ignore
 from pathlib import Path
 from orrin.Spinner import Spinner
-import websockets
+import websockets # type: ignore
 import asyncio
+import importlib.util
+import sys
+from pathlib import Path
 
 app = typer.Typer(help="""
 Welcome to Orrin CLI v0.1.9!\n\n
@@ -1196,7 +1199,276 @@ def start_default_handler():
         typer.echo('\nValue must be non-zero, or within bounds.')
         return
     
-    asyncio.run(establish_default_handler(config['terminal_sessions'][session_to_start]['session_id'], config['api_key']))
+    try:
+        asyncio.run(establish_default_handler(config['terminal_sessions'][session_to_start]['session_id'], config['api_key'], refresh))
+    except KeyboardInterrupt as _:
+        typer.echo('Exited handler connection. Connection closed.')
+
+        # Volantarily call `refresh` to ensure sessions are updated
+        refresh()
+    except Exception as e:
+        typer.echo(f'Exception: {str(e)}')
+
+def load_handler_module(handler_path: str | Path):
+    """Load a handler module with proper support for relative imports."""
+    handler_path = Path(handler_path).resolve()
+    
+    if not handler_path.is_file():
+        typer.echo(f"\n❌ Could not load file: {handler_path}")
+        raise typer.Exit(1)
+
+    module_name = handler_path.stem
+    module_dir = handler_path.parent
+
+    # Create module spec
+    spec = importlib.util.spec_from_file_location(module_name, handler_path)
+    if spec is None:
+        typer.echo(f"\n❌ Could not create spec for: {handler_path}")
+        raise typer.Exit(1)
+
+    # Create module
+    module = importlib.util.module_from_spec(spec)
+    
+    # === Critical for relative imports (especially 'from . import TSHandler') ===
+    # Set the package name so relative imports work
+    try:
+        # If the file is inside the orrinsdk package, use proper package name
+        if "orrinsdk" in str(handler_path):
+            module.__package__ = "orrinsdk"
+        else:
+            # Fallback
+            module.__package__ = module_dir.name
+    except:
+        module.__package__ = module_name
+
+    # Register and execute
+    sys.modules[spec.name] = module
+    spec.loader.exec_module(module)
+
+    return module
+
+@sessions.command(help='Mount handler to a terminal session')
+def mount_handler(
+    handler_file: str,
+    run: bool = typer.Option(False, "--run", "-r", help="Run the handler immediately after mounting")
+):
+    """Mount a custom handler to a terminal session."""
+    
+    # === Validation ===
+    if not os.path.isfile(handler_file):
+        typer.echo("\n❌ " + typer.style("File not found:", fg=typer.colors.RED) + f" {handler_file}")
+        raise typer.Exit(1)
+
+    config = load_config()
+
+    if config is None or "api_key" not in config:
+        typer.echo("\n⚠️  " + typer.style("Developer API not configured.", fg=typer.colors.YELLOW))
+        typer.echo("   Run: " + typer.style("orrin config configure-dev", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+
+    if not config.get("terminal_sessions"):
+        typer.echo("\n⚠️  " + typer.style("No terminal sessions found.", fg=typer.colors.YELLOW))
+        typer.echo("   Create one with: " + typer.style("orrin sessions create", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+
+    # === Show available sessions ===
+    typer.echo("\n" + typer.style("Available Terminal Sessions:", fg=typer.colors.BLUE, bold=True))
+    for i, session in enumerate(config["terminal_sessions"]):
+        typer.echo(f"   {i+1}. {session['session_name']} (ID: {session['session_id']})")
+
+    # === User selection ===
+    try:
+        selection = typer.prompt(
+            "\nSelect session number",
+            type=int,
+            default=1
+        )
+        session_idx = selection - 1
+
+        if session_idx < 0 or session_idx >= len(config["terminal_sessions"]):
+            typer.echo("\n❌ " + typer.style("Invalid selection.", fg=typer.colors.RED))
+            raise typer.Exit(1)
+
+    except Exception:
+        typer.echo("\n❌ " + typer.style("Invalid input.", fg=typer.colors.RED))
+        raise typer.Exit(1)
+
+    selected_session = config["terminal_sessions"][session_idx]
+
+    # === Load and validate handler ===
+    try:
+        module = load_handler_module(handler_file)  # ← Recommended to extract this
+        if not hasattr(module, "handler_entry"):
+            raise AttributeError("Function 'handler_entry' not found")
+        handler_func = getattr(module, "handler_entry")
+    except Exception as e:
+        typer.echo("\n❌ " + typer.style(f"Failed to load handler: {e}", fg=typer.colors.RED))
+        raise typer.Exit(1)
+
+    # === Check for existing mounted handler ===
+    if "mounted_handlers" in config:
+        for mh in config["mounted_handlers"]:
+            if mh.get("terminal_session_id") == selected_session["session_id"]:
+                typer.echo("\n⚠️  " + typer.style("This session already has a mounted handler.", fg=typer.colors.YELLOW))
+                typer.echo(f"   Current handler: {mh['path']}")
+                typer.echo("   Unmount it first using: " + typer.style("orrin sessions unmount-handler", fg=typer.colors.BRIGHT_YELLOW))
+                raise typer.Exit(1)
+
+    # === Run handler if requested ===
+    if run:
+        typer.echo(f"\n▶️  Running handler {typer.style(Path(handler_file).name, fg=typer.colors.BRIGHT_GREEN)}...")
+        try:
+            handler_func(terminal_session_id=selected_session["session_id"])
+            typer.echo("✅ Handler executed successfully.\n")
+        except Exception as e:
+            typer.echo("⚠️  " + typer.style(f"Handler execution failed: {e}", fg=typer.colors.RED))
+
+    # === Save mounted handler ===
+    if "mounted_handlers" not in config:
+        config["mounted_handlers"] = []
+
+    config["mounted_handlers"].append({
+        "path": str(handler_file),
+        "terminal_session_id": selected_session["session_id"]
+    })
+
+    write_config(config)
+
+    # === Final success message ===
+    typer.echo("\n" + typer.style("✅ Successfully mounted handler!", fg=typer.colors.GREEN, bold=True))
+    typer.echo(f"   Handler : {typer.style(Path(handler_file).name, fg=typer.colors.BRIGHT_GREEN)}")
+    typer.echo(f"   Session : {typer.style(selected_session['session_name'], bold=True)}")
+    typer.echo(f"   Session ID : {selected_session['session_id']}")
+
+@sessions.command(help='Unmount a custom handler from a terminal session')
+def unmount_handler():
+    config = load_config()
+
+    if config is None or "api_key" not in config:
+        typer.echo("\n⚠️  " + typer.style("Developer API not configured.", fg=typer.colors.YELLOW))
+        typer.echo("   Run: " + typer.style("orrin config configure-dev", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+
+    if not config.get("terminal_sessions"):
+        typer.echo("\n⚠️  " + typer.style("No terminal sessions found.", fg=typer.colors.YELLOW))
+        typer.echo("   Create one with: " + typer.style("orrin sessions create", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+    
+    if not config.get('mounted_handlers'):
+        typer.echo("\n⚠️  " + typer.style("No mounted handlers.", fg=typer.colors.YELLOW))
+        typer.echo("   Mount a new handler with: " + typer.style("orrin sessions mount-handler", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+    
+    # Get terminal sessions with custom handlers mounted
+    sessions_with_mh = []
+    for mh in config.get('mounted_handlers'):
+        sessions_with_mh.append(mh['terminal_session_id'])
+
+    # === Show available sessions ===
+    typer.echo("\n" + typer.style("Available Terminal Sessions:", fg=typer.colors.BLUE, bold=True))
+    for i, sessionID in enumerate(sessions_with_mh):
+        typer.echo(f"   {i+1}. {sessionID}")
+    
+    # === User selection ===
+    try:
+        selection = typer.prompt(
+            "\nSelect session number",
+            type=int,
+            default=1
+        )
+        session_idx = selection - 1
+
+        if session_idx < 0 or session_idx >= len(sessions_with_mh):
+            typer.echo("\n❌ " + typer.style("Invalid selection.", fg=typer.colors.RED))
+            raise typer.Exit(1)
+    except Exception as e:
+        typer.echo("\n❌ " + typer.style(f"Failed to load handler: {e}", fg=typer.colors.RED))
+        raise typer.Exit(1)
+    
+    for i in range(len(config.get('mounted_handlers'))):
+        if config.get('mounted_handlers')[i]['terminal_session_id'] == sessions_with_mh[session_idx]:
+            del config.get('mounted_handlers')[i]
+            break
+    
+    if config['mounted_handlers'] == []:
+        del config['mounted_handlers']
+    
+    write_config(config)
+    typer.echo("✅ Handler unmounted successfully.\n")
+
+@sessions.command(help='Run a terminal sessions custom handler')
+def run_handler():
+    config = load_config()
+
+    if config is None or "api_key" not in config:
+        typer.echo("\n⚠️  " + typer.style("Developer API not configured.", fg=typer.colors.YELLOW))
+        typer.echo("   Run: " + typer.style("orrin config configure-dev", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+
+    if not config.get("terminal_sessions"):
+        typer.echo("\n⚠️  " + typer.style("No terminal sessions found.", fg=typer.colors.YELLOW))
+        typer.echo("   Create one with: " + typer.style("orrin sessions create", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+    
+    if not config.get('mounted_handlers'):
+        typer.echo("\n⚠️  " + typer.style("No mounted handlers.", fg=typer.colors.YELLOW))
+        typer.echo("   Mount a new handler with: " + typer.style("orrin sessions mount-handler", fg=typer.colors.BRIGHT_YELLOW, bold=True))
+        raise typer.Exit(1)
+
+    # Get terminal sessions with custom handlers mounted
+    sessions_with_mh = []
+    for mh in config.get('mounted_handlers'):
+        sessions_with_mh.append(mh['terminal_session_id'])
+
+    # === Show available sessions ===
+    typer.echo("\n" + typer.style("Available Terminal Sessions:", fg=typer.colors.BLUE, bold=True))
+    for i, sessionID in enumerate(sessions_with_mh):
+        typer.echo(f"   {i+1}. {sessionID}")
+
+    # === User selection ===
+    try:
+        selection = typer.prompt(
+            "\nSelect session number",
+            type=int,
+            default=1
+        )
+        session_idx = selection - 1
+
+        if session_idx < 0 or session_idx >= len(sessions_with_mh):
+            typer.echo("\n❌ " + typer.style("Invalid selection.", fg=typer.colors.RED))
+            raise typer.Exit(1)
+    except Exception as e:
+        typer.echo("\n❌ " + typer.style(f"Failed to load handler: {e}", fg=typer.colors.RED))
+        raise typer.Exit(1)
+
+    # === Load and validate handler ===
+    try:
+        handler_file = next(
+            (
+                mh['path']
+                for mh in config.get('mounted_handlers')
+                if mh['terminal_session_id'] == sessions_with_mh[session_idx]
+            ),
+            None
+        )
+
+        if handler_file is None:
+            raise Exception('No mounted handler found for selected terminal session')
+
+        module = load_handler_module(handler_file)  # ← Recommended to extract this
+        if not hasattr(module, "handler_entry"):
+            raise AttributeError("Function 'handler_entry' not found")
+        handler_func = getattr(module, "handler_entry")
+    except Exception as e:
+        typer.echo("\n❌ " + typer.style(f"Failed to load handler: {e}", fg=typer.colors.RED))
+        raise typer.Exit(1)
+    
+    typer.echo(f"\n▶️  Running handler {typer.style(Path(handler_file).name, fg=typer.colors.BRIGHT_GREEN)}...")
+    try:
+        handler_func(terminal_session_id=sessions_with_mh[session_idx])
+        typer.echo("✅ Handler executed successfully.\n")
+    except Exception as e:
+        typer.echo("⚠️  " + typer.style(f"Handler execution failed: {e}", fg=typer.colors.RED))
 
 @sessions.command(help='Remove a specific connection')
 def remove_connection(session_name: str, type: str, connection_name: str):
@@ -1273,7 +1545,7 @@ def refresh():
 
     if resp.ok:
         sessions = resp.json()['Sessions']
-        config['sessions'] = sessions
+        config['terminal_sessions'] = sessions
         write_config(config)
 
         typer.echo(
@@ -1302,6 +1574,43 @@ def refresh():
                     fg=typer.colors.RED
                 )
             )
+
+@sessions.command(help='Show all active and inactive sessions')
+def show():
+    config = load_config()
+
+    if config is None:
+        typer.echo('\nYou have not configured a developer API. Please run:')
+        typer.echo('\t' + typer.style('  orrin config configure-dev  ', fg=typer.colors.YELLOW) + '\n')
+        return
+
+    if not 'terminal_sessions' in config:
+        typer.echo('\nYou have no sessions. You can create one by running:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    active_sessions = [session for session in config['terminal_sessions'] if session['active']]
+    inactive_sessions = [session for session in config['terminal_sessions'] if not session['active']]
+
+    typer.echo('\nActive Terminal Sessions:')
+    
+    if active_sessions == []:
+        typer.echo('\tNo active sessions')
+    else:
+        for i in range(len(active_sessions)):
+            typer.echo('\t' + f'{active_sessions[i]["session_name"]}, id: {active_sessions[i]["session_id"]}')
+    
+
+    typer.echo('\nInactive Terminal Sessions:')
+
+    if inactive_sessions == []:
+        typer.echo('\tAll sessions are active')
+    else:
+        for i in range(len(inactive_sessions)):
+            typer.echo('\t' + f'{inactive_sessions[i]["session_name"]}, id: {inactive_sessions[i]["session_id"]}')
+    
+    typer.echo('')
+
 # ---------------------------
 
 def main():

{orrin_cli-0.3.0b1 → orrin_cli-0.3.0b3}/orrin/default_websocket_handler.py

@@ -1,26 +1,42 @@
 import websockets
-import json
+import json, subprocess
 import typer
 
 # Helper function: establish websockt connection as default handler
 # Developer can create a sender websocket
-async def establish_default_handler(session_id, auth):
+async def establish_default_handler(session_id, auth, r):
     async with websockets.connect(
-        f"wss://stellr-company.com/terminal_sessions/connect/{session_id}",
-        additional_headers={ 'authorization': auth }
+        f"wss://stellr-company.com/terminal_sessions/connect/{session_id}"
     ) as ws:
-        await ws.send(json.dumps({'connection_type': 'handler', 'websocket_dependencies': []}))
+        # Send authorization
+        await ws.send(f'AUTH: {auth}')
+
+        # Send intitial data telling connection what we are
+        await ws.send(json.dumps({
+            'connection_type': 'handler',
+            'websocket_dependencies': [], # no inherent dependencies
+            'handler_name': 'test'
+        }))
+        
         data = await ws.recv()
         data = json.loads(data)
         connection_id = data['connection_id']
 
         typer.echo(f'Default handler connection id: {connection_id}\nSession ID: {session_id}\nUse this when creating sender websockets.\nYou are free to create as many custom handlers/senders as you would like, and are not restricted to the default handler.\n')
 
+        r()
+
         while True:
             data = await ws.recv()
             data = json.loads(data)
 
-            if not 'type' in data: continue
+            if not 'type' in data:
+                await ws.send(json.dumps({
+                    'type': 'respond',
+                    'message': 'fuck off.',
+                    'to': data['sender'],
+                    'response_type': 'string'
+                }))
 
             match data['type']:
                 case 'close':

orrin_cli-0.3.0b3/orrin_cli.egg-info/PKG-INFO

@@ -0,0 +1,16 @@
+Metadata-Version: 2.4
+Name: orrin-cli
+Version: 0.3.0b3
+Summary: Orrin CLI
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: typer[all]>=0.12.0
+Requires-Dist: click<8.2
+Dynamic: license-file
+
+# Orrin CLI v0.3.0b3
+
+## What's New
+
+In v0.3.0b3, we introduce the ability to mount custom handlers to Terminal Sessions, start mounted handlers, and unmount handlers.

{orrin_cli-0.3.0b1 → orrin_cli-0.3.0b3}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "orrin-cli"
 readme = "README.md"
-version = "0.3.0b1"
+version = "0.3.0b3"
 description = "Orrin CLI"
 requires-python = ">=3.9"
 dependencies = [

orrin_cli-0.3.0b1/PKG-INFO

@@ -1,18 +0,0 @@
-Metadata-Version: 2.4
-Name: orrin-cli
-Version: 0.3.0b1
-Summary: Orrin CLI
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: typer[all]>=0.12.0
-Requires-Dist: click<8.2
-Dynamic: license-file
-
-# Orrin CLI v0.2.0.2
-
-## What's New
-
-In v0.2.0.2, a minor change was made to support new icon sizes of 64x64, 128x128, 256x256, and 512x512.
-
-Please refer to [the docs](https://stellr-company.com/orrin/docs) for more information over Orrin CLI.

orrin_cli-0.3.0b1/README.md

@@ -1,7 +0,0 @@
-# Orrin CLI v0.2.0.2
-
-## What's New
-
-In v0.2.0.2, a minor change was made to support new icon sizes of 64x64, 128x128, 256x256, and 512x512.
-
-Please refer to [the docs](https://stellr-company.com/orrin/docs) for more information over Orrin CLI.

orrin_cli-0.3.0b1/orrin_cli.egg-info/PKG-INFO

@@ -1,18 +0,0 @@
-Metadata-Version: 2.4
-Name: orrin-cli
-Version: 0.3.0b1
-Summary: Orrin CLI
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: typer[all]>=0.12.0
-Requires-Dist: click<8.2
-Dynamic: license-file
-
-# Orrin CLI v0.2.0.2
-
-## What's New
-
-In v0.2.0.2, a minor change was made to support new icon sizes of 64x64, 128x128, 256x256, and 512x512.
-
-Please refer to [the docs](https://stellr-company.com/orrin/docs) for more information over Orrin CLI.