Skip to content

Commit 6705f0a

Browse files
committed
fix: black reformat new files
1 parent 1d96109 commit 6705f0a

File tree

4 files changed

+32
-20
lines changed

4 files changed

+32
-20
lines changed

cli/kleinkram/api/deser.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44
from enum import Enum
55
from typing import Any
66
from typing import Dict
7+
from typing import List
78
from typing import Literal
89
from typing import NewType
910
from typing import Tuple
10-
from typing import List
1111
from uuid import UUID
1212

1313
import dateutil.parser
1414

1515
from kleinkram.errors import ParsingError
16-
from kleinkram.models import File, MetadataValue
16+
from kleinkram.models import File
1717
from kleinkram.models import FileState
18+
from kleinkram.models import MetadataValue
1819
from kleinkram.models import Mission
1920
from kleinkram.models import Project
2021

@@ -85,16 +86,22 @@ def _parse_file_state(state: str) -> FileState:
8586
except ValueError as e:
8687
raise ParsingError(f"error parsing file state: {state}") from e
8788

89+
8890
def _parse_metadata(tags: List[Dict]) -> Dict[str, MetadataValue]:
8991
result = {}
9092
try:
9193
for tag in tags:
92-
entry = {tag.get("name"): MetadataValue(tag.get("valueAsString"), tag.get("datatype"))}
94+
entry = {
95+
tag.get("name"): MetadataValue(
96+
tag.get("valueAsString"), tag.get("datatype")
97+
)
98+
}
9399
result.update(entry)
94100
return result
95101
except ValueError as e:
96102
raise ParsingError(f"error parsing metadata: {e}") from e
97103

104+
98105
def _parse_required_tags(tags: List[Dict]) -> list[str]:
99106
return list(_parse_metadata(tags).keys())
100107

@@ -106,7 +113,9 @@ def _parse_project(project_object: ProjectObject) -> Project:
106113
description = project_object[ProjectObjectKeys.DESCRIPTION]
107114
created_at = _parse_datetime(project_object[ProjectObjectKeys.CREATED_AT])
108115
updated_at = _parse_datetime(project_object[ProjectObjectKeys.UPDATED_AT])
109-
required_tags = _parse_required_tags(project_object[ProjectObjectKeys.REQUIRED_TAGS])
116+
required_tags = _parse_required_tags(
117+
project_object[ProjectObjectKeys.REQUIRED_TAGS]
118+
)
110119
except Exception as e:
111120
raise ParsingError(f"error parsing project: {project_object}") from e
112121
return Project(

cli/kleinkram/api/routes.py

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@
4040
from kleinkram.errors import InvalidProjectQuery
4141
from kleinkram.errors import MissionExists
4242
from kleinkram.errors import MissionNotFound
43+
from kleinkram.errors import MissionValidationError
4344
from kleinkram.errors import ProjectExists
4445
from kleinkram.errors import ProjectNotFound
45-
from kleinkram.errors import MissionValidationError
4646
from kleinkram.models import File
4747
from kleinkram.models import Mission
4848
from kleinkram.models import Project
49-
from kleinkram.utils import is_valid_uuid4, split_args
49+
from kleinkram.utils import is_valid_uuid4
50+
from kleinkram.utils import split_args
5051

5152
__all__ = [
5253
"_get_api_version",
@@ -224,7 +225,7 @@ def _mission_name_is_available(
224225

225226

226227
def _validate_mission_name(
227-
client: AuthenticatedClient, project_id: UUID, mission_name: str
228+
client: AuthenticatedClient, project_id: UUID, mission_name: str
228229
) -> None:
229230
if not _mission_name_is_available(client, mission_name, project_id):
230231
raise MissionExists(
@@ -241,7 +242,7 @@ def _validate_mission_name(
241242
if mission_name.endswith(" "):
242243
raise ValueError(
243244
"A mission name cannot end with a whitespace. "
244-
f"The given mission name was \'{mission_name}\'"
245+
f"The given mission name was '{mission_name}'"
245246
)
246247

247248

@@ -253,7 +254,10 @@ def _project_name_is_available(client: AuthenticatedClient, project_name: str) -
253254
return True
254255
return False
255256

256-
def _validate_mission_created(client: AuthenticatedClient, project_id: str, mission_name: str) -> None:
257+
258+
def _validate_mission_created(
259+
client: AuthenticatedClient, project_id: str, mission_name: str
260+
) -> None:
257261
"""
258262
validate that a mission is successfully created
259263
"""
@@ -350,20 +354,20 @@ def _create_project(
350354
return UUID(resp.json()["uuid"], version=4)
351355

352356

353-
def _validate_tag_value(
354-
tag_value, tag_datatype
355-
) -> None:
357+
def _validate_tag_value(tag_value, tag_datatype) -> None:
356358
if tag_datatype == "NUMBER":
357359
try:
358360
float(tag_value)
359-
except:
361+
except ValueError:
360362
raise InvalidMissionMetadata(f"Value '{tag_value}' is not a valid NUMBER")
361363
elif tag_datatype == "BOOLEAN":
362364
if tag_value.lower() not in {"true", "false"}:
363-
raise InvalidMissionMetadata(f"Value '{tag_value}' is not a valid BOOLEAN (expected 'true' or 'false')")
365+
raise InvalidMissionMetadata(
366+
f"Value '{tag_value}' is not a valid BOOLEAN (expected 'true' or 'false')"
367+
)
364368
else:
365-
pass # any string is fine
366-
#TODO: add check for LOCATION tag datatype
369+
pass # any string is fine
370+
# TODO: add check for LOCATION tag datatype
367371

368372

369373
def _get_metadata_type_id_by_name(
@@ -376,7 +380,7 @@ def _get_metadata_type_id_by_name(
376380

377381
resp.raise_for_status()
378382
try:
379-
data = resp.json()['data'][0]
383+
data = resp.json()["data"][0]
380384
except IndexError:
381385
return None, None
382386

cli/kleinkram/core.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ def upload(
107107

108108
if create and mission is None:
109109
# check if project exists and get its id at the same time
110-
project = kleinkram.api.routes.get_project(
111-
client, query=query.project_query
112-
)
110+
project = kleinkram.api.routes.get_project(client, query=query.project_query)
113111
project_id = project.id
114112
project_required_tags = project.required_tags
115113
mission_name = check_mission_query_is_creatable(query)

cli/kleinkram/errors.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class FileNameNotSupported(Exception): ...
4545

4646
class InvalidMissionMetadata(Exception): ...
4747

48+
4849
class MissionValidationError(Exception): ...
4950

5051

0 commit comments

Comments
 (0)