Merge branch 'develop' into feature/yield-curve

OpenBB-finance · May 16, 2024 · cdcc839 · cdcc839
2 parents d7f6722 + 4c4f57f
commit cdcc839
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 72 deletions.
diff --git a/cli/openbb_cli/cli.py b/cli/openbb_cli/cli.py
@@ -2,12 +2,15 @@
 
 import sys
 
-from openbb_cli.config.setup import bootstrap
-from openbb_cli.controllers.cli_controller import launch
-
 
 def main():
     """Use the main entry point for the OpenBB CLI."""
+    print("Loading...\n")  # noqa: T201
+
+    # pylint: disable=import-outside-toplevel
+    from openbb_cli.config.setup import bootstrap
+    from openbb_cli.controllers.cli_controller import launch
+
     bootstrap()
 
     dev = "--dev" in sys.argv[1:]

diff --git a/cli/poetry.lock b/cli/poetry.lock
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
@@ -19,7 +19,7 @@ python = "^3.8.1,<3.12"
 # OpenBB dependencies
 openbb = { version = "^4.2.0", extras = ["all"] }
 
-# Terminal dependencies
+# CLI dependencies
 prompt-toolkit = "^3.0.16"
 rich = "^13"
 python-dotenv = "^1.0.0"

diff --git a/cli/tests/test_cli.py b/cli/tests/test_cli.py
@@ -5,8 +5,8 @@
 from openbb_cli.cli import main
 
 
-@patch("openbb_cli.cli.bootstrap")
-@patch("openbb_cli.cli.launch")
+@patch("openbb_cli.config.setup.bootstrap")
+@patch("openbb_cli.controllers.cli_controller.launch")
 @patch("sys.argv", ["openbb", "--dev", "--debug"])
 def test_main_with_dev_and_debug(mock_launch, mock_bootstrap):
     """Test the main function with dev and debug flags."""
@@ -15,8 +15,8 @@ def test_main_with_dev_and_debug(mock_launch, mock_bootstrap):
     mock_launch.assert_called_once_with(True, True)
 
 
-@patch("openbb_cli.cli.bootstrap")
-@patch("openbb_cli.cli.launch")
+@patch("openbb_cli.config.setup.bootstrap")
+@patch("openbb_cli.controllers.cli_controller.launch")
 @patch("sys.argv", ["openbb"])
 def test_main_without_arguments(mock_launch, mock_bootstrap):
     """Test the main function without arguments."""
@@ -25,8 +25,8 @@ def test_main_without_arguments(mock_launch, mock_bootstrap):
     mock_launch.assert_called_once_with(False, False)
 
 
-@patch("openbb_cli.cli.bootstrap")
-@patch("openbb_cli.cli.launch")
+@patch("openbb_cli.config.setup.bootstrap")
+@patch("openbb_cli.controllers.cli_controller.launch")
 @patch("sys.argv", ["openbb", "--dev"])
 def test_main_with_dev_only(mock_launch, mock_bootstrap):
     """Test the main function with dev flag only."""
@@ -35,8 +35,8 @@ def test_main_with_dev_only(mock_launch, mock_bootstrap):
     mock_launch.assert_called_once_with(True, False)
 
 
-@patch("openbb_cli.cli.bootstrap")
-@patch("openbb_cli.cli.launch")
+@patch("openbb_cli.config.setup.bootstrap")
+@patch("openbb_cli.controllers.cli_controller.launch")
 @patch("sys.argv", ["openbb", "--debug"])
 def test_main_with_debug_only(mock_launch, mock_bootstrap):
     """Test the main function with debug flag only."""