98% on controller

This commit is contained in:
james
2023-02-21 12:19:49 -05:00
parent 29b526b72d
commit 7484b6aa4c
2 changed files with 295 additions and 31 deletions

View File

@@ -234,7 +234,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
elif ns_parser.source == "ECB":
ecb_view.plot_estr(
@@ -242,7 +244,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -291,7 +295,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -340,7 +346,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -389,7 +397,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -473,7 +483,9 @@ class FixedIncomeController(BaseController):
target=ns_parser.target,
raw=ns_parser.raw,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -512,7 +524,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -540,7 +554,9 @@ class FixedIncomeController(BaseController):
long_run=ns_parser.long_run,
raw=ns_parser.raw,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -589,7 +605,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -636,10 +654,12 @@ class FixedIncomeController(BaseController):
fred_view.plot_ecb(
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
type=ns_parser.type,
interest_type=ns_parser.type,
raw=ns_parser.raw,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -823,7 +843,9 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -1041,7 +1063,9 @@ class FixedIncomeController(BaseController):
end_date=ns_parser.end_date,
raw=ns_parser.raw,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)
@log_start_end(log=logger)
@@ -1087,5 +1111,7 @@ class FixedIncomeController(BaseController):
start_date=ns_parser.start_date,
end_date=ns_parser.end_date,
export=ns_parser.export,
sheet_name=" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
sheet_name=" ".join(ns_parser.sheet_name)
if ns_parser.sheet_name
else None,
)

View File

@@ -197,7 +197,6 @@ def test_call_func_expect_queue(expected_queue, func, queue):
assert controller.queue == expected_queue
@pytest.mark.vcr(record_mode="none")
@pytest.mark.parametrize(
"tested_func, other_args, mocked_func, called_args, called_kwargs",
@@ -212,11 +211,13 @@ def test_call_func_expect_queue(expected_queue, func, queue):
],
"fred_view.plot_estr",
[],
dict(series_id="ECBESTRTOTVOL",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None),
dict(
series_id="ECBESTRTOTVOL",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_estr",
@@ -229,11 +230,13 @@ def test_call_func_expect_queue(expected_queue, func, queue):
],
"ecb_view.plot_estr",
[],
dict(series_id="EST.B.EU000A2X2A25.TT",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None),
dict(
series_id="EST.B.EU000A2X2A25.TT",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_sofr",
@@ -245,12 +248,247 @@ def test_call_func_expect_queue(expected_queue, func, queue):
],
"fred_view.plot_sofr",
[],
dict(series_id="SOFR180DAYAVG",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None),
)
dict(
series_id="SOFR180DAYAVG",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_sonia",
[
"-p=index",
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
],
"fred_view.plot_sonia",
[],
dict(
series_id="IUDZOS2",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_ameribor",
[
"-p=2_year_term_structure",
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
],
"fred_view.plot_ameribor",
[],
dict(
series_id="AMBOR2Y",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_fed",
[
"-p=monthly",
"--overnight",
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
],
"fred_view.plot_fed",
[],
dict(
series_id="FEDFUNDS",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
overnight=True,
quantiles=False,
target=False,
raw=False,
),
),
(
"call_iorb",
[
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
],
"fred_view.plot_iorb",
[],
dict(
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_dwpcr",
[
"-p=annual",
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
],
"fred_view.plot_dwpcr",
[],
dict(
series_id="RIFSRPF02NA",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_ecb",
[
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
],
"fred_view.plot_ecb",
[],
dict(
interest_type=None,
raw=False,
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_treasury",
[
"--short=united_kingdom",
"--long=united_states,canada",
"--forecast",
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
],
"oecd_view.plot_treasuries",
[],
dict(
forecast=True,
raw=False,
long_term=["united_states", "canada"],
short_term=["united_kingdom"],
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
),
),
(
"call_usrates",
[
"-m=7_year",
"-p=tips",
"--forecast",
"-s=2022-01-01",
"-e=2022-01-31",
"--export=csv",
"--raw",
],
"fred_view.plot_usrates",
[],
dict(
parameter="tips",
maturity="7_year",
start_date=MOCK_START,
end_date=MOCK_END,
export="csv",
sheet_name=None,
raw=True,
),
),
(
"call_ycrv",
["-d=2022-01-01", "--raw"],
"fred_view.display_yield_curve",
[],
dict(
date="2022-01-01",
inflation_adjusted=False,
export="",
sheet_name=None,
raw=True,
),
),
(
"call_ecbycrv",
["-d=2022-01-01", "--raw", "-p=spot_rate"],
"ecb_view.display_ecb_yield_curve",
[],
dict(
date="2022-01-01",
yield_type="spot_rate",
export="",
detailed=False,
any_rating=False,
sheet_name=None,
raw=True,
),
),
(
"call_tmc",
[
"-s=2022-01-01",
"-e=2022-01-31",
],
"fred_view.plot_tmc",
[],
dict(
series_id="T10Y3M",
start_date=MOCK_START,
end_date=MOCK_END,
sheet_name=None,
export="",
),
),
(
"call_ffrmc",
[
"-s=2022-01-01",
"-e=2022-01-31",
],
"fred_view.plot_ffrmc",
[],
dict(
series_id="T10YFF",
start_date=MOCK_START,
end_date=MOCK_END,
sheet_name=None,
export="",
),
),
(
"call_tbffr",
[
"-s=2022-01-01",
"-e=2022-01-31",
],
"fred_view.plot_tbffr",
[],
dict(
series_id="TB3SMFFM",
start_date=MOCK_START,
end_date=MOCK_END,
sheet_name=None,
export="",
),
),
],
)
def test_call_cmd(