fixed acc to feedback

scaleoutsystems · Nov 13, 2024 · 794a0b1 · 794a0b1
1 parent ef2543d
commit 794a0b1
Show file tree

Hide file tree

Showing 9 changed files with 303 additions and 134 deletions.
diff --git a/fedn/cli/client_cmd.py b/fedn/cli/client_cmd.py
@@ -39,11 +39,10 @@ def client_cmd(ctx):
 @click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
 @click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
 @click.option("-t", "--token", required=False, help="Authentication token")
-@click.option("-id", "--id", required=False, help="Client ID")
 @click.option("--n_max", required=False, help="Number of items to list")
 @client_cmd.command("list")
 @click.pass_context
-def list_clients(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None, n_max: int = None):
+def list_clients(ctx, protocol: str, host: str, port: str, token: str = None, n_max: int = None):
     """Return:
     ------
     - count: number of clients
@@ -58,6 +57,38 @@ def list_clients(ctx, protocol: str, host: str, port: str, token: str = None, id
 
     _token = get_token(token)
 
+    if _token:
+        headers["Authorization"] = _token
+
+
+    click.echo(f"\nListing clients: {url}\n")
+    click.echo(f"Headers: {headers}")
+    try:
+        response = requests.get(url, headers=headers)
+        print_response(response, "clients", None)
+    except requests.exceptions.ConnectionError:
+        click.echo(f"Error: Could not connect to {url}")
+
+
+@click.option("-p", "--protocol", required=False, default=CONTROLLER_DEFAULTS["protocol"], help="Communication protocol of controller (api)")
+@click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
+@click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
+@click.option("-t", "--token", required=False, help="Authentication token")
+@click.option("-id", "--id", required=False, help="Client ID")
+@client_cmd.command("get")
+@click.pass_context
+def get_client(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None):
+    """Return:
+    ------
+    - count: number of clients
+    - result: list of clients
+
+    """
+    url = get_api_url(protocol=protocol, host=host, port=port, endpoint="clients")
+    headers = {}
+
+    _token = get_token(token)
+
     if _token:
         headers["Authorization"] = _token
 
@@ -66,18 +97,14 @@ def list_clients(ctx, protocol: str, host: str, port: str, token: str = None, id
         headers["id"] = id
 
 
-    click.echo(f"\nListing clients: {url}\n")
+    click.echo(f"\nRetrieving client: {url}\n")
     click.echo(f"Headers: {headers}")
     try:
         response = requests.get(url, headers=headers)
-        if id:
-            print_response(response, "client", True)
-        else:
-            print_response(response, "clients", False)
+        print_response(response, "client", id)
     except requests.exceptions.ConnectionError:
         click.echo(f"Error: Could not connect to {url}")
 
-
 @client_cmd.command("start")
 @click.option("-d", "--discoverhost", required=False, help="Hostname for discovery services(reducer).")
 @click.option("-p", "--discoverport", required=False, help="Port for discovery services (reducer).")

diff --git a/fedn/cli/combiner_cmd.py b/fedn/cli/combiner_cmd.py
@@ -67,11 +67,10 @@ def start_cmd(ctx, discoverhost, discoverport, token, name, host, port, fqdn, se
 @click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
 @click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
 @click.option("-t", "--token", required=False, help="Authentication token")
-@click.option("-id", "--id", required=False, help="Combiner ID")
 @click.option("--n_max", required=False, help="Number of items to list")
 @combiner_cmd.command("list")
 @click.pass_context
-def list_combiners(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None, n_max: int = None):
+def list_combiners(ctx, protocol: str, host: str, port: str, token: str = None, n_max: int = None):
     """Return:
     ------
     - count: number of combiners
