remotivelabs-cli 0.0.1a2__tar.gz → 0.0.1a4__tar.gz

remotivelabs_cli-0.0.1a4/LICENSE

@@ -0,0 +1,17 @@
+Apache-2.0
+
+RemotiveLabs CLI
+Copyright 2022 RemotiveLabs <hello@remotivelabs.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/PKG-INFO

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

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/brokers.py

@@ -1,27 +1,17 @@
 import json
-import time
-import typer
-#import network
-from .lib.broker import Broker
-#from network import MDNS
-
-
-import argparse
-import logging
 from time import sleep
-from typing import cast
 
+import typer
 from zeroconf import (
     IPVersion,
     ServiceBrowser,
     ServiceStateChange,
     Zeroconf,
-    ZeroconfServiceTypes,
 )
 
-app = typer.Typer()
-
+from .lib.broker import Broker
 
+app = typer.Typer()
 
 
 @app.command(help="List signals on broker")
@@ -30,7 +20,7 @@ def signals(
         api_key: str = typer.Option("offline", help="Cloud Broker API-KEY", envvar='REMOTIVE_BROKER_API_KEY')
 ):
     broker = Broker(url, api_key)
-    print("Listing available signals")
+    # print("Listing available signals")
     available_signals = broker.list_signal_names()
     print(json.dumps(available_signals))
 
@@ -41,17 +31,18 @@ def namespaces(
         api_key: str = typer.Option("offline", help="Cloud Broker API-KEY", envvar='REMOTIVE_BROKER_API_KEY')
 ):
     broker = Broker(url, api_key)
-    namespaces = broker.list_namespaces()
-    print(json.dumps(namespaces))
+    namespaces_json = broker.list_namespaces()
+    print(json.dumps(namespaces_json))
+
 
 @app.command(help="Discover brokers on this network")
 def discover():
-    #print("Not implemented")
+    # print("Not implemented")
 
     zeroconf = Zeroconf(ip_version=IPVersion.V4Only)
 
-    services = ["_remotivebroker._tcp.local.","_googlecast._tcp.local."]
-    #services = list(ZeroconfServiceTypes.find(zc=zeroconf))
+    services = ["_remotivebroker._tcp.local.", "_googlecast._tcp.local."]
+    # services = list(ZeroconfServiceTypes.find(zc=zeroconf))
 
     print("\nLooking for RemotiveBrokers on your network, press Ctrl-C to exit...\n")
     browser = ServiceBrowser(zeroconf, services, handlers=[on_service_state_change])
@@ -64,25 +55,11 @@ def discover():
     finally:
         zeroconf.close()
 
-    #network.MDNS.init()
-
-    # Perform a query for 2000 ms
-    #q = MDNS.query(2000, "broker", MDNS.PROTO_TCP)
-
-    # Print out the query's result
-    #if q is not None:
-    #    for elem in q:
-    #        print(elem.instance_name())
-    #        print(elem.hostname())
-    #        print(elem.addr())
-    #        print(elem.port())
-    #        print(elem.txt())
-
 
 def on_service_state_change(
         zeroconf: Zeroconf, service_type: str, name: str, state_change: ServiceStateChange
 ) -> None:
-    #print(f"Service {name} state changed: {state_change}")
+    # print(f"Service {name} state changed: {state_change}")
 
     if state_change is ServiceStateChange.Removed:
         print(f"Service {name} was removed")
