Small changes on the logging format

Author: dieriver

examples/nativeMode/WARNINIG

@@ -0,0 +1,5 @@
+Writing SimulaQron applications using the "native" interface is deprecated.
+
+The examples in this folder are here just for completeness.
+If you want to create a SimulaQron application, please refer to the example
+in the "netqasm" folder.

simulaqron/general/host_config.py

@@ -126,8 +126,8 @@ def read_config(self, filename, network_name="default", config_type="vnode"):
                 network_config = NetworksConfigConstructor(file_path=filename).networks[network_name]
                 nodes = network_config.nodes
                 for node_name, node_config in nodes.items():
-                    hostname = getattr(node_config, "{}_hostname".format(config_type))
-                    port = getattr(node_config, "{}_port".format(config_type))
+                    hostname = getattr(node_config, f"{config_type}_hostname")
+                    port = getattr(node_config, f"{config_type}_port")
                     self.hostDict[node_name] = Host(node_name, hostname, port)
 
             elif filename.endswith(".cfg"):
@@ -140,7 +140,7 @@ def read_config(self, filename, network_name="default", config_type="vnode"):
                             newHost = Host(words[0].strip(), words[1].strip(), words[2].strip())
                             self.hostDict[words[0]] = newHost
             else:
-                raise ValueError("Unknown file type {}".format(filename.split(".")[-1]))
+                raise ValueError(f"Unknown file type {filename.split(".")[-1]}")
 
     def print_details(self, name):
         """

simulaqron/netqasm_backend/executioner.py

@@ -603,7 +603,7 @@ def _sample_basis_choice(self, random_basis_set, probability_dist_spec):
             weights = self._get_probability_weights(probability_dist_spec, num_choices=2)
             basis = random.choices([Basis.ZPLUSX, Basis.ZMINUSX], weights)[0]
         else:
-            raise ValueError("Unsupported random basis choice {}".format(random_basis_set))
+            raise ValueError(f"Unsupported random basis choice {random_basis_set}")
 
         return basis
 

simulaqron/netqasm_backend/factory.py

@@ -238,7 +238,7 @@ def is_adjacent(self, remote_host_name):
                 return False
         else:
             self._logger.warning(
-                "Node {} is not in the specified topology and is therefore "
-                "assumed to have no neighbors".format(self.name)
+                f"Node {self.name} is not in the specified topology and is therefore "
+                "assumed to have no neighbors"
             )
             return False

simulaqron/network.py

@@ -92,9 +92,9 @@ def __init__(self, name=None, nodes=None, topology=None, network_config_file=Non
                 self.nodes = nodes
             self.topology = construct_topology_config(topology, self.nodes)
             if not force:
-                answer = input("Do you want to add/replace the network {} in the file {}"
-                               "with a network constisting of the nodes {}? (yes/no)"
-                               .format(self.name, self._network_config_file, self.nodes))
+                answer = input(f"Do you want to add/replace the network {self.name} in the "
+                               f"file {self._network_config_file} with a network consisting "
+                               f"of the nodes {self.nodes}? (yes/no)")
                 if answer not in ["yes", "y"]:
                     raise RuntimeError("User did not want to replace network in file")
             networks_config.add_network(node_names=self.nodes, network_name=self.name, topology=self.topology)
@@ -106,18 +106,17 @@ def __init__(self, name=None, nodes=None, topology=None, network_config_file=Non
                 node_names = networks_config.get_node_names(self.name)
                 self.topology = networks_config.networks[self.name].topology
             else:
-                raise ValueError("Network {} is not in the file {}\n"
-                                 "If you wish to add this network to the file, use the"
-                                 "--new flag.".format(self.name, self._network_config_file))
+                raise ValueError(f"Network {self.name} is not in the file {self._network_config_file}\n"
+                                 f"If you wish to add this network to the file, use the --new flag.")
             if nodes is None:
                 self.nodes = node_names
             else:
                 self.nodes = nodes
                 for node_name in self.nodes:
                     if node_name not in node_names:
-                        raise ValueError("Node {} is not in the current network {} in the file {}\n"
-                                         "If you wish to overwrite the current network in the file, use the"
-                                         "--new flag.".format(node_name, self.name, self._network_config_file))
+                        raise ValueError(f"Node {node_name} is not in the current network {self.name} "
+                                         f"in the file {self._network_config_file}\nIf you wish to overwrite "
+                                         f"the current network in the file, use the --new flag.")
 
         self._setup_processes()
 
@@ -138,7 +137,7 @@ def running(self):
                 self._running = False
                 break
             except Exception as err:
-                self._logger.exception("Got unexpected exception when trying to connect: {}".format(err))
+                self._logger.exception("Got unexpected exception when trying to connect: %s", err)
                 raise err
         else:
             self._logger.debug("Network %s is now running", self.name)
@@ -156,10 +155,10 @@ def _setup_processes(self):
         mp.set_start_method("spawn", force=True)
         for node in self.nodes:
             process_virtual = mp.Process(
-                target=start_vnode, args=(node, self.name, get_log_level()), name="VirtNode {}".format(node)
+                target=start_vnode, args=(node, self.name, get_log_level()), name=f"VirtNode {node}"
             )
             process_qnodeos = mp.Process(
-                target=start_qnodeos, args=(node, self.name, get_log_level()), name="QnodeOSNode {}".format(node)
+                target=start_qnodeos, args=(node, self.name, get_log_level()), name=f"QnodeOSNode {node}"
             )
             self.processes += [process_virtual, process_qnodeos]
 
@@ -191,14 +190,15 @@ def stop(self):
         Stops the network.
         """
         self._running = False
