Rename Fixed Income

openbb_platform/extensions/fixedincome/integration/test_fixedincome_api.py

@@ -5,6 +5,8 @@
 from openbb_core.env import Env
 from openbb_provider.utils.helpers import get_querystring
 
+# pylint: disable=redefined-outer-name
+
 
 @pytest.fixture(scope="session")
 def headers():
@@ -35,11 +37,11 @@ def test_fixedincome_treasury(params, headers):
     [({"date": "2023-01-01", "inflation_adjusted": True})],
 )
 @pytest.mark.integration
-def test_fixedincome_ycrv(params, headers):
+def test_fixedincome_yield_curve(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/ycrv?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/yield_curve?{query_str}"
     result = requests.get(url, headers=headers, timeout=10)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200
@@ -85,11 +87,11 @@ def test_fixedincome_sofr(params, headers):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_estr(params, headers):
+def test_fixedincome_rate_estr(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/estr?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/rate/estr?{query_str}"
     result = requests.get(url, headers=headers, timeout=10)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200
@@ -110,11 +112,11 @@ def test_fixedincome_estr(params, headers):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_sonia(params, headers):
+def test_fixedincome_rate_sonia(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/sonia?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/rate/sonia?{query_str}"
     result = requests.get(url, headers=headers, timeout=10)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200
@@ -135,11 +137,11 @@ def test_fixedincome_sonia(params, headers):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_ameribor(params, headers):
+def test_fixedincome_rate_ameribor(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/ameribor?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/rate/ameribor?{query_str}"
     result = requests.get(url, headers=headers, timeout=10)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200
@@ -160,11 +162,11 @@ def test_fixedincome_ameribor(params, headers):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_fed(params, headers):
+def test_fixedincome_rate_effr(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/fed?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/rate/effr?{query_str}"
     result = requests.get(url, headers=headers, timeout=10)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200
@@ -175,11 +177,11 @@ def test_fixedincome_fed(params, headers):
     [({}), ({"long_run": True, "provider": "fred"})],
 )
 @pytest.mark.integration
-def test_fixedincome_projections(params, headers):
+def test_fixedincome_rate_effr_forecast(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/projections?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/rate/effr_forecast?{query_str}"
     result = requests.get(url, headers=headers, timeout=10)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200
@@ -190,11 +192,11 @@ def test_fixedincome_projections(params, headers):
     [({"start_date": "2023-01-01", "end_date": "2023-06-06"})],
 )
 @pytest.mark.integration
-def test_fixedincome_iorb(params, headers):
+def test_fixedincome_rate_iorb(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/iorb?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/rate/iorb?{query_str}"
     result = requests.get(url, headers=headers, timeout=10)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200
@@ -416,11 +418,11 @@ def test_fixedincome_tbffr(params, headers):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_eu_ycrv(params, headers):
+def test_fixedincome_eu_yield_curve(params, headers):
     params = {p: v for p, v in params.items() if v}
 
     query_str = get_querystring(params, [])
-    url = f"http://0.0.0.0:8000/api/v1/fixedincome/eu_ycrv?{query_str}"
+    url = f"http://0.0.0.0:8000/api/v1/fixedincome/eu_yield_curve?{query_str}"
     result = requests.get(url, headers=headers, timeout=30)
     assert isinstance(result, requests.Response)
     assert result.status_code == 200

openbb_platform/extensions/fixedincome/integration/test_fixedincome_python.py

@@ -1,14 +1,17 @@
-"""Test fixedincome extension."""
+"""Test fixed income extension."""
 import pytest
 from openbb_core.app.model.obbject import OBBject
 
+# pylint: disable=redefined-outer-name
+# pylint: disable=inconsistent-return-statements
+
 
 @pytest.fixture(scope="session")
 def obb(pytestconfig):
     """Fixture to setup obb."""
 
     if pytestconfig.getoption("markexpr") != "not integration":
-        import openbb
+        import openbb  # pylint: disable=import-outside-toplevel
 
         return openbb.obb
 
@@ -34,8 +37,8 @@ def test_fixedincome_treasury(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_ycrv(params, obb):
-    result = obb.fixedincome.ycrv(**params)
+def test_fixedincome_yield_curve(params, obb):
+    result = obb.fixedincome.yield_curve(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0
@@ -78,8 +81,8 @@ def test_fixedincome_sofr(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_estr(params, obb):
-    result = obb.fixedincome.estr(**params)
+def test_fixedincome_rate_estr(params, obb):
+    result = obb.fixedincome.rate.estr(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0
@@ -100,8 +103,8 @@ def test_fixedincome_estr(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_sonia(params, obb):
-    result = obb.fixedincome.sonia(**params)
+def test_fixedincome_rate_sonia(params, obb):
+    result = obb.fixedincome.rate.sonia(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0
@@ -122,8 +125,8 @@ def test_fixedincome_sonia(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_ameribor(params, obb):
-    result = obb.fixedincome.ameribor(**params)
+def test_fixedincome_rate_ameribor(params, obb):
+    result = obb.fixedincome.rate.ameribor(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0
@@ -144,8 +147,8 @@ def test_fixedincome_ameribor(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_fed(params, obb):
-    result = obb.fixedincome.fed(**params)
+def test_fixedincome_rate_effr(params, obb):
+    result = obb.fixedincome.rate.effr(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0
@@ -159,8 +162,8 @@ def test_fixedincome_fed(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_projections(params, obb):
-    result = obb.fixedincome.projections(**params)
+def test_fixedincome_rate_effr_forecast(params, obb):
+    result = obb.fixedincome.rate.effr_forecast(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0
@@ -173,8 +176,8 @@ def test_fixedincome_projections(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_iorb(params, obb):
-    result = obb.fixedincome.iorb(**params)
+def test_fixedincome_rate_iorb(params, obb):
+    result = obb.fixedincome.rate.iorb(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0
@@ -386,10 +389,10 @@ def test_fixedincome_tbffr(params, obb):
     ],
 )
 @pytest.mark.integration
-def test_fixedincome_eu_ycrv(params, obb):
+def test_fixedincome_eu_yield_curve(params, obb):
     params = {p: v for p, v in params.items() if v}
 
-    result = obb.fixedincome.eu_ycrv(**params)
+    result = obb.fixedincome.eu_yield_curve(**params)
     assert result
     assert isinstance(result, OBBject)
     assert len(result.results) > 0

openbb_platform/extensions/fixedincome/openbb_fixedincome/__init__.py

@@ -0,0 +1 @@
+"""Fixed income router init."""