@@ -93,23 +70,24 @@ def on_service_state_change(
     if state_change is ServiceStateChange.Added:
         print(f"Discovered {name} ")
         info = zeroconf.get_service_info(service_type, name)
-        #print("Info from zeroconf.get_service_info: %r" % (info))
+        # print("Info from zeroconf.get_service_info: %r" % (info))
 
         if info:
-            #addresses = ["%s:%d" % (addr, cast(int, info.port)) for addr in info.parsed_scoped_addresses()]
+            # addresses = ["%s:%d" % (addr, cast(int, info.port)) for addr in info.parsed_scoped_addresses()]
             for addr in info.parsed_scoped_addresses():
                 print(addr)
-            #print("  Weight: %d, priority: %d" % (info.weight, info.priority))
-            #print(f"  Server: {info.server}")
-            #if info.properties:
+            # print("  Weight: %d, priority: %d" % (info.weight, info.priority))
+            # print(f"  Server: {info.server}")
+            # if info.properties:
             #    print("  Properties are:")
             #    for key, value in info.properties.items():
             #        print(f"    {key}: {value}")
-            #else:
+            # else:
             #    print("  No properties")
         else:
             print("  No info")
         print('\n')
 
+
 if __name__ == "__main__":
     app()

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/cloud/auth.py

@@ -8,19 +8,21 @@ from pathlib import Path
 from threading import Thread
 import typer
 from . import rest_helper as rest
+from . import auth_keys
 
 app = typer.Typer()
-
+app.add_typer(auth_keys.app, name="keys", help="Manage users personal access keys")
 config_dir_name = str(Path.home()) + "/.config/.remotive/"
 token_file_name = str(Path.home()) + "/.config/.remotive/cloud.secret.token"
 
 
+
 class S(BaseHTTPRequestHandler):
     def _set_response(self):
         self.send_response(200)
-        #self.send_response(301)
-        #self.send_header('Location', 'https://cloud.remotivelabs.com')
-        #self.end_headers()
+        # self.send_response(301)
+        # self.send_header('Location', 'https://cloud.remotivelabs.com')
+        # self.end_headers()
         self.send_header('Content-type', 'text/html')
         self.end_headers()
 
@@ -55,26 +57,32 @@ def login():
     webbrowser.open(f'{rest.base_url}/login?redirectUrl=http://localhost:8089', new=1, autoraise=True)
     start_local_webserver()
 
+@app.command(help="Who am I?")
+def whoami():
+    rest.handle_get('/api/whoami')
 
 @app.command(help="Print access token")
 def print_access_token():
     print(read_token())
 
+
 @app.command(help="List available auth tokens")
 def list():
     for file in os.listdir(config_dir_name):
         print(file)
 
+
 @app.command(help="Show token file")
 def describe(
         file: str = typer.Option(..., help="File name")):
     print(read_file(file))
 
 
+
+
 @app.command(help="Activate the account file")
 def activate(
         file: str = typer.Option(..., help="File name")):
-
     # Best effort to read file
     if os.path.exists(file):
         token_file = json.loads(read_file_with_path(file))
@@ -106,23 +114,29 @@ def read_token():
     f.close()
     return token
 
+
 def read_file_with_path(file):
     f = open(file, "r")
     token = f.read()
     f.close()
     return token
 
+
 def read_file(file):
     f = open(str(Path.home()) + f"/.config/.remotive/{file}", "r")
     token = f.read()
     f.close()
     return token
 
+
 def write_token(token):
     f = open(token_file_name, "w")
     f.write(token)
     f.close()
 
+
+
+
 # Key stuff
 # f = open(str(Path.home())+ "/.remotivelabs/privatekey.json", "r")
 # j = json.loads(f.read())

remotivelabs_cli-0.0.1a4/cli/cloud/auth_keys.py

@@ -0,0 +1,46 @@
+from pathlib import Path
+
+import typer
+from . import rest_helper as rest
+
+app = typer.Typer()
+
+
+@app.command(name="create", help="Create and download a new personal access token")
+def get_personal_access_token():
+    rest.ensure_auth_token()
+    rest.handle_post('/api/me/keys')
+
+    response = rest.handle_post(url='/api/me/keys',
+                                return_response=True)
+
+    if response.status_code == 200:
+        name = response.json()['name']
+        write_personal_token(f"personal-{name}-key.json", response.text)
+    else:
+        print(f'Got status code: {response.status_code}')
+        print(response.text)
+
+
+@app.command(name="list", help="List personal access tokens")
+def list_personal_access_tokens():
+    rest.ensure_auth_token()
+    rest.handle_get('/api/me/keys')
+
+
+@app.command(name="revoke", help="Revoke the specified key")
+def revoke(
+        key_name: str = typer.Option(..., help="Name of the key to revoke")
+):
+    rest.ensure_auth_token()
+    rest.handle_delete(f'/api/me/keys/{key_name}')
+
+
+def write_personal_token(file, token):
+    path = str(Path.home()) + f"/.config/.remotive/{file}"
+    f = open(path, "w")
+    f.write(token)
+    f.close()
+    print(f"Personal key written to {path}")
+    print("Use 'remotive cloud auth activate filename' to use this key from cli")
+    print('\033[93m This file contains secrets and must never be compromised')

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/cloud/brokers.py

@@ -2,7 +2,7 @@ import typer
 import json
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from . import rest_helper as rest
-
+from rich import print
 app = typer.Typer()
 
 

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/cloud/cloud_cli.py

@@ -1,19 +1,11 @@
-import time
-
 import typer
-import json
-from rich.progress import Progress, SpinnerColumn, TextColumn
-from . import recordings, brokers, configs, auth, service_accounts
+
+from . import recordings, brokers, configs, auth, service_accounts, projects
 from . import rest_helper as rest
 
 app = typer.Typer()
 
 
-@app.command(help="Who am I?")
-def whoami():
-    rest.handle_get('/api/whoami')
-
-
 @app.command(help="List licenses for an organisation")
 def licenses(
         organisation: str = typer.Option(..., help="Organisation ID", envvar='REMOTIVE_CLOUD_ORGANISATION'),
@@ -41,10 +33,11 @@ def users(
     rest.handle_get(f"/api/bu/{organisation}/users")
 
 
+app.add_typer(projects.app, name="projects", help="Manage projects")
+app.add_typer(auth.app, name="auth", help="Manage access to cloud resources")
 app.add_typer(brokers.app, name="brokers", help="Manage cloud broker lifecycle")
 app.add_typer(recordings.app, name="recordings", help="Manage recordings")
-app.add_typer(configs.app, name="configs", help="Manage signal databases")
-app.add_typer(auth.app, name="auth", help="Manage access to cloud resources")
+app.add_typer(configs.app, name="signal-databases", help="Manage signal databases")
 app.add_typer(service_accounts.app, name="service-accounts", help="Manage project service account keys")
 
 

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/cloud/configs.py

@@ -1,11 +1,10 @@
+import shutil
 import sys
 
-import typer
 import requests
-import os
-import json
-import shutil
+import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
+
 from . import rest_helper as rest
 
 app = typer.Typer()

remotivelabs_cli-0.0.1a4/cli/cloud/projects.py

@@ -0,0 +1,30 @@
+import json
+
+import typer
+from . import rest_helper as rest
+app = typer.Typer()
+
+
+@app.command(name="list", help="List your projects")
+def list_projects(organisation: str = typer.Option(..., help="Organisation ID", envvar='REMOTIVE_CLOUD_ORGANISATION')):
+    r = rest.handle_get(url=f'/api/bu/{organisation}/me',  return_response=True)
+    if r.status_code == 200:
+        projects = r.json()['projects']
+        projects = map(lambda p: p['uid'], projects)
+        print(json.dumps(list(projects)))
+
+
+@app.command(name="create")
+def create_project(
+    organisation: str = typer.Option(..., help="Organisation ID", envvar='REMOTIVE_CLOUD_ORGANISATION'),
+    project_uid: str = typer.Option(..., help="Project UID"),
+    project_display_name: str = typer.Option(default="", help="Project display name")
+):
+
+    create_project_req = {
+        'uid': project_uid,
+        'displayName': project_display_name if project_display_name != "" else project_uid,
+        'description': ''
+    }
+
+    rest.handle_post(url=f'/api/bu/{organisation}/project', body=json.dumps(create_project_req))

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/cloud/rest_helper.py

@@ -6,7 +6,7 @@ import json
 import logging
 from pathlib import Path
 from os.path import exists
-
+#from rich import print
 import typer
 
 if 'REMOTIVE_CLOUD_HTTP_LOGGING' in os.environ:
@@ -51,9 +51,13 @@ def ensure_auth_token():
     headers = {"Authorization": "Bearer " + token.strip()}
 
 
-def handle_get(url, params={}):
+def handle_get(url, params={},return_response: bool = False):
     ensure_auth_token()
     r = requests.get(f'{base_url}{url}', headers=headers, params=params)
+
+    if return_response:
+        return r
+
     if r.status_code == 200:
         print(json.dumps(r.json()))
     else:
@@ -97,3 +101,4 @@ def handle_post(url, body=None, params={}, return_response: bool = False):
         print(r.status_code)
     else:
         print(f'Got status code: {r.status_code}')
+        print(r.text)

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/cloud/service_account_keys.py

@@ -35,6 +35,14 @@ def list_keys(
     rest.handle_get(f"/api/project/{project}/admin/accounts/{service_account}/keys")
 
 
+@app.command(name="revoke", help="Revoke service account key")
+def revoke(
+        service_account: str = typer.Option(..., help="Service account name"),
+        key_name: str = typer.Option(..., help="Key name"),
+        project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT')):
+    rest.handle_delete(f"/api/project/{project}/admin/accounts/{service_account}/keys/{key_name}")
+
+
 def write_token(file, token):
     path = str(Path.home()) + f"/.config/.remotive/{file}"
     f = open(path, "w")

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/cloud/service_accounts.py

@@ -1,10 +1,8 @@
+import json
+from typing import List
+
 import typer
-# from typing_extensions import Annotated
-from typing import List, Optional
 
-import json
-from rich.progress import Progress, SpinnerColumn, TextColumn
-import sys
 from . import rest_helper as rest
 from . import service_account_keys
 
@@ -12,12 +10,12 @@ app = typer.Typer()
 
 
 @app.command(name="list", help="List service-accounts")
-def list(project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT')):
+def list_service_accounts(project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT')):
     rest.handle_get(f"/api/project/{project}/admin/accounts")
 
 
 @app.command(name="create", help="Create service account")
-def create(
+def create_service_account(
         name: str,
         role: List[str] = typer.Option(..., help="Roles to apply"),
         project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT')):
@@ -29,7 +27,7 @@ def create(
 
 
 @app.command(name="delete", help="Create service account")
-def delete(
+def delete_service_account(
         name: str,
         project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT')):
     rest.handle_delete(url=f"/api/project/{project}/admin/accounts/{name}")

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/cli/remotive.py

@@ -1,13 +1,9 @@
 import typer
 from .brokers import app as broker_app
 from .cloud.cloud_cli import app as cloud_app
-
-# from cloud import cloud_cli
+from rich import print
 
 app = typer.Typer()
 
-
-# def run_cli():
-
 app.add_typer(broker_app, name="broker", help="Manage a single broker - local or cloud")
 app.add_typer(cloud_app, name="cloud", help="Manage resources in RemotiveCloud", )

{remotivelabs_cli-0.0.1a2 → remotivelabs_cli-0.0.1a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.0.1.a2"
+version = "0.0.1.alpha4"
 description = ""
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"
@@ -14,8 +14,6 @@ rich = "^12.6.0"
 cryptography = "40.0.2"
 pyjwt = "^2.6.0"
 zeroconf = "^0.64.1"
-#urllib3 = ">=1.26"
-#requests = ">=2.25"
 
 [tool.poetry.scripts]
 remotive = "cli.remotive:app"