Bug/SK-931 | --preferred-combiner should not be boolean

examples/async-clients/run_clients.py

@@ -47,7 +47,7 @@
     "secure": False,
     "preshared_cert": False,
     "verify": False,
-    "preferred_combiner": False,
+    "combiner": "combiner",
     "validator": True,
     "trainer": True,
     "init": None,

fedn/cli/client_cmd.py

@@ -79,7 +79,7 @@ def list_clients(ctx, protocol: str, host: str, port: str, token: str = None, n_
 @click.option("-s", "--secure", required=False, default=False)
 @click.option("-pc", "--preshared-cert", required=False, default=False)
 @click.option("-v", "--verify", is_flag=True, help="Verify SSL/TLS for REST service")
-@click.option("-c", "--preferred-combiner", required=False, default=False)
+@click.option("-c", "--preferred-combiner", type=str,required=False, default="combiner",help="name of the preferred combiner")
 @click.option("-va", "--validator", required=False, default=True)
 @click.option("-tr", "--trainer", required=False, default=True)
 @click.option("-in", "--init", required=False, default=None, help="Set to a filename to (re)init client from file state.")

fedn/cli/run_cmd.py

@@ -182,7 +182,7 @@ def build_cmd(ctx, path):
 @click.option("-s", "--secure", required=False, default=False)
 @click.option("-pc", "--preshared-cert", required=False, default=False)
 @click.option("-v", "--verify", is_flag=True, help="Verify SSL/TLS for REST service")
-@click.option("-c", "--preferred-combiner", required=False, default=False)
+@click.option("-c", "--preferred-combiner", required=False,type=str, default="combiner",help="url to the combiner or name of the preferred combiner")
 @click.option("-va", "--validator", required=False, default=True)
 @click.option("-tr", "--trainer", required=False, default=True)
 @click.option("-in", "--init", required=False, default=None, help="Set to a filename to (re)init client from file state.")
@@ -262,7 +262,6 @@ def client_cmd(
         apply_config(init, config)
         click.echo(f"\nClient configuration loaded from file: {init}")
         click.echo("Values set in file override defaults and command line arguments...\n")
-
     try:
         validate_client_config(config)
     except InvalidClientConfig as e:

fedn/network/clients/connect.py

@@ -38,7 +38,7 @@ class ConnectorClient:
     :param force_ssl: True if https is used, False if http
     :type force_ssl: bool
     :param verify: True if certificate is verified, False if not
-    :type verify: bool
+    :type verify: str
     :param combiner: name of preferred combiner
     :type combiner: str
     :param id: id of client