Skip to content
Snippets Groups Projects
Commit da8b2e03 authored by Hobbs, Alexandra (Contractor)'s avatar Hobbs, Alexandra (Contractor)
Browse files

linted

parent 4e622c1b
No related branches found
No related tags found
1 merge request!375fix bug where pydantic field set to None does not use default
...@@ -74,7 +74,9 @@ class DataApiQuery(BaseModel): ...@@ -74,7 +74,9 @@ class DataApiQuery(BaseModel):
data_host: Union[DataHost, str] = DataHost.DEFAULT data_host: Union[DataHost, str] = DataHost.DEFAULT
@field_validator("starttime", mode="before") @field_validator("starttime", mode="before")
def validate_starttime(cls, starttime: CustomUTCDateTimeType) -> CustomUTCDateTimeType: def validate_starttime(
cls, starttime: CustomUTCDateTimeType
) -> CustomUTCDateTimeType:
if not starttime: if not starttime:
return default_starttime() return default_starttime()
else: else:
......
...@@ -29,6 +29,7 @@ def test_DataApiQuery_defaults(): ...@@ -29,6 +29,7 @@ def test_DataApiQuery_defaults():
# assumes the env var DATA_HOST is not set # assumes the env var DATA_HOST is not set
assert_equal(query.data_host.value, "edgecwb.usgs.gov") assert_equal(query.data_host.value, "edgecwb.usgs.gov")
def test_DataApiQuery_starttime_is_none(): def test_DataApiQuery_starttime_is_none():
query = DataApiQuery(id="BOU", starttime=None) query = DataApiQuery(id="BOU", starttime=None)
...@@ -46,6 +47,7 @@ def test_DataApiQuery_starttime_is_none(): ...@@ -46,6 +47,7 @@ def test_DataApiQuery_starttime_is_none():
# assumes the env var DATA_HOST is not set # assumes the env var DATA_HOST is not set
assert_equal(query.data_host.value, "edgecwb.usgs.gov") assert_equal(query.data_host.value, "edgecwb.usgs.gov")
def test_DataApiQuery_valid(): def test_DataApiQuery_valid():
query = DataApiQuery( query = DataApiQuery(
id="DED", id="DED",
...@@ -125,6 +127,7 @@ def test_DataApiQuery_default_only_endtime(): ...@@ -125,6 +127,7 @@ def test_DataApiQuery_default_only_endtime():
assert_equal(query.format, OutputFormat.IAGA2002) assert_equal(query.format, OutputFormat.IAGA2002)
assert_equal(query.data_host, DataHost.DEFAULT) assert_equal(query.data_host, DataHost.DEFAULT)
def test_DataApiQuery_default_only_invalid_endtime(): def test_DataApiQuery_default_only_invalid_endtime():
# test an invalid endtime that is before default starttime # test an invalid endtime that is before default starttime
query = None query = None
...@@ -133,7 +136,7 @@ def test_DataApiQuery_default_only_invalid_endtime(): ...@@ -133,7 +136,7 @@ def test_DataApiQuery_default_only_invalid_endtime():
except Exception as e: except Exception as e:
err = e.errors() err = e.errors()
assert "Value error, Starttime must be before endtime." == err[0]["msg"] assert "Value error, Starttime must be before endtime." == err[0]["msg"]
assert_equal(query, None) assert_equal(query, None)
......
...@@ -39,11 +39,10 @@ def test_get_data_query(test_client): ...@@ -39,11 +39,10 @@ def test_get_data_query(test_client):
assert_equal(query.format, "iaga2002") assert_equal(query.format, "iaga2002")
assert_equal(query.data_type, "R1") assert_equal(query.data_type, "R1")
def test_get_data_query_no_starttime(test_client): def test_get_data_query_no_starttime(test_client):
"""test.api_test.ws_test.data_test.test_get_data_query_no_starttime()""" """test.api_test.ws_test.data_test.test_get_data_query_no_starttime()"""
response = test_client.get( response = test_client.get("/query/?id=BOU&elements=X,Y,Z,F")
"/query/?id=BOU&elements=X,Y,Z,F"
)
query = DataApiQuery(**response.json()) query = DataApiQuery(**response.json())
assert_equal(query.id, "BOU") assert_equal(query.id, "BOU")
...@@ -55,6 +54,7 @@ def test_get_data_query_no_starttime(test_client): ...@@ -55,6 +54,7 @@ def test_get_data_query_no_starttime(test_client):
# expect endtime to default to 1 day after starttiime # expect endtime to default to 1 day after starttiime
assert_equal(query.endtime, expected + (86400 - 0.001)) assert_equal(query.endtime, expected + (86400 - 0.001))
async def test_get_data_query_extra_params(test_client): async def test_get_data_query_extra_params(test_client):
with pytest.raises(ValueError) as error: with pytest.raises(ValueError) as error:
response = await test_client.get( response = await test_client.get(
......
...@@ -40,9 +40,7 @@ def test_get_filter_data_query(test_client): ...@@ -40,9 +40,7 @@ def test_get_filter_data_query(test_client):
def test_get_filter_data_query_no_starttime(test_client): def test_get_filter_data_query_no_starttime(test_client):
"""test.api_test.ws_test.data_test.test_get_filter_data_query_no_starttime()""" """test.api_test.ws_test.data_test.test_get_filter_data_query_no_starttime()"""
response = test_client.get( response = test_client.get("/filter/?id=BOU&elements=X,Y,Z,F")
"/filter/?id=BOU&elements=X,Y,Z,F"
)
query = FilterApiQuery(**response.json()) query = FilterApiQuery(**response.json())
assert_equal(query.id, "BOU") assert_equal(query.id, "BOU")
......
...@@ -16,6 +16,7 @@ def test_UTCDateTime_string(): ...@@ -16,6 +16,7 @@ def test_UTCDateTime_string():
assert_equal(t.starttime, UTCDateTime(2024, 11, 5, 0, 0)) assert_equal(t.starttime, UTCDateTime(2024, 11, 5, 0, 0))
def test_UTCDateTime_ISO860_string(): def test_UTCDateTime_ISO860_string():
# `ISO8601:2004`_ string from obspy docs # `ISO8601:2004`_ string from obspy docs
t = TimeClass(starttime="2024-11-05T00:00:00.00") t = TimeClass(starttime="2024-11-05T00:00:00.00")
...@@ -48,6 +49,9 @@ def test_invalid(): ...@@ -48,6 +49,9 @@ def test_invalid():
except Exception as e: except Exception as e:
err = e.errors() err = e.errors()
assert "Input should be an instance of UTCDateTime" == err[0]["msg"] assert "Input should be an instance of UTCDateTime" == err[0]["msg"]
assert "Value error, Invalid time type. See obspy UTCDateTime for more information." == err[1]["msg"] assert (
"Value error, Invalid time type. See obspy UTCDateTime for more information."
== err[1]["msg"]
)
assert_equal(t, None) assert_equal(t, None)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment