Fix f-strings and other Python formatting

Author: abejgonzalez

conda-reqs/conda-reqs.conda-lock.yml

@@ -118,6 +118,7 @@ dependencies:
     - s3fs==0.4.2
     - aiohttp
     - autoflake
+    - flynt
     - pip
     - pip:
         - sure

conda-reqs/firesim.yaml

@@ -53,7 +53,7 @@ def copy_afi_to_all_regions(afi_id, starting_region=None):
     starting_region = (
         starting_region if starting_region is not None else get_current_region()
     )
-    logging.info("""Copy starting region is: {}""".format(starting_region))
+    logging.info(f"""Copy starting region is: {starting_region}""")
 
     # list of regions to make the agfi available in
     # (make a copy)
@@ -62,8 +62,8 @@ def copy_afi_to_all_regions(afi_id, starting_region=None):
     # remove the starting region, otherwise aws will create duplicate afis
     copy_to_regions.remove(starting_region)
 
-    logging.info("""Regions to copy to: {}""".format(copy_to_regions))
-    logging.info("""Copying AFI: {}""".format(afi_id))
+    logging.info(f"""Regions to copy to: {copy_to_regions}""")
+    logging.info(f"""Copying AFI: {afi_id}""")
 
     for region in copy_to_regions:
         client = boto3.client("ec2", region_name=region)
@@ -98,7 +98,7 @@ def share_afi_with_users(afi_id, region, useridlist):
 
 def get_afi_sharing_ids_from_conf(conf):
     usersdict = conf.ini["agfisharing"]
-    return usersdict.values()
+    return list(usersdict.values())
 
 
 def share_agfi_in_all_regions(agfi_id, useridlist):

deploy/awstools/afitools.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-from __future__ import annotations
-
 """ This script configures your AWS account to run FireSim. """
 
+from __future__ import annotations
+
 import boto3
 
 vpcname = "firesim"
@@ -21,7 +21,7 @@ def aws_setup():
             client.describe_availability_zones()["AvailabilityZones"],
         )
     )
-    av_zones_with_3octet = zip(range(len(avail_zones)), avail_zones)
+    av_zones_with_3octet = list(zip(list(range(len(avail_zones))), avail_zones))
 
     print("Creating VPC for FireSim...")
     vpc = ec2.create_vpc(CidrBlock="192.168.0.0/16")

deploy/awstools/aws_setup.py

@@ -228,7 +228,7 @@ def aws_resource_names() -> Dict[str, Any]:
 
     resptags = get_localhost_instance_tags()
     if resptags:
-        in_tutorial_mode = "firesim-tutorial-username" in resptags.keys()
+        in_tutorial_mode = "firesim-tutorial-username" in list(resptags.keys())
         if not in_tutorial_mode:
             return base_dict
 