@@ -84,6 +83,38 @@ def list_combiners(ctx, protocol: str, host: str, port: str, token: str = None,
     if n_max:
         headers["X-Limit"] = n_max
 
+    _token = get_token(token)
+
+    if _token:
+        headers["Authorization"] = _token
+
+
+    click.echo(f"\nListing combiners: {url}\n")
+    click.echo(f"Headers: {headers}")
+    try:
+        response = requests.get(url, headers=headers)
+        print_response(response, "combiners", None)
+    except requests.exceptions.ConnectionError:
+        click.echo(f"Error: Could not connect to {url}")
+
+
+@click.option("-p", "--protocol", required=False, default=CONTROLLER_DEFAULTS["protocol"], help="Communication protocol of controller (api)")
+@click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
+@click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
+@click.option("-t", "--token", required=False, help="Authentication token")
+@click.option("-id", "--id", required=False, help="Combiner ID")
+@combiner_cmd.command("get")
+@click.pass_context
+def get_combiner(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None):
+    """Return:
+    ------
+    - result: combiner with given id
+
+    """
+    url = get_api_url(protocol=protocol, host=host, port=port, endpoint="combiners")
+    headers = {}
+
+
     _token = get_token(token)
 
     if _token:
@@ -94,13 +125,10 @@ def list_combiners(ctx, protocol: str, host: str, port: str, token: str = None,
         headers["id"] = id
 
 
-    click.echo(f"\nListing combiners: {url}\n")
+    click.echo(f"\nRetrieving combiner: {url}\n")
     click.echo(f"Headers: {headers}")
     try:
         response = requests.get(url, headers=headers)
-        if id:
-            print_response(response, "combiner", True)
-        else:
-            print_response(response, "combiners", False)
+        print_response(response, "combiner", id)
     except requests.exceptions.ConnectionError:
         click.echo(f"Error: Could not connect to {url}")
diff --git a/fedn/cli/model_cmd.py b/fedn/cli/model_cmd.py
@@ -17,24 +17,62 @@ def model_cmd(ctx):
 @click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
 @click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
 @click.option("-t", "--token", required=False, help="Authentication token")
-@click.option("-id", "--id", required=False, help="Model ID")
 @click.option("-session_id", "--session_id", required=False, help="models in session with given session id")
 @click.option("--n_max", required=False, help="Number of items to list")
 @model_cmd.command("list")
 @click.pass_context
-def list_models(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None, session_id: str = None, n_max: int = None):
+def list_models(ctx, protocol: str, host: str, port: str, token: str = None, session_id: str = None, n_max: int = None):
     """Return:
     ------
     - count: number of models
     - result: list of models
 
     """
     url = get_api_url(protocol=protocol, host=host, port=port, endpoint="models")
+
+
     headers = {}
 
     if n_max:
         headers["X-Limit"] = n_max
 
+    _token = get_token(token)
+
+    if _token:
+        headers["Authorization"] = _token
+
+    if session_id:
+        url = f"{url}?session_id={session_id}"
+        headers["session_id"] = session_id
+
+    click.echo(f"\nListing models: {url}\n")
+    click.echo(f"Headers: {headers}")
+    try:
+        response = requests.get(url, headers=headers)
+        print_response(response, "models", None)
+    except requests.exceptions.ConnectionError:
+        click.echo(f"Error: Could not connect to {url}")
+
+
+@click.option("-p", "--protocol", required=False, default=CONTROLLER_DEFAULTS["protocol"], help="Communication protocol of controller (api)")
+@click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
+@click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
+@click.option("-t", "--token", required=False, help="Authentication token")
+@click.option("-id", "--id", required=False, help="Model ID")
+@model_cmd.command("get")
+@click.pass_context
+def get_model(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None):
+    """Return:
+    ------
+    - result: model with given id
+
+    """
+    url = get_api_url(protocol=protocol, host=host, port=port, endpoint="models")
+
+
+    headers = {}
+
+
     _token = get_token(token)
 
     if _token:
@@ -44,32 +82,10 @@ def list_models(ctx, protocol: str, host: str, port: str, token: str = None, id:
         url = f"{url}{id}"
         headers["id"] = id
 
-
-    click.echo(f"\nListing models: {url}\n")
+    click.echo(f"\nRetrieving model: {url}\n")
     click.echo(f"Headers: {headers}")
     try:
         response = requests.get(url, headers=headers)
-        if session_id:
-            if response.status_code == 200:
-                json_data = response.json()
-                count, result = json_data.values()
-                click.echo(f"Found {count} models")
-                click.echo("\n---------------------------------\n")
-                for obj in result:
-                    if obj.get("session_id")==session_id:
-                        click.echo("{")
-                        for k, v in obj.items():
-                            click.echo(f"\t{k}: {v}")
-                        click.echo("}")
-
-            elif response.status_code == 500:
-                json_data = response.json()
-                click.echo(f'Error: {json_data["message"]}')
-            else:
-                click.echo(f"Error: {response.status_code}")
-        elif id:
-            print_response(response, "model", True, session_id)
-        else:
-            print_response(response, "models", False, session_id)
+        print_response(response, "model", id)
     except requests.exceptions.ConnectionError:
         click.echo(f"Error: Could not connect to {url}")
diff --git a/fedn/cli/package_cmd.py b/fedn/cli/package_cmd.py
@@ -45,11 +45,10 @@ def create_cmd(ctx, path, name):
 @click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
 @click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
 @click.option("-t", "--token", required=False, help="Authentication token")
-@click.option("-id", "--id", required=False, help="Package ID")
 @click.option("--n_max", required=False, help="Number of items to list")
 @package_cmd.command("list")
 @click.pass_context
-def list_packages(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None, n_max: int = None):
+def list_packages(ctx, protocol: str, host: str, port: str, token: str = None, n_max: int = None):
     """Return:
     ------
     - count: number of packages
@@ -62,6 +61,38 @@ def list_packages(ctx, protocol: str, host: str, port: str, token: str = None, i
     if n_max:
         headers["X-Limit"] = n_max
 
+    _token = get_token(token)
+
+    if _token:
+        headers["Authorization"] = _token
+
+
+    click.echo(f"\nListing packages: {url}\n")
+    click.echo(f"Headers: {headers}")
+    try:
+        response = requests.get(url, headers=headers)
+        print_response(response, "packages", None)
+    except requests.exceptions.ConnectionError:
+        click.echo(f"Error: Could not connect to {url}")
+
+
+@click.option("-p", "--protocol", required=False, default=CONTROLLER_DEFAULTS["protocol"], help="Communication protocol of controller (api)")
+@click.option("-H", "--host", required=False, default=CONTROLLER_DEFAULTS["host"], help="Hostname of controller (api)")
+@click.option("-P", "--port", required=False, default=CONTROLLER_DEFAULTS["port"], help="Port of controller (api)")
+@click.option("-t", "--token", required=False, help="Authentication token")
+@click.option("-id", "--id", required=False, help="Package ID")
+@package_cmd.command("get")
+@click.pass_context
+def get_package(ctx, protocol: str, host: str, port: str, token: str = None, id: str = None):
+    """Return:
+    ------
+    - result: package with given id
+
+    """
+    url = get_api_url(protocol=protocol, host=host, port=port, endpoint="packages")
+    headers = {}
+
+
     _token = get_token(token)
 
     if _token:
@@ -72,13 +103,10 @@ def list_packages(ctx, protocol: str, host: str, port: str, token: str = None, i
         headers["id"] = id
 
 
-    click.echo(f"\nListing packages: {url}\n")
+    click.echo(f"\nretrieving package: {url}\n")
     click.echo(f"Headers: {headers}")
     try:
         response = requests.get(url, headers=headers)
-        if id:
-            print_response(response, "package", True)
-        else:
-            print_response(response, "packages", False)
+        print_response(response, "package", id)
     except requests.exceptions.ConnectionError:
         click.echo(f"Error: Could not connect to {url}")