remotivelabs-cli 0.0.1a13__py3-none-any.whl → 0.0.1a15__py3-none-any.whl

cli/cloud/auth_tokens.py

@@ -35,11 +35,10 @@ def list_personal_access_tokens():
 
 @app.command(name="revoke", help="Revoke the specified access token")
 def revoke(
-        token_name: str = typer.Option(..., help="Name of the access token to revoke")
+        name: str = typer.Option(..., help="Name of the access token to revoke")
 ):
     rest.ensure_auth_token()
-    rest.handle_delete(f'/api/me/keys/{token_name}')
-
+    rest.handle_delete(f'/api/me/keys/{name}', success_msg="Successfully revoked")
 
 @app.command()
 def describe(

cli/cloud/recordings.py

@@ -1,13 +1,16 @@
 import sys
 import signal
 import re
+import pathlib
 from multiprocessing import Process
 import typer
 import requests
 import os
+
+import glob
 import json
 import shutil
-from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.progress import Progress, SpinnerColumn, TextColumn,TaskProgressColumn
 from . import rest_helper as rest
 
 app = typer.Typer()
@@ -192,6 +195,101 @@ def upload(path: str  = typer.Argument(..., help="Path to valid recording to upl
         else:
             print(r.text)
 
+@app.command()
+def upload_broker_configuration(
+        directory:str = typer.Argument(..., help="Configuration directory"),
+        recording_session: str = typer.Option(..., help="Recording session id", envvar='REMOTIVE_CLOUD_RECORDING_SESSION'),
+        project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT'),
+        overwrite: bool = typer.Option(False, help="Overwrite existing configuration if it exists")
+):
+    with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            transient=True,
+    ) as progress:
+
+        #
+        # List files in specified directory. Look for interfaces.json and use that directory where this is located
+        # as configuration home directory
+        #
+        files = list(filter(lambda item : "interfaces.json" in item, glob.iglob(directory + '**/**', recursive=True)))
+        if len(files) == 0:
+            sys.stderr.write("No interfaces.json found in directory, this file is required")
+            raise typer.Exit(1)
+        if len(files) > 1:
+            sys.stderr.write(f"{len(files)} interfaces.json found in directoryw which is not supported")
+            raise typer.Exit(1)
+        broker_config_dir_name = os.path.dirname(files[0]).rsplit('/', 1)[-1]
+
+        #
+        # Get the current details about broker configurations to see if a config with this
+        # name already exists
+        #
+        task=progress.add_task(description=f"Preparing upload of {broker_config_dir_name}", total=1)
+        details_resp=rest.handle_get(f"/api/project/{project}/files/recording/{recording_session}", return_response=True)
+        details=details_resp.json()
+        existing_configs = details['brokerConfigurations']
+        if (len(existing_configs) > 0):
+            data=list(filter(lambda x : x['name'] == broker_config_dir_name, existing_configs))
+            if len(data) > 0:
+                if (overwrite):
+                    rest.handle_delete(f'/api/project/{project}/files/recording/{recording_session}/configuration/{broker_config_dir_name}', quiet=True)
+                else:
+                    sys.stderr.write("Broker configuration already exists, use --overwrite to replace\n")
+                    raise typer.Exit(1)
+
+        #
+        # From the list of files, create a tuple of local_path to the actual file
+        # and a remote path as it should be stored in cloud
+        #
+        file_infos = list(map(lambda item :
+                     { 'local_path' : item,
+                     'remote_path' : f"/{broker_config_dir_name}{item.rsplit(broker_config_dir_name,1)[-1]}"} ,glob.iglob(directory + '**/*.*', recursive=True)))
+
+        #
+        # convert this remote paths and ask cloud to prepare upload urls for those
+        #
+        json_request_upload_urls_req = {
+            'name' : 'not_used',
+            'paths' : list(map(lambda x: x['remote_path'], file_infos))
+        }
+
+        response = rest.handle_put(url = f'/api/project/{project}/files/recording/{recording_session}/configuration', return_response=True, body=json.dumps(json_request_upload_urls_req))
+        if (response.status_code != 200):
+            print(f'Failed to prepare configuration upload')
+            print(f'{response.text} - {response.status_code}')
+            raise typer.Exit(1)
+        progress.update(task, advance=1)
+
+
+
+        task=progress.add_task(description=f"Uploading {broker_config_dir_name}", total=len(file_infos))
+
+        #
+        # Upload urls is a  remote_path : upload_url dict
+        # '/my_config/interfaces.json' : "<upload_url>"
+        #
+        upload_urls = json.loads(response.text)
+
+        # For each file - upload
+        for file in file_infos:
+            key=file['remote_path']
+            path=file['local_path']
+            url=upload_urls[key]
+            headers={
+                'Content-Type' : "application/x-www-form-urlencoded"
+            }
+            r = requests.put(url, open(path, 'rb'), headers=headers)
+            progress.update(task, advance=1)
+            if r.status_code != 200:
+                print("Failed to upload broker configuration")
+                print(r.status_code)
+                print(r.text)
+                typer.Exit(1)
+
+        print(f"Successfully uploaded broker configuration {broker_config_dir_name}")
+
+
 
 @app.command(help="Downloads the specified broker configuration directory as zip file")
 def download_configuration(

cli/cloud/rest_helper.py

@@ -77,17 +77,19 @@ def has_access(url, params={}):
         return True
 
 
-def handle_delete(url, params={}):
+def handle_delete(url, params={}, quiet=False, success_msg="Successfully deleted"):
     ensure_auth_token()
     r = requests.delete(f'{base_url}{url}', headers=headers, params=params)
     if r.status_code == 200:
-        print(json.dumps(r.json()))
+        if quiet == False:
+            print(json.dumps(r.json()))
     if r.status_code == 204:
-        sys.stderr.write('Successfully deleted\n')
+        if quiet == False:
+            sys.stderr.write(f'{success_msg}\n')
     else:
         print(f'Got status code: {r.status_code}')
         print(r.text)
-
+        typer.Exit(1)
 
 def handle_post(url, body=None, params={}, return_response: bool = False):
     ensure_auth_token()

cli/cloud/service_account_tokens.py

@@ -47,10 +47,10 @@ def list_files():
 
 @app.command(name="revoke", help="Revoke service account access token")
 def revoke(
+        name: str = typer.Argument(..., help="Access token name"),
         service_account: str = typer.Option(..., help="Service account name"),
-        token_name: str = typer.Option(..., help="Access token name"),
         project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT')):
-    rest.handle_delete(f"/api/project/{project}/admin/accounts/{service_account}/keys/{token_name}")
+    rest.handle_delete(f"/api/project/{project}/admin/accounts/{service_account}/keys/{name}")
 
 
 def write_token(file, token):

{remotivelabs_cli-0.0.1a13.dist-info → remotivelabs_cli-0.0.1a15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remotivelabs-cli
-Version: 0.0.1a13
+Version: 0.0.1a15
 Summary: 
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com

{remotivelabs_cli-0.0.1a13.dist-info → remotivelabs_cli-0.0.1a15.dist-info}/RECORD

@@ -3,22 +3,22 @@ cli/__init__.py,sha256=Mjnyow0Ngm-b-SdPz4HAkREzch7wKZ2Wy_hxLez49Lc,26
 cli/brokers.py,sha256=aBPML6W0nbCaAu5LLHGzRSiPV_TQhB17fi6oPWLb22U,5365
 cli/cloud/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 cli/cloud/auth.py,sha256=h7xnxGQmZ-8AxbjXstXFy6BD6bsGbkIRlRaRAKZnlw0,3547
-cli/cloud/auth_tokens.py,sha256=Jz2dZdlqECYqy43nPqRybGfbhJAr9hq2XY5IgHwGCVc,3118
+cli/cloud/auth_tokens.py,sha256=WWfnUlwc703JQrv9HyN2aRlhqYV-nvSE_gmrwXWvumE,3141
 cli/cloud/brokers.py,sha256=-R1F4gpiIUfr8__QbP_CxVvH7ZdVBgKApP7cregn5Uo,3685
 cli/cloud/cloud_cli.py,sha256=un7h49FbIf-IrW_51cTx2CyBK7pUg4A2zs768p9sxN8,1348
 cli/cloud/configs.py,sha256=2qPP4XxVO4deVT0srdP4FN6IRj4Ig4i9229thtfO710,3507
 cli/cloud/projects.py,sha256=w5Oqie80e59XrMNiIxIUIrlt3frYOyOpCbalkqZR7RQ,1366
-cli/cloud/recordings.py,sha256=rOCYkMtSMkpSaCwUsLIZwZWWvJvM5sfYN4Jg1Nj1y-Q,10198
-cli/cloud/rest_helper.py,sha256=oUAga7ibQqlJhukabOR0DZmmrFGWH9Bj0O3FrAeChlw,3562
-cli/cloud/service_account_tokens.py,sha256=VrwF6WhIFzEFhgqbH1CsZeFz7fy2w8Ab_WHxAFYOq7U,2332
+cli/cloud/recordings.py,sha256=k2bfRLD482HOwtjn4CYqGhdIuAzP0R0mzmlI1VrARlc,14592
+cli/cloud/rest_helper.py,sha256=8mHu-IEku-fs9mLYpJT0uPl7gwgx97dEEXN2u31Y7LA,3688
+cli/cloud/service_account_tokens.py,sha256=24GebX1JE3ATHfUGSDTZzcH3qmeJ9x34VSpJYGNX_hM,2322
 cli/cloud/service_accounts.py,sha256=jpiSuteew_9hz0-dtLbLfavM9Bg6Zs2wTbS2a-4FVwM,1630
 cli/lib/__about__.py,sha256=GLOW8iEx5xn9rbJvxUH3elZiLi47SAWamMjdJTd52k0,141
 cli/lib/broker.py,sha256=6LUSC4-KhixXHkeclXZblIQ8xLMzmkoJp1ldcnp3el8,5123
 cli/remotive.py,sha256=3tqaStMU1HZy2BQoNjXOHXw4Sb0-yP80yP3R8SVGK_0,432
 cli/requirements.txt,sha256=k2SdtUayWWypl_24paMPHrMu7oH0E3_S_9w9zdAng-Y,77
 cli/test/test_simple.py,sha256=c60_dg5EmhNVmBC6rDcDP-tvKJCBqjIA2Z5Ym9ums4M,63
-remotivelabs_cli-0.0.1a13.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.0.1a13.dist-info/METADATA,sha256=sb3oTxgb_da41aGj54Tk10KrQo2_try5gnIhgDlLsro,2790
-remotivelabs_cli-0.0.1a13.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-remotivelabs_cli-0.0.1a13.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.0.1a13.dist-info/RECORD,,
+remotivelabs_cli-0.0.1a15.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.0.1a15.dist-info/METADATA,sha256=6HskOGehbXCRNcid28l5CfYZy_RsfiBXHKQUBS6HvB0,2790
+remotivelabs_cli-0.0.1a15.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+remotivelabs_cli-0.0.1a15.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.0.1a15.dist-info/RECORD,,