-        self._logger.info("Stopping network with name {}".format(self.name))
+        self._logger.info("Stopping network with name %s", self.name)
         for p in self.processes:
             while p.is_alive():
                 time.sleep(0.1)
                 try:
                     p.terminate()
                 except Exception as err:
-                    self._logger("Could not terminate one of the processes in the network due to error: {}".format(err))
+                    self._logger.warning("Could not terminate one of the processes in the"
+                                         "network due to error: %s", err)
 
 
 def construct_topology_config(topology, nodes):

simulaqron/sdk/connection.py

@@ -125,7 +125,7 @@ def _setup_network_data(
                 myHost = qnodeos_net.hostDict[name]
             else:
                 raise ValueError(
-                    "Host name '{}' is not in the qnodeos network".format(name)
+                    f"Host name '{name}' is not in the qnodeos network"
                 )
 
                 # Get IP and port number
@@ -148,7 +148,7 @@ def _setup_socket(name, addr, retry_time=0.1):
         while True:
             try:
                 logger.debug(
-                    "App %s : Trying to connect to NetQASM server (at %d)", name, addr[-1]
+                    "App %s : Trying to connect to NetQASM server (at %s)", name, addr[-1]
                 )
 
                 qnodeos_socket = socket.socket(addr[0], addr[1], addr[2])

simulaqron/settings.py

@@ -119,7 +119,7 @@ def _get_setting(self, setting):
         try:
             value = self._config[setting]
         except KeyError:
-            raise KeyError("Cannot find the setting {} in the file {}".format(setting, self._internal_settings_file))
+            raise KeyError(f"Cannot find the setting {setting} in the file {self._internal_settings_file}")
         return value
 
     def _set_setting(self, setting, value):

simulaqron/simulaqron.py

@@ -42,7 +42,7 @@ def run(self):
                 nodes = []
 
             if self.nrnodes and (self.nrnodes > len(nodes)):
-                nodes += ["Node{}".format(i) for i in range(self.nrnodes - len(nodes))]
+                nodes += [f"Node{i}" for i in range(self.nrnodes - len(nodes))]
         else:
             nodes = self.nodes
 
@@ -140,9 +140,9 @@ def start(name, nrnodes, nodes, topology, force, keep):
         return
     if new:
         if not force:
-            answer = input("Do you want to add/replace the network '{}' in the file {} "
-                           "with a new network? (yes/no)"
-                           .format(name, simulaqron_settings.network_config_file))
+            answer = input(f"Do you want to add/replace the network '{name}' in the file "
+                           f"{simulaqron_settings.network_config_file} with a new network? "
+                           f"(yes/no)")
             if not _is_positive_answer(answer):
                 print("Aborted!")
                 return
@@ -152,8 +152,8 @@ def start(name, nrnodes, nodes, topology, force, keep):
     except SystemExit as e:
         if e.code == exit.PIDFILE_INACCESSIBLE or\
            e.code == exit.DAEMONIZE_FAILED:
-            logging.debug("Failed to launch Simulaqron Daemon. "
-                          "Exit code reported by daemons: {}".format(e.code))
+            logging.debug(f"Failed to launch Simulaqron Daemon. "
+                          f"Exit code reported by daemons: {e.code}")
             print("Failed to launch SimulaQron Daemon. Aborted!")
 
 ###############
@@ -428,8 +428,9 @@ def add(name, network_name=None, hostname=None, app_port=None, qnodeos_port=None
     HOSTNAME: The host name of the node, e.g. localhost or 192.168.0.1
     """
     if not force:
-        answer = input("Do you want to add the node {} to the network {} in the file {}? (yes/no)."
-                       .format(name, network_name, simulaqron_settings.network_config_file))
+        answer = input(f"Do you want to add the node {name} to the "
+                       f"network {network_name} in the file "
+                       f"{simulaqron_settings.network_config_file}? (yes/no).")
         if not _is_positive_answer(answer):
             print("Aborting!")
             return
@@ -461,8 +462,9 @@ def remove(name, network_name=None, force=False):
     NAME: The name of the node, e.g. Alice
     """
     if not force:
-        answer = input("Do you want to remove the node {} to the network {} in the file {}? (yes/no)."
-                       .format(name, network_name, simulaqron_settings.network_config_file))
+        answer = input(f"Do you want to remove the node {name} to the network "
+                       f"{network_name} in the file "
+                       f"{simulaqron_settings.network_config_file}? (yes/no).")
         if not _is_positive_answer(answer):
             print("Aborting!")
             return
@@ -488,9 +490,9 @@ def default(network_name=None, force=False):
     Alice, Bob, Charlie, David, Eve
     """
     if not force:
-        answer = input("Do you want to set the network {} in the file {} to default,"
-                       "i.e. with nodes Alice, Bob, Charlie, David and Eve? (yes/no)."
-                       .format(network_name, simulaqron_settings.network_config_file))
+        answer = input(f"Do you want to set the network {network_name} in the file "
+                       f"{simulaqron_settings.network_config_file} to default, i.e. "
+                       f"with nodes Alice, Bob, Charlie, David and Eve? (yes/no).")
         if not _is_positive_answer(answer):
             print("Aborting!")
             return
@@ -509,7 +511,7 @@ def get(network_name=None):
     try:
         nodes = networks_config.get_node_names(network_name=network_name)
     except ValueError:
-        print("No network {}".format(network_name))
+        print(f"No network {network_name}")
     else:
         print(("{} " * len(nodes))[:-1].format(*nodes))
 

simulaqron/toolbox/manage_nodes.py

@@ -63,8 +63,8 @@ def add_node(self, node_name, network_name="default", app_hostname=None, qnodeos
             else:
                 free = self._check_port_available(hostname, port)
                 if not free:
-                    raise ValueError("Cannot add node {}, since socket address ({}, {}) is already in use."
-                                     .format(node_name, hostname, port))
+                    raise ValueError(f"Cannot add node {node_name}, since socket address "
+                                     f"({hostname}, {port}) is already in use.")
             socket_address = (hostname, port)
             self.used_sockets.append(socket_address)
             socket_addresses[i] = socket_address
@@ -164,7 +164,7 @@ def get_nodes(self, network_name="default"):
             nodes = self.networks[network_name].nodes
             return list(nodes.values())
         else:
-            raise ValueError("{} is not a network in this config".format(network_name))
+            raise ValueError(f"{network_name} is not a network in this config")
 
     def get_node_names(self, network_name="default"):
         """
@@ -180,7 +180,7 @@ def get_node_names(self, network_name="default"):
             nodes = self.networks[network_name].nodes
             return list(nodes.keys())
         else:
-            raise ValueError("{} is not a network in this config".format(network_name))
+            raise ValueError(f"{network_name} is not a network in this config")
 
     def to_dict(self):
         """
@@ -221,7 +221,7 @@ def read_from_file(self, file_path=None):
             with open(file_path, 'r') as f:
                 dict = json.load(f)
         else:
-            raise ValueError("No such file {}".format(file_path))
+            raise ValueError(f"No such file {file_path}")
 
         for network_name, network_dict in dict.items():
             nodes_dict = network_dict["nodes"]