Skip to content

Commit 46d5a99

Browse files
adamtheturtleadamtheturtle
committed
Start of using keyword arguments everywhere
1 parent da49e79 commit 46d5a99

19 files changed

+97
-88
lines changed

‎admin/create_secrets_files.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def main() -> None:
108108
""",
109109
)
110110

111-
file.write_text(file_contents)
111+
file.write_text(data=file_contents)
112112
sys.stdout.write(f"Created database {file.name}\n")
113113
files_to_create.pop()
114114

‎pyproject.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ optional-dependencies.dev = [
6565
"furo==2024.8.6",
6666
"interrogate==1.7.0",
6767
"mypy[faster-cache]==1.14.0",
68+
"mypy-strict-kwargs==2024.12.23.2",
6869
"pre-commit==4.0.1",
6970
"pydocstyle==6.3",
7071
"pyenchant==3.3.0rc1",
@@ -383,6 +384,7 @@ files = [ "." ]
383384
exclude = [ "build" ]
384385
plugins = [
385386
"pydantic.mypy",
387+
"mypy_strict_kwargs",
386388
]
387389
follow_untyped_imports = true
388390

‎src/mock_vws/_flask_server/target_manager.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class TargetManagerSettings(BaseSettings):
6666

6767

6868
@TARGET_MANAGER_FLASK_APP.route(
69-
"/databases/<string:database_name>",
69+
rule="/databases/<string:database_name>",
7070
methods=[HTTPMethod.DELETE],
7171
)
7272
@beartype
@@ -184,7 +184,7 @@ def create_database() -> Response:
184184
TARGET_MANAGER.add_database(database=database)
185185
except ValueError as exc:
186186
return Response(
187-
response=str(exc),
187+
response=str(object=exc),
188188
status=HTTPStatus.CONFLICT,
189189
)
190190

@@ -195,7 +195,7 @@ def create_database() -> Response:
195195

196196

197197
@TARGET_MANAGER_FLASK_APP.route(
198-
"/databases/<string:database_name>/targets",
198+
rule="/databases/<string:database_name>/targets",
199199
methods=[HTTPMethod.POST],
200200
)
201201
@beartype
@@ -233,7 +233,7 @@ def create_target(database_name: str) -> Response:
233233

234234

235235
@TARGET_MANAGER_FLASK_APP.route(
236-
"/databases/<string:database_name>/targets/<string:target_id>",
236+
rule="/databases/<string:database_name>/targets/<string:target_id>",
237237
methods={HTTPMethod.DELETE},
238238
)
239239
@beartype
@@ -258,7 +258,7 @@ def delete_target(database_name: str, target_id: str) -> Response:
258258

259259

260260
@TARGET_MANAGER_FLASK_APP.route(
261-
"/databases/<string:database_name>/targets/<string:target_id>",
261+
rule="/databases/<string:database_name>/targets/<string:target_id>",
262262
methods=[HTTPMethod.PUT],
263263
)
264264
def update_target(database_name: str, target_id: str) -> Response:

‎src/mock_vws/_flask_server/vws.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def get_target(target_id: str) -> Response:
283283

284284

285285
@VWS_FLASK_APP.route(
286-
"/targets/<string:target_id>",
286+
rule="/targets/<string:target_id>",
287287
methods=[HTTPMethod.DELETE],
288288
)
289289
def delete_target(target_id: str) -> Response:
@@ -390,7 +390,10 @@ def database_summary() -> Response:
390390
)
391391

392392

393-
@VWS_FLASK_APP.route("/summary/<string:target_id>", methods=[HTTPMethod.GET])
393+
@VWS_FLASK_APP.route(
394+
rule="/summary/<string:target_id>",
395+
methods=[HTTPMethod.GET],
396+
)
394397
def target_summary(target_id: str) -> Response:
395398
"""Get a summary report for a target.
396399
@@ -441,7 +444,7 @@ def target_summary(target_id: str) -> Response:
441444

442445

443446
@VWS_FLASK_APP.route(
444-
"/duplicates/<string:target_id>",
447+
rule="/duplicates/<string:target_id>",
445448
methods=[HTTPMethod.GET],
446449
)
447450
@beartype

