Merge pull request #2271 from VWS-Python/more-kwargs

Use more keyword arguments - better typecheck errors

Author: adamtheturtle

admin/create_secrets_files.py

@@ -48,7 +48,9 @@
         driver = webdriver.Chrome()
     file = files_to_create[-1]
     sys.stdout.write(f"Creating database {file.name}\n")
-    time = datetime.datetime.now(tz=datetime.UTC).strftime("%Y-%m-%d-%H-%M-%S")
+    time = datetime.datetime.now(tz=datetime.UTC).strftime(
+        format="%Y-%m-%d-%H-%M-%S",
+    )
     license_name = f"my-license-{time}"
     database_name = f"my-database-{time}"
 
@@ -85,7 +87,7 @@
         driver = None
 
     file_contents = textwrap.dedent(
-        f"""\
+        text=f"""\
         VUFORIA_TARGET_MANAGER_DATABASE_NAME={database_details["database_name"]}
         VUFORIA_SERVER_ACCESS_KEY={database_details["server_access_key"]}
         VUFORIA_SERVER_SECRET_KEY={database_details["server_secret_key"]}

ci/custom_linters.py

@@ -15,7 +15,7 @@ def _ci_patterns(*, repository_root: Path) -> set[str]:
     Return the CI patterns given in the CI configuration file.
     """
     ci_file = repository_root / ".github" / "workflows" / "ci.yml"
-    github_workflow_config = yaml.safe_load(ci_file.read_text())
+    github_workflow_config = yaml.safe_load(stream=ci_file.read_text())
     matrix = github_workflow_config["jobs"]["build"]["strategy"]["matrix"]
     ci_pattern_list = matrix["ci_pattern"]
     ci_patterns = set(ci_pattern_list)

src/mock_vws/_query_tools.py

@@ -50,7 +50,7 @@ def get_query_match_response_text(
     parser = MultiPartParser()
     fields, files = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
 
@@ -103,8 +103,8 @@ def get_query_match_response_text(
             application_metadata = None
         else:
             application_metadata = base64.b64encode(
-                decode_base64(encoded_data=target.application_metadata),
-            ).decode("ascii")
+                s=decode_base64(encoded_data=target.application_metadata),
+            ).decode(encoding="ascii")
         target_data = {
             "target_timestamp": int(target_timestamp),
             "name": target.name,

src/mock_vws/_query_validators/fields_validators.py

@@ -37,7 +37,7 @@ def validate_extra_fields(
     parser = MultiPartParser()
     fields, files = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     parsed_keys = fields.keys() | files.keys()

src/mock_vws/_query_validators/image_validators.py

@@ -42,7 +42,7 @@ def validate_image_field_given(
     parser = MultiPartParser()
     _, files = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     if files.get("image") is not None:
@@ -74,7 +74,7 @@ def validate_image_file_size(
     parser = MultiPartParser()
     _, files = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     image_part = files["image"]
@@ -116,7 +116,7 @@ def validate_image_dimensions(
     parser = MultiPartParser()
     _, files = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     image_part = files["image"]
@@ -154,7 +154,7 @@ def validate_image_format(
     parser = MultiPartParser()
     _, files = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     image_part = files["image"]
@@ -188,7 +188,7 @@ def validate_image_is_image(
     parser = MultiPartParser()
     _, files = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     image_part = files["image"]

src/mock_vws/_query_validators/include_target_data_validators.py

@@ -38,7 +38,7 @@ def validate_include_target_data(
     parser = MultiPartParser()
     fields, _ = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     include_target_data = fields.get("include_target_data", "top")

src/mock_vws/_query_validators/num_results_validators.py

@@ -44,7 +44,7 @@ def validate_max_num_results(
     parser = MultiPartParser()
     fields, _ = parser.parse(
         stream=io.BytesIO(initial_bytes=request_body),
-        boundary=boundary.encode("utf-8"),
+        boundary=boundary.encode(encoding="utf-8"),
         content_length=len(request_body),
     )
     max_num_results = fields.get("max_num_results", "1")

src/mock_vws/_services_validators/key_validators.py

@@ -139,7 +139,7 @@ def validate_keys(
         route
         for route in routes
         if re.match(
-            pattern=re.compile(f"{route.path_pattern}$"),
+            pattern=re.compile(pattern=f"{route.path_pattern}$"),
             string=request_path,
         )
         and request_method in route.http_methods

src/mock_vws/image_matchers.py

@@ -98,12 +98,12 @@ def __call__(
             2,
             0,
             1,
-        ).unsqueeze(0)
+        ).unsqueeze(dim=0)
         second_image_tensor_batch_dimension = second_image_tensor.permute(
             2,
             0,
             1,
-        ).unsqueeze(0)
+        ).unsqueeze(dim=0)
 
         ssim = StructuralSimilarityIndexMeasure(data_range=1.0)
         ssim_value = ssim(

src/mock_vws/target_raters.py

@@ -35,7 +35,7 @@ def _get_brisque_target_tracking_rating(*, image_content: bytes) -> int:
         image.size[0],
         len(image.getbands()),
     )
-    image_tensor = image_tensor.permute(2, 0, 1).unsqueeze(0)
+    image_tensor = image_tensor.permute(2, 0, 1).unsqueeze(dim=0)
     try:
         brisque_score = piq.brisque(x=image_tensor, data_range=255)
     except (AssertionError, IndexError):