@@ -566,15 +566,11 @@ def launch_instances(
 
     if len(instances):
         logging.info(
-            "Already have {} of {} {} instances.".format(
-                len(instances), count, instancetype
-            )
+            f"Already have {len(instances)} of {count} {instancetype} instances."
         )
         if len(instances) < count:
             logging.info(
-                "Launching remaining {} {} instances".format(
-                    count - len(instances), instancetype
-                )
+                f"Launching remaining {count - len(instances)} {instancetype} instances"
             )
 
     first_subnet_wraparound = None
@@ -612,7 +608,9 @@ def launch_instances(
                     else [
                         {
                             "ResourceType": "instance",
-                            "Tags": [{"Key": k, "Value": v} for k, v in tags.items()],
+                            "Tags": [
+                                {"Key": k, "Value": v} for k, v in list(tags.items())
+                            ],
                         },
                     ]
                 ),
@@ -645,9 +643,7 @@ def launch_instances(
 
                 time_elapsed = datetime.now() - first_subnet_wraparound
                 logging.info(
-                    "have been trying for {} using timeout of {}".format(
-                        time_elapsed, timeout
-                    )
+                    f"have been trying for {time_elapsed} using timeout of {timeout}"
                 )
                 logging.info(
                     """only {} of {} {} instances have been launched""".format(
@@ -785,7 +781,7 @@ def get_instances_by_tag_type(
                 v,
             ],
         }
-        for k, v in tags.items()
+        for k, v in list(tags.items())
     ]
     instances = res.instances.filter(Filters=filters)  # type: ignore
     return list(instances)
@@ -807,7 +803,7 @@ def instances_sorted_by_avail_ip(
     """This returns a list of instance objects, first sorted by their private ip,
     then sorted by availability zone."""
     ips = get_private_ips_for_instances(instances)
-    ips_to_instances = zip(ips, instances)
+    ips_to_instances = list(zip(ips, instances))
     insts = sorted(ips_to_instances, key=lambda x: x[0])
     ip_sorted_insts = [x[1] for x in insts]
     return sorted(ip_sorted_insts, key=lambda x: x.placement["AvailabilityZone"])
@@ -819,7 +815,7 @@ def instance_privateip_lookup_table(
     """Given a list of instances, construct a lookup table that goes from
     privateip -> instance obj"""
     ips = get_private_ips_for_instances(instances)
-    ips_to_instances = zip(ips, instances)
+    ips_to_instances = list(zip(ips, instances))
     return {ip: instance for (ip, instance) in ips_to_instances}
 
 
@@ -1077,14 +1073,14 @@ def main(args: List[str]) -> int:
             use_manager_security_group=parsed_args.use_manager_security_group,
         )
         instids = get_instance_ids_for_instances(insts)
-        print("Instance IDs: {}".format(instids))
+        print(f"Instance IDs: {instids}")
         wait_on_instance_launches(insts)
-        print("Launched instance IPs: {}".format(get_private_ips_for_instances(insts)))
+        print(f"Launched instance IPs: {get_private_ips_for_instances(insts)}")
     else:  # "terminate"
         insts = get_instances_with_filter(parsed_args.filters)
         instids = [inst.instance_id for inst in insts]
         terminate_instances(instids, False)
-        print("Terminated instance IDs: {}".format(instids))
+        print(f"Terminated instance IDs: {instids}")
     return 0
 
 

deploy/awstools/awstools.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, annotations
+from __future__ import annotations
 
 import abc
 import yaml

deploy/buildtools/bitbuilder.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, annotations
+from __future__ import annotations
 
 import yaml
 import json

deploy/buildtools/bitbuilders/f1.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, annotations
+from __future__ import annotations
 
 import yaml
 from absl import logging
@@ -67,7 +67,7 @@ def cl_dir_setup(
         # extra_opts -L resolves symlinks
 
         conn.run(f"mkdir -p {dest_alveo_dir}")
-        conn.run("rm -rf {}/{}".format(dest_alveo_dir, fpga_build_postfix))
+        conn.run(f"rm -rf {dest_alveo_dir}/{fpga_build_postfix}")
         rsync(
             conn,
             source=local_alveo_dir,
@@ -296,7 +296,7 @@ def cl_dir_setup(
         # extra_opts -L resolves symlinks
 
         conn.run(f"mkdir -p {dest_alveo_dir}")
-        conn.run("rm -rf {}/{}".format(dest_alveo_dir, fpga_build_postfix))
+        conn.run(f"rm -rf {dest_alveo_dir}/{fpga_build_postfix}")
         rsync(
             conn,
             source=local_alveo_dir + "/",
@@ -350,7 +350,7 @@ def cl_dir_setup(
         # extra_opts -L resolves symlinks
 
         conn.run(f"mkdir -p {dest_alveo_dir}")
-        conn.run("rm -rf {}/{}".format(dest_alveo_dir, fpga_build_postfix))
+        conn.run(f"rm -rf {dest_alveo_dir}/{fpga_build_postfix}")
         rsync(
             conn,
             source=local_alveo_dir + "/",

deploy/buildtools/bitbuilders/xilinx_alveo.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from enum import Enum, auto
 import sys
 from absl import logging
@@ -40,7 +41,7 @@ def from_string(input: str) -> BuildStrategy:
         try:
             return BuildStrategy[input]
         except KeyError:
-            all_names = [name for name, _ in BuildStrategy.__members__.items()]
+            all_names = [name for name, _ in list(BuildStrategy.__members__.items())]
             raise InvalidBuildConfigSetting(
                 f"Invalid buildstrategy name '{input}'. \n Valid options: {all_names}"
             )
@@ -115,15 +116,14 @@ def __init__(
         self.DESIGN = recipe_config_dict["DESIGN"]
         self.TARGET_CONFIG = recipe_config_dict["TARGET_CONFIG"]
 
-        if (
-            "deploy_triplet" in recipe_config_dict.keys()
-            and "deploy_quintuplet" in recipe_config_dict.keys()
-        ):
+        if "deploy_triplet" in list(
+            recipe_config_dict.keys()
+        ) and "deploy_quintuplet" in list(recipe_config_dict.keys()):
             logging.error(
                 "Cannot have both 'deploy_quintuplet' and 'deploy_triplet' in build config. Define only 'deploy_quintuplet'."
             )
             sys.exit(1)
-        elif "deploy_triplet" in recipe_config_dict.keys():
+        elif "deploy_triplet" in list(recipe_config_dict.keys()):
             logging.warning(
                 "Please rename your 'deploy_triplet' key in your build config to 'deploy_quintuplet'. Support for 'deploy_triplet' will be removed in the future."
             )

deploy/buildtools/build_config.py

@@ -93,7 +93,7 @@ def __init__(self) -> None:
         # aws specific options
         self.agfistoshare = global_build_config_file["agfis_to_share"]
         swa_dict = global_build_config_file["share_with_accounts"]
-        self.acctids_to_sharewith = swa_dict.values() if swa_dict else []
+        self.acctids_to_sharewith = list(swa_dict.values()) if swa_dict else []
 
         # this is a list of actual builds to run
         builds_to_run_list = global_build_config_file["builds_to_run"]
@@ -107,7 +107,7 @@ def __init__(self) -> None:
         self.build_config_recipes_file_path = FLAGS.buildrecipesconfigfile
 
         build_recipes = dict()
-        for section_name, section_dict in build_recipes_config_file.items():
+        for section_name, section_dict in list(build_recipes_config_file.items()):
             if section_name in builds_to_run_list:
                 try:
                     build_recipes[section_name] = BuildConfig(
@@ -120,7 +120,7 @@ def __init__(self) -> None:
 
         self.hwdb = RuntimeHWDB(FLAGS.hwdbconfigfile)
 
-        self.builds_list = list(map(lambda x: build_recipes[x], builds_to_run_list))
+        self.builds_list = list([build_recipes[x] for x in builds_to_run_list])
         self.build_ip_set = set()
 
         # retrieve the build host section