‎src/mock_vws/_query_validators/content_type_validators.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def validate_content_type_header(
3838
NoContentTypeError: The content type header is either empty or not
3939
given.
4040
"""
41-
content_type_header = request_headers.get("Content-Type", "")
41+
content_type_header = request_headers.get("Content-Type", default="")
4242
if not content_type_header:
4343
_LOGGER.warning(msg="The content type header is empty.")
4444
raise NoContentTypeError

‎src/mock_vws/_query_validators/exceptions.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(self) -> None:
5353
"Connection": "keep-alive",
5454
"Server": "nginx",
5555
"Date": date,
56-
"Content-Length": str(len(self.response_text)),
56+
"Content-Length": str(object=len(self.response_text)),
5757
}
5858

5959

@@ -85,7 +85,7 @@ def __init__(self) -> None:
8585
"Server": "nginx",
8686
"Date": date,
8787
"WWW-Authenticate": "KWS",
88-
"Content-Length": str(len(self.response_text)),
88+
"Content-Length": str(object=len(self.response_text)),
8989
}
9090

9191

@@ -121,7 +121,7 @@ def __init__(self) -> None:
121121
"Connection": "keep-alive",
122122
"Server": "nginx",
123123
"Date": date,
124-
"Content-Length": str(len(self.response_text)),
124+
"Content-Length": str(object=len(self.response_text)),
125125
}
126126

127127

@@ -164,7 +164,7 @@ def __init__(self) -> None:
164164
"Connection": "keep-alive",
165165
"Server": "nginx",
166166
"Date": date,
167-
"Content-Length": str(len(self.response_text)),
167+
"Content-Length": str(object=len(self.response_text)),
168168
}
169169

170170

@@ -207,7 +207,7 @@ def __init__(self) -> None:
207207
"Server": "nginx",
208208
"Date": date,
209209
"WWW-Authenticate": "VWS",
210-
"Content-Length": str(len(self.response_text)),
210+
"Content-Length": str(object=len(self.response_text)),
211211
}
212212

213213

@@ -245,7 +245,7 @@ def __init__(self) -> None:
245245
"Server": "nginx",
246246
"Date": date,
247247
"WWW-Authenticate": "VWS",
248-
"Content-Length": str(len(self.response_text)),
248+
"Content-Length": str(object=len(self.response_text)),
249249
}
250250

251251

@@ -277,7 +277,7 @@ def __init__(self) -> None:
277277
"Connection": "keep-alive",
278278
"Server": "nginx",
279279
"Date": date,
280-
"Content-Length": str(len(self.response_text)),
280+
"Content-Length": str(object=len(self.response_text)),
281281
}
282282

283283

@@ -310,7 +310,7 @@ def __init__(self) -> None:
310310
"Server": "nginx",
311311
"Date": date,
312312
"WWW-Authenticate": "KWS",
313-
"Content-Length": str(len(self.response_text)),
313+
"Content-Length": str(object=len(self.response_text)),
314314
}
315315

316316

@@ -344,7 +344,7 @@ def __init__(self) -> None:
344344
"Server": "nginx",
345345
"Date": date,
346346
"WWW-Authenticate": "KWS",
347-
"Content-Length": str(len(self.response_text)),
347+
"Content-Length": str(object=len(self.response_text)),
348348
}
349349

350350

@@ -376,7 +376,7 @@ def __init__(self) -> None:
376376
"Connection": "keep-alive",
377377
"Server": "nginx",
378378
"Date": date,
379-
"Content-Length": str(len(self.response_text)),
379+
"Content-Length": str(object=len(self.response_text)),
380380
}
381381

382382

@@ -418,7 +418,7 @@ def __init__(self) -> None:
418418
"Connection": "keep-alive",
419419
"Server": "nginx",
420420
"Date": date,
421-
"Content-Length": str(len(self.response_text)),
421+
"Content-Length": str(object=len(self.response_text)),
422422
}
423423

424424

@@ -455,7 +455,7 @@ def __init__(self, given_value: str) -> None:
455455
"Connection": "keep-alive",
456456
"Server": "nginx",
457457
"Date": date,
458-
"Content-Length": str(len(self.response_text)),
458+
"Content-Length": str(object=len(self.response_text)),
459459
}
460460

461461

@@ -492,7 +492,7 @@ def __init__(self, given_value: str) -> None:
492492
"Connection": "keep-alive",
493493
"Server": "nginx",
494494
"Date": date,
495-
"Content-Length": str(len(self.response_text)),
495+
"Content-Length": str(object=len(self.response_text)),
496496
}
497497

498498

@@ -531,7 +531,7 @@ def __init__(self, given_value: str) -> None:
531531
"Connection": "keep-alive",
532532
"Server": "nginx",
533533
"Date": date,
534-
"Content-Length": str(len(self.response_text)),
534+
"Content-Length": str(object=len(self.response_text)),
535535
}
536536

537537

@@ -562,7 +562,7 @@ def __init__(self) -> None:
562562
"Connection": "keep-alive",
563563
"Server": "nginx",
564564
"Date": date,
565-
"Content-Length": str(len(self.response_text)),
565+
"Content-Length": str(object=len(self.response_text)),
566566
}
567567

568568

@@ -593,7 +593,7 @@ def __init__(self) -> None:
593593
"Connection": "keep-alive",
594594
"Server": "nginx",
595595
"Date": date,
596-
"Content-Length": str(len(self.response_text)),
596+
"Content-Length": str(object=len(self.response_text)),
597597
}
598598

599599

@@ -628,7 +628,7 @@ def __init__(self) -> None:
628628
"Connection": "keep-alive",
629629
"Server": "nginx",
630630
"Date": date,
631-
"Content-Length": str(len(self.response_text)),
631+
"Content-Length": str(object=len(self.response_text)),
632632
}
633633

634634

@@ -652,7 +652,7 @@ def __init__(self) -> None: # pragma: no cover
652652
self.response_text = ""
653653
self.headers = {
654654
"Connection": "keep-alive",
655-
"Content-Length": str(len(self.response_text)),
655+
"Content-Length": str(object=len(self.response_text)),
656656
}
657657

658658

@@ -675,7 +675,7 @@ def __init__(self) -> None:
675675
self.response_text = ""
676676
self.headers = {
677677
"Connection": "Close",
678-
"Content-Length": str(len(self.response_text)),
678+
"Content-Length": str(object=len(self.response_text)),
679679
}
680680

681681

@@ -719,7 +719,7 @@ def __init__(self) -> None: # pragma: no cover
719719
"Date": date,
720720
"Server": "nginx",
721721
"Content-Type": "text/html",
722-
"Content-Length": str(len(self.response_text)),
722+
"Content-Length": str(object=len(self.response_text)),
723723
}
724724

725725

@@ -771,5 +771,5 @@ def __init__(self) -> None:
771771
"Server": "nginx",
772772
"Cache-Control": "must-revalidate,no-cache,no-store",
773773
"Date": date,
774-
"Content-Length": str(len(self.response_text)),
774+
"Content-Length": str(object=len(self.response_text)),
775775
}

‎src/mock_vws/_requests_mock_server/mock_web_query_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@ def query(self, request: PreparedRequest) -> _ResponseType:
136136
"Content-Type": "application/json",
137137
"Server": "nginx",
138138
"Date": date,
139-
"Content-Length": str(len(response_text)),
139+
"Content-Length": str(object=len(response_text)),
140140
}
141141
return HTTPStatus.OK, headers, response_text

‎src/mock_vws/_requests_mock_server/mock_web_services_api.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def add_target(self, request: PreparedRequest) -> _ResponseType:
195195
"Content-Type": "application/json",
196196
"server": "envoy",
197197
"Date": date,
198-
"Content-Length": str(len(body_json)),
198+
"Content-Length": str(object=len(body_json)),
199199
"x-envoy-upstream-service-time": "5",
200200
"strict-transport-security": "max-age=31536000",
201201
"x-aws-region": "us-east-2, us-west-2",
@@ -260,7 +260,7 @@ def delete_target(self, request: PreparedRequest) -> _ResponseType:
260260
body_json = json_dump(body=body)
261261
headers = {
262262
"Connection": "keep-alive",
263-
"Content-Length": str(len(body_json)),
263+
"Content-Length": str(object=len(body_json)),
264264
"Content-Type": "application/json",
265265
"Date": date,
266266
"server": "envoy",
@@ -321,7 +321,7 @@ def database_summary(self, request: PreparedRequest) -> _ResponseType:
321321
body_json = json_dump(body=body)
322322
headers = {
323323
"Connection": "keep-alive",
324-
"Content-Length": str(len(body_json)),
324+
"Content-Length": str(object=len(body_json)),
325325
"Content-Type": "application/json",
326326
"Date": date,
327327
"server": "envoy",
@@ -375,7 +375,7 @@ def target_list(self, request: PreparedRequest) -> _ResponseType:
375375
body_json = json_dump(body=body)
376376
headers = {
377377
"Connection": "keep-alive",
378-
"Content-Length": str(len(body_json)),
378+
"Content-Length": str(object=len(body_json)),
379379
"Content-Type": "application/json",
380380
"Date": date,
381381
"server": "envoy",
@@ -440,7 +440,7 @@ def get_target(self, request: PreparedRequest) -> _ResponseType:
440440
body_json = json_dump(body=body)
441441
headers = {
442442
"Connection": "keep-alive",
443-
"Content-Length": str(len(body_json)),
443+
"Content-Length": str(object=len(body_json)),
444444
"Content-Type": "application/json",
445445
"Date": date,
446446
"server": "envoy",
@@ -510,7 +510,7 @@ def get_duplicates(self, request: PreparedRequest) -> _ResponseType:
510510
body_json = json_dump(body=body)
511511
headers = {
512512
"Connection": "keep-alive",
513-
"Content-Length": str(len(body_json)),
513+
"Content-Length": str(object=len(body_json)),
514514
"Content-Type": "application/json",
515515
"Date": date,
516516
"server": "envoy",
@@ -626,7 +626,7 @@ def update_target(self, request: PreparedRequest) -> _ResponseType:
626626
"Content-Type": "application/json",
627627
"server": "envoy",
628628
"Date": date,
629-
"Content-Length": str(len(body_json)),
629+
"Content-Length": str(object=len(body_json)),
630630
"x-envoy-upstream-service-time": "5",
631631
"strict-transport-security": "max-age=31536000",
632632
"x-aws-region": "us-east-2, us-west-2",
@@ -686,7 +686,7 @@ def target_summary(self, request: PreparedRequest) -> _ResponseType:
686686
body_json = json_dump(body=body)
687687
headers = {
688688
"Connection": "keep-alive",
689-
"Content-Length": str(len(body_json)),
689+
"Content-Length": str(object=len(body_json)),
690690
"Content-Type": "application/json",
691691
"Date": date,
692692
"server": "envoy",

0 commit comments

Comments
 (0)