orrin-cli 0.2.0.1__tar.gz → 0.3.0b1__tar.gz

{orrin_cli-0.2.0.1/orrin_cli.egg-info → orrin_cli-0.3.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orrin-cli
-Version: 0.2.0.1
+Version: 0.3.0b1
 Summary: Orrin CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
@@ -9,6 +9,10 @@ Requires-Dist: typer[all]>=0.12.0
 Requires-Dist: click<8.2
 Dynamic: license-file
 
-# Orrin CLI v0.2.0.1
+# 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

@@ -0,0 +1,7 @@
+# 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.2.0.1 → orrin_cli-0.3.0b1}/orrin/cli.py

@@ -9,6 +9,8 @@ from platformdirs import user_config_dir
 import yaml, tomli, toml
 from pathlib import Path
 from orrin.Spinner import Spinner
+import websockets
+import asyncio
 
 app = typer.Typer(help="""
 Welcome to Orrin CLI v0.1.9!\n\n
@@ -28,6 +30,9 @@ app.add_typer(ui, name="ui")
 projects = typer.Typer(help='OrrinSDK project commands')
 app.add_typer(projects, name='projects')
 
+sessions = typer.Typer(help='Terminal Sessions enabling projects to be created in your terminal env from iOS and Web app')
+app.add_typer(sessions, name='sessions')
+
 API_BASE = "https://stellr-company.com"
 
 APP_NAME = "orrin"
@@ -662,12 +667,13 @@ def init_tool_project():
             'project_type': 'tool',
             'name': project_name,
             'desc': project_desc,
+            'version': '1.0.0',
             'nuances': {},
             'icons': {
-                '24x24': '<path>',
-                '32x32': '<path>',
-                '48x48': '<path>',
-                '64x64': '<path>'
+                '64x64': '<path>',
+                '128x128': '<path>',
+                '256x256': '<path>',
+                '512x512': '<path>'
             },
         },
         'plugins': {
@@ -811,6 +817,493 @@ def itp():
 
 # --------------------------------
 
+# ---- Terminal Sessions ----
+
+from default_websocket_handler import establish_default_handler
+
+@sessions.command(help='''
+Create a new terminal session. Once created, this session will automatically be live and will display in the iOS and Web applications
+All sessions will be stored in developer configuration.
+''')
+def create():
+    config = load_config()
+
+    if config is None or not 'api_key' in config:
+        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
+    
+    session_name = typer.prompt(
+        'Session Name',
+        hide_input=False
+    )
+    session_desc = typer.prompt(
+        'Session description',
+        hide_input=False
+    )
+
+    resp = requests.post(
+        f'{API_BASE}/api/terminal_sessions/create_terminal_session',
+        headers={ 'fsdk': 'yes', 'authorization': config['api_key'] },
+        json={
+            'session_name': session_name,
+            'session_desc': session_desc
+        }
+    )
+
+    if resp.ok:
+        session_id = resp.json()['session_id'] # get session id
+
+        if not 'terminal_sessions' in config:
+            config['terminal_sessions'] = [
+                {
+                    'session_name': session_name,
+                    'session_desc': session_desc,
+                    'session_id': session_id,
+                    'active': True,
+                    'connections': []
+                }
+            ]
+        else:
+            config['terminal_sessions'].append({
+                'session_name': session_name,
+                'session_desc': session_desc,
+                'session_id': session_id,
+                'active': True,
+                'connections': []
+            })
+
+        write_config(config)
+
+        typer.echo(
+            '\n' + typer.style(
+                'Session created.',
+                fg=typer.colors.GREEN
+            ) + '\n'
+        )
+
+        typer.echo(json.dumps({
+            'session_name': session_name,
+            'session_desc': session_desc,
+            'session_id': session_id,
+            'active': True,
+            'connections': []
+        }, indent=2) + '\n')
+    else:
+        try:
+            j = resp.json()
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to create session: {j["Message"]}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+            typer.echo(json.dumps(j, indent=2) + '\n')
+        except:
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to create session: {resp.text}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+@sessions.command(help='''
+Delete an existing terminal session.
+Developer configuration will be updated accordingly.
+''')
+def delete():
+    config = load_config()
+
+    if config is None or not 'api_key' in config:
+        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 not created any terminal sessions. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    if config['terminal_sessions'] == []:
+        typer.echo('\nYou have no terminal sessions available. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    typer.echo('\nAvailable terminal sessions:')
+    
+    for i in range(len(config['terminal_sessions'])):
+        typer.echo('\t' + f'{i+1}: {config["terminal_sessions"][i]["session_name"]}')
+    
+    typer.echo()
+    session_to_delete = int(typer.prompt(
+        'Selection',
+        hide_input=False
+    )) - 1
+
+    if session_to_delete == -1 or session_to_delete > len(config['terminal_sessions']):
+        typer.echo('\nValue must be non-zero, or within bounds.')
+        return
+    
+    session_id_to_delete = config['terminal_sessions'][session_to_delete]['session_id']
+
+    resp = requests.post(
+        f'{API_BASE}/api/terminal_sessions/delete_terminal_session',
+        headers={ 'fsdk': 'yes', 'authorization': config['api_key'] },
+        json={
+            'session_id': session_id_to_delete
+        }
+    )
+
+    if resp.ok:
+        del config['terminal_sessions'][session_to_delete]
+        write_config(config)
+
+        typer.echo(
+            '\n' + typer.style(
+                'Session deleted. Remaining sessions:',
+                fg=typer.colors.GREEN
+            ) + '\n'
+        )
+
+        if not config['terminal_sessions'] == []:
+            typer.echo(json.dumps(config['terminal_sessions'], indent=2) + '\n')
+        else:
+            typer.echo('You have no sessions.' + '\n')
+    else:
+        try:
+            j = resp.json()
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to delete session: {j["Message"]}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+            typer.echo(json.dumps(j, indent=2) + '\n')
+        except:
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to delete session: {resp.text}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+@sessions.command(help='Pauses a session (makes it to where connections are closed, and no new connections can be established)')
+def pause():
+    config = load_config()
+
+    if config is None or not 'api_key' in config:
+        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 not created any terminal sessions. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    if config['terminal_sessions'] == []:
+        typer.echo('\nYou have no terminal sessions available. Run the below to create a session:')
+        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']]
+    
+    if active_sessions == []:
+        typer.echo('\nYou have no active terminal sessions. All are paused. Run the below to start up a session:')
+        typer.echo('\t' + typer.style('  orrin sessions start  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    typer.echo('\nAvailable terminal sessions:')
+    
+    for i in range(len(active_sessions)):
+        typer.echo('\t' + f'{i+1}: {active_sessions[i]["session_name"]}')
+    
+    typer.echo()
+    session_to_pause = int(typer.prompt(
+        'Selection',
+        hide_input=False
+    )) - 1
+
+    if session_to_pause == -1 or session_to_pause > len(active_sessions):
+        typer.echo('\nValue must be non-zero, or within bounds.')
+        return
+    
+    session_id_to_pause = config['terminal_sessions'][session_to_pause]['session_id']
+
+    resp = requests.post(
+        f'{API_BASE}/api/terminal_sessions/pause_terminal_session',
+        headers={ 'fsdk': 'yes', 'authorization': config['api_key'] },
+        json={ 'session_id': session_id_to_pause }
+    )
+
+    if resp.ok:
+        for i in range(len(config['terminal_sessions'])):
+            if config['terminal_sessions'][i]['session_id'] == session_id_to_pause:
+                config['terminal_sessions'][i]['active'] = False
+                break
+
+        write_config(config)
+
+        typer.echo(
+            '\n' + typer.style(
+                f'Session "{config["terminal_sessions"][session_to_pause]["session_name"]}" paused.',
+                fg=typer.colors.GREEN
+            ) + '\n'
+        )
+    else:
+        try:
+            j = resp.json()
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to pause session: {j["Message"]}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+            typer.echo(json.dumps(j, indent=2) + '\n')
+        except:
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to pause session: {resp.text}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+@sessions.command(help='Starts a session (makes it to where new connections can be established)')
+def start():
+    config = load_config()
+
+    if config is None or not 'api_key' in config:
+        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 not created any terminal sessions. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    if config['terminal_sessions'] == []:
+        typer.echo('\nYou have no terminal sessions available. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    inactive_sessions = [session for session in config['terminal_sessions'] if not session['active']]
+    
+    if inactive_sessions == []:
+        typer.echo('\nYou have no inactive terminal sessions. All are live. Run the below to pause a session:')
+        typer.echo('\t' + typer.style('  orrin sessions pause  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    typer.echo('\nAvailable terminal sessions:')
+    
+    for i in range(len(inactive_sessions)):
+        typer.echo('\t' + f'{i+1}: {inactive_sessions[i]["session_name"]}')
+    
+    typer.echo()
+    session_to_start = int(typer.prompt(
+        'Selection',
+        hide_input=False
+    )) - 1
+
+    if session_to_start == -1 or session_to_start > len(inactive_sessions):
+        typer.echo('\nValue must be non-zero, or within bounds.')
+        return
+    
+    session_id_to_start = config['terminal_sessions'][session_to_start]['session_id']
+
+    resp = requests.post(
+        f'{API_BASE}/api/terminal_sessions/start_terminal_session',
+        headers={ 'fsdk': 'yes', 'authorization': config['api_key'] },
+        json={ 'session_id': session_id_to_start }
+    )
+
+    if resp.ok:
+        for i in range(len(config['terminal_sessions'])):
+            if config['terminal_sessions'][i]['session_id'] == session_id_to_start:
+                config['terminal_sessions'][i]['active'] = True
+                break
+
+        write_config(config)
+
+        typer.echo(
+            '\n' + typer.style(
+                f'Session "{config["terminal_sessions"][session_to_start]["session_name"]}" started.',
+                fg=typer.colors.GREEN
+            ) + '\n'
+        )
+
+        typer.echo(
+            '\n' + typer.style(
+                f'Starting websocket...',
+                fg=typer.colors.GREEN
+            ) + '\n'
+        )
+
+        asyncio.run(establish_default_handler(session_id_to_start, config['api_key']))
+    else:
+        try:
+            j = resp.json()
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to start session: {j["Message"]}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+            typer.echo(json.dumps(j, indent=2) + '\n')
+        except:
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to start session: {resp.text}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+@sessions.command(help='Start default websocket handler')
+def start_default_handler():
+    config = load_config()
+
+    if config is None or not 'api_key' in config:
+        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 not created any terminal sessions. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    if config['terminal_sessions'] == []:
+        typer.echo('\nYou have no terminal sessions available. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    typer.echo('\nAvailable terminal sessions:')
+    
+    for i in range(len(config['terminal_sessions'])):
+        typer.echo('\t' + f'{i+1}: {config["terminal_sessions"][i]["session_name"]}')
+    
+    typer.echo()
+    session_to_start = int(typer.prompt(
+        'Selection',
+        hide_input=False
+    )) - 1
+
+    if session_to_start == -1 or session_to_start > len(config['terminal_sessions']):
+        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']))
+
+@sessions.command(help='Remove a specific connection')
+def remove_connection(session_name: str, type: str, connection_name: str):
+    config = load_config()
+
+    if config is None or not 'api_key' in config:
+        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 config['terminal_sessions'] == []:
+        typer.echo('\nYou have no terminal sessions available. Run the below to create a session:')
+        typer.echo('\t' + typer.style('  orrin sessions create  ', fg=typer.colors.YELLOW) + '\n')
+        return
+    
+    if not any(session_name == session['session_name'] for session in config['terminal_sessions']):
+        typer.echo(f'\nYou have no session `{session_name}`')
+        return
+
+    connection_type = 'handler' if type == 'h' else 'sender'
+
+    resp = requests.post(
+        f'{API_BASE}/api/terminal_sessions/remove_connection',
+        headers={ 'fsdk': 'yes', 'authorization': config['api_key'] },
+        json={ 'session_name': session_name, 'connection_type': connection_type, 'connection_name': connection_name }
+    )
+
+    if resp.ok:
+        for i in range(len(config['terminal_sessions'])):
+            if config['terminal_sessions'][i]['session_name'] == session_name:
+                for c in range(len(config['terminal_sessions'][i]['connections'])):
+                    if config['terminal_sessions'][i]['connections'][c]['type'] == connection_type and config['terminal_sessions'][i]['connections'][c][f'{connection_type}_name'] == connection_name:
+                        del config['terminal_sessions'][i]['connections'][c]
+                        break
+                
+        typer.echo(
+            '\n' + typer.style(
+                f'Connection removed',
+                fg=typer.colors.GREEN
+            ) + '\n'
+        )
+    else:
+        try:
+            j = resp.json()
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to remove connection from session `{session_name}`: {j["message"]}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+            typer.echo(json.dumps(j, indent=2) + '\n')
+        except:
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to remove connection session `{session_name}`: {resp.text}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+@sessions.command(help='Refresh sessions, ensuring state of sessions in configuration is up to date')
+def refresh():
+    config = load_config()
+
+    if config is None or not 'api_key' in config:
+        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
+    
+    resp = requests.get(
+        f'{API_BASE}/api/terminal_sessions/sessions',
+        headers={ 'fsdk': 'yes', 'authorization': config['api_key'] }
+    )
+
+    if resp.ok:
+        sessions = resp.json()['Sessions']
+        config['sessions'] = sessions
+        write_config(config)
+
+        typer.echo(
+            '\n' + typer.style(
+                'Refreshed sessions.',
+                fg=typer.colors.GREEN
+            ) + '\n'
+        )
+
+        typer.echo(json.dumps(sessions, indent=2) + '\n')
+    else:
+        try:
+            j = resp.json()
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to refresh sessions: {j["message"]}.',
+                    fg=typer.colors.RED
+                )
+            )
+
+            typer.echo(json.dumps(j, indent=2) + '\n')
+        except:
+            typer.echo(
+                '\n' + typer.style(
+                    f'Failed to refresh sessions: {resp.text}.',
+                    fg=typer.colors.RED
+                )
+            )
+# ---------------------------
+
 def main():
     app()
 

orrin_cli-0.3.0b1/orrin/default_websocket_handler.py

@@ -0,0 +1,50 @@
+import websockets
+import json
+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 with websockets.connect(
+        f"wss://stellr-company.com/terminal_sessions/connect/{session_id}",
+        additional_headers={ 'authorization': auth }
+    ) as ws:
+        await ws.send(json.dumps({'connection_type': 'handler', 'websocket_dependencies': []}))
+        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')
+
+        while True:
+            data = await ws.recv()
+            data = json.loads(data)
+
+            if not 'type' in data: continue
+
+            match data['type']:
+                case 'close':
+                    await ws.close()
+                    break
+                case 'log':
+                    if data['log_type'] == 'error':
+                        typer.echo('\n' + typer.style(
+                            f'Error: {data["log_message"]}',
+                            fg=typer.colors.RED
+                        ) + '\n')
+                    elif data['log_type'] == 'warning':
+                        typer.echo('\n' + typer.style(
+                            f'Warning: {data["log_message"]}',
+                            fg=typer.colors.YELLOW
+                        ) + '\n')
+                    else:
+                        typer.echo('\n' + typer.style(
+                            f'Log: {data["log_message"]}',
+                            fg=typer.colors.WHITE
+                        ) + '\n')
+                
+                    await ws.send(json.dumps({
+                        'type': 'respond',
+                        'response_type': 'received',
+                        'to': data["from"]
+                    }))

{orrin_cli-0.2.0.1 → orrin_cli-0.3.0b1/orrin_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orrin-cli
-Version: 0.2.0.1
+Version: 0.3.0b1
 Summary: Orrin CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
@@ -9,6 +9,10 @@ Requires-Dist: typer[all]>=0.12.0
 Requires-Dist: click<8.2
 Dynamic: license-file
 
-# Orrin CLI v0.2.0.1
+# 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.2.0.1 → orrin_cli-0.3.0b1}/orrin_cli.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 orrin/Spinner.py
 orrin/__init__.py
 orrin/cli.py
+orrin/default_websocket_handler.py
 orrin_cli.egg-info/PKG-INFO
 orrin_cli.egg-info/SOURCES.txt
 orrin_cli.egg-info/dependency_links.txt

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

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

orrin_cli-0.2.0.1/README.md

@@ -1,3 +0,0 @@
-# Orrin CLI v0.2.0.1
-
-Please refer to [the docs](https://stellr-company.com/orrin/docs) for more information over Orrin CLI.