[dev] Linting

Author: mcopik

sebs/aws/aws.py

@@ -132,7 +132,12 @@ def package_code(
         if container_deployment:
             # build base image and upload to ECR
             _, container_uri = self.ecr_client.build_base_image(
-                directory, language_name, language_version, architecture, benchmark, is_cached
+                directory,
+                language,
+                language_version,
+                architecture,
+                benchmark,
+                is_cached,
             )
 
         CONFIG_FILES = {
@@ -675,4 +680,3 @@ def cloud_runtime(self, language: Language, language_version: str):
             return "provided.al2"
         else:
             raise NotImplementedError()
-

sebs/benchmark.py

@@ -16,7 +16,6 @@
 from sebs.faas.resources import SystemResources
 from sebs.utils import find_benchmark, project_absolute_path, LoggingBase
 from sebs.types import BenchmarkModule, Language
-from sebs.types import Language
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -25,7 +24,11 @@
 
 class BenchmarkConfig:
     def __init__(
-        self, timeout: int, memory: int, languages: List["Language"], modules: List[BenchmarkModule]
+        self,
+        timeout: int,
+        memory: int,
+        languages: List["Language"],
+        modules: List[BenchmarkModule],
     ):
         self._timeout = timeout
         self._memory = memory
@@ -647,7 +650,12 @@ def build(
                 "Using cached benchmark {} at {}".format(self.benchmark, self.code_location)
             )
             if self.container_deployment:
-                return False, self.code_location, self.container_deployment, self.container_uri
+                return (
+                    False,
+                    self.code_location,
+                    self.container_deployment,
+                    self.container_uri,
+                )
 
             return False, self.code_location, self.container_deployment, ""
 
@@ -698,7 +706,12 @@ def build(
             self._cache_client.add_code_package(self._deployment_name, self)
         self.query_cache()
 
-        return True, self._code_location, self._container_deployment, self._container_uri
+        return (
+            True,
+            self._code_location,
+            self._container_deployment,
+            self._container_uri,
+        )
 
     """
         Locates benchmark input generator, inspect how many storage buckets
@@ -711,9 +724,11 @@ def build(
     """
 
     def prepare_input(
-        self, system_resources: SystemResources, size: str, replace_existing: bool = False
+        self,
+        system_resources: SystemResources,
+        size: str,
+        replace_existing: bool = False,
     ):
-
         """
         Handle object storage buckets.
         """
@@ -740,7 +755,10 @@ def prepare_input(
         if hasattr(self._benchmark_input_module, "allocate_nosql"):
 
             nosql_storage = system_resources.get_nosql_storage()
-            for name, table_properties in self._benchmark_input_module.allocate_nosql().items():
+            for (
+                name,
+                table_properties,
+            ) in self._benchmark_input_module.allocate_nosql().items():
                 nosql_storage.create_benchmark_tables(
                     self._benchmark,
                     name,
@@ -757,7 +775,13 @@ def prepare_input(
         # storage.allocate_buckets(self.benchmark, buckets)
         # Get JSON and upload data as required by benchmark
         input_config = self._benchmark_input_module.generate_input(
-            self._benchmark_data_path, size, bucket, input, output, storage_func, nosql_func
+            self._benchmark_data_path,
+            size,
+            bucket,
+            input,
+            output,
+            storage_func,
+            nosql_func,
         )
 
         # Cache only once we data is in the cloud.

sebs/faas/container.py

@@ -53,9 +53,7 @@ def find_image(self, repository_name, image_tag) -> bool:
         else:
             try:
                 # default version requires pulling for an image
-                self.docker_client.images.pull(
-                    repository=repository_name, tag=image_tag
-                )
+                self.docker_client.images.pull(repository=repository_name, tag=image_tag)
                 return True
             except docker.errors.NotFound:
                 return False
@@ -86,9 +84,7 @@ def show_progress(self, txt: str, progress: Progress, layer_tasks: dict):
         elif any(x in status for x in ["Layer already exists", "Pushed"]):
             if id_ in layer_tasks:
                 # Complete the task
-                progress.update(
-                    layer_tasks[id_], completed=progress.tasks[layer_tasks[id_]].total
-                )
+                progress.update(layer_tasks[id_], completed=progress.tasks[layer_tasks[id_]].total)
 
         elif "error" in line:
             raise Exception(line["error"])
@@ -119,9 +115,7 @@ def push_image(self, repository_uri, image_tag):
 
                 for val in ret:
                     if "error" in val:
-                        self.logging.error(
-                            f"Failed to push the image to registry {repository_uri}"
-                        )
+                        self.logging.error(f"Failed to push the image to registry {repository_uri}")
                         raise RuntimeError(val)
 
         except docker.errors.APIError as e:
@@ -184,9 +178,7 @@ def build_base_image(
         os.makedirs(build_dir, exist_ok=True)
 
         shutil.copy(
-            os.path.join(
-                DOCKER_DIR, self.name(), language.value, "Dockerfile.function"
-            ),
+            os.path.join(DOCKER_DIR, self.name(), language.value, "Dockerfile.function"),
             os.path.join(build_dir, "Dockerfile"),
         )
         for fn in os.listdir(directory):
@@ -200,9 +192,7 @@ def build_base_image(
         builder_image = self.system_config.benchmark_base_images(
             self.name(), language.value, architecture
         )[language_version]
-        self.logging.info(
-            f"Build the benchmark base image {repository_name}:{image_tag}."
-        )
+        self.logging.info(f"Build the benchmark base image {repository_name}:{image_tag}.")
 
         isa = platform.processor()
         if (isa == "x86_64" and architecture != "x64") or (

sebs/faas/function.py

@@ -134,15 +134,11 @@ def __init__(self):
         self.billing = ExecutionBilling()
 
     @staticmethod
-    def from_times(
-        client_time_begin: datetime, client_time_end: datetime
-    ) -> "ExecutionResult":
+    def from_times(client_time_begin: datetime, client_time_end: datetime) -> "ExecutionResult":
         ret = ExecutionResult()
         ret.times.client_begin = client_time_begin
         ret.times.client_end = client_time_end
-        ret.times.client = int(
-            (client_time_end - client_time_begin) / timedelta(microseconds=1)
-        )
+        ret.times.client = int((client_time_end - client_time_begin) / timedelta(microseconds=1))
         return ret
 
     def parse_benchmark_output(self, output: dict):
@@ -192,9 +188,7 @@ def get(name: str) -> "Trigger.TriggerType":
                     return member
             raise Exception("Unknown trigger type {}".format(member))
 
-    def _http_invoke(
-        self, payload: dict, url: str, verify_ssl: bool = True
-    ) -> ExecutionResult:
+    def _http_invoke(self, payload: dict, url: str, verify_ssl: bool = True) -> ExecutionResult:
         import pycurl
         from io import BytesIO
 
@@ -248,9 +242,7 @@ def _http_invoke(
                 self.logging.error("Output: {}".format(data.getvalue().decode()))
             else:
                 self.logging.error("No output provided!")
-            raise RuntimeError(
-                f"Failed invocation of function! Output: {data.getvalue().decode()}"
-            )
+            raise RuntimeError(f"Failed invocation of function! Output: {data.getvalue().decode()}")
 
     # FIXME: 3.7+, future annotations
     @staticmethod
@@ -287,9 +279,7 @@ def serialize(self) -> dict:
 
     @staticmethod
     def deserialize(config: dict) -> Runtime:
-        return Runtime(
-            language=Language.deserialize(config["language"]), version=config["version"]
-        )
+        return Runtime(language=Language.deserialize(config["language"]), version=config["version"])
 
 
 T = TypeVar("T", bound="FunctionConfig")
@@ -304,12 +294,8 @@ class FunctionConfig:
 
     @staticmethod
     def _from_benchmark(benchmark: Benchmark, obj_type: Type[T]) -> T:
-        runtime = Runtime(
-            language=benchmark.language, version=benchmark.language_version
-        )
-        architecture = Architecture.deserialize(
-            benchmark._experiment_config._architecture
-        )
+        runtime = Runtime(language=benchmark.language, version=benchmark.language_version)
+        architecture = Architecture.deserialize(benchmark._experiment_config._architecture)
         cfg = obj_type(
             timeout=benchmark.benchmark_config.timeout,
             memory=benchmark.benchmark_config.memory,
@@ -379,11 +365,7 @@ def updated_code(self, val: bool):
         self._updated_code = val
 
     def triggers_all(self) -> List[Trigger]:
-        return [
-            trig
-            for trigger_type, triggers in self._triggers.items()
-            for trig in triggers
-        ]
+        return [trig for trigger_type, triggers in self._triggers.items() for trig in triggers]
 
     def triggers(self, trigger_type: Trigger.TriggerType) -> List[Trigger]:
         try:
@@ -404,9 +386,7 @@ def serialize(self) -> dict:
             "benchmark": self._benchmark,
             "config": self.config.serialize(),
             "triggers": [
-                obj.serialize()
-                for t_type, triggers in self._triggers.items()
-                for obj in triggers
+                obj.serialize() for t_type, triggers in self._triggers.items() for obj in triggers
             ],
         }
 

sebs/openwhisk/openwhisk.py

@@ -44,7 +44,10 @@ def __init__(
         self.logging_handlers = logger_handlers
 
         self.container_client = OpenWhiskContainer(
-            self.system_config, self.config, self.docker_client, self.config.experimentalManifest
+            self.system_config,
+            self.config,
+            self.docker_client,
+            self.config.experimentalManifest,
         )
 
         if self.config.resources.docker_username:
@@ -108,7 +111,7 @@ def package_code(
         # Regardless of Docker image status, we need to create .zip file
         # to allow registration of function with OpenWhisk
         _, image_uri = self.container_client.build_base_image(
-            directory, language.value, language_version, architecture, benchmark, is_cached
+            directory, language, language_version, architecture, benchmark, is_cached
         )
 
         # We deploy Minio config in code package since this depends on local
@@ -121,7 +124,9 @@ def package_code(
 
         benchmark_archive = os.path.join(directory, f"{benchmark}.zip")
         subprocess.run(
-            ["zip", benchmark_archive] + package_config, stdout=subprocess.DEVNULL, cwd=directory
+            ["zip", benchmark_archive] + package_config,
+            stdout=subprocess.DEVNULL,
+            cwd=directory,
         )
         self.logging.info(f"Created {benchmark_archive} archive")
         bytes_size = os.path.getsize(benchmark_archive)
@@ -231,7 +236,10 @@ def create_function(
                     )
                     function_cfg.docker_image = docker_image
                     res = OpenWhiskFunction(
-                        func_name, code_package.benchmark, code_package.hash, function_cfg
+                        func_name,
+                        code_package.benchmark,
+                        code_package.hash,
+                        function_cfg,
                     )
                 except subprocess.CalledProcessError as e:
                     self.logging.error(f"Cannot create action {func_name}.")