Format Python source and tests
This commit is contained in:
parent
45dc2c2e67
commit
fb9bb532ec
8 changed files with 31 additions and 22 deletions
24
lookup.py
24
lookup.py
|
|
@ -346,7 +346,9 @@ def validate_coordinates(lat: float, lon: float) -> str | None:
|
|||
|
||||
|
||||
@app.route("/")
|
||||
def index() -> str | Response | tuple[Response, int] | tuple[Response, int, dict[str, str]]:
|
||||
def index() -> (
|
||||
str | Response | tuple[Response, int] | tuple[Response, int, dict[str, str]]
|
||||
):
|
||||
"""Index page."""
|
||||
t0 = time()
|
||||
database.session.execute(text("SELECT 1"))
|
||||
|
|
@ -364,12 +366,15 @@ def index() -> str | Response | tuple[Response, int] | tuple[Response, int, dict
|
|||
lat = parse_coordinate(lat_str)
|
||||
lon = parse_coordinate(lon_str)
|
||||
except ValueError:
|
||||
return jsonify(
|
||||
coords={"lat": lat_str, "lon": lon_str},
|
||||
error="Invalid coordinate format. "
|
||||
+ "Please use decimal degrees (e.g., 56.099600) "
|
||||
+ "or DMS format (e.g., 56°5'58.56\"N)",
|
||||
), 400
|
||||
return (
|
||||
jsonify(
|
||||
coords={"lat": lat_str, "lon": lon_str},
|
||||
error="Invalid coordinate format. "
|
||||
+ "Please use decimal degrees (e.g., 56.099600) "
|
||||
+ "or DMS format (e.g., 56°5'58.56\"N)",
|
||||
),
|
||||
400,
|
||||
)
|
||||
|
||||
if error_msg := validate_coordinates(lat, lon):
|
||||
return jsonify(coords={"lat": lat_str, "lon": lon_str}, error=error_msg), 400
|
||||
|
|
@ -401,7 +406,10 @@ def index() -> str | Response | tuple[Response, int] | tuple[Response, int, dict
|
|||
503,
|
||||
)
|
||||
except requests.exceptions.RequestException:
|
||||
return jsonify(error="Could not connect to Wikidata, please try again later"), 503
|
||||
return (
|
||||
jsonify(error="Could not connect to Wikidata, please try again later"),
|
||||
503,
|
||||
)
|
||||
result.pop("element", None)
|
||||
result.pop("geojson", None)
|
||||
if logging_enabled:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue