delete session model

openbb_terminal/parent_classes.py

@@ -18,7 +18,7 @@ import pandas as pd
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.styles import Style
 from rich.markdown import Markdown
-from openbb_terminal.session.session_model import logout
+from openbb_terminal.session.session_controller import logout
 from openbb_terminal.session.user import User
 
 from openbb_terminal.core.config.paths import (

openbb_terminal/session/session_controller.py

@@ -1,11 +1,16 @@
+import importlib
+import os
+import sys
 from typing import Tuple
 import json
+import matplotlib.pyplot as plt
 import openbb_terminal.session.local_model as Local
 import openbb_terminal.session.hub_model as Hub
 from openbb_terminal.session.user import User
 from openbb_terminal.core.config.paths import PACKAGE_DIRECTORY
 from openbb_terminal.rich_config import console
 from openbb_terminal import terminal_controller
+from openbb_terminal.helper_funcs import system_clear
 
 
 def display_welcome_message():
@@ -93,5 +98,26 @@ def main(guest_allowed: bool = True):
         login(session=local_session)
 
 
+def logout():
+    """Logout and clear session."""
+    system_clear()
+    User.clear()
+
+    # Clear openbb environment variables
+    for v in os.environ:
+        if v.startswith("OPENBB"):
+            os.environ.pop(v)
+
+    # Reload all openbb modules
+    modules = sys.modules.copy()
+    for module in modules:
+        if module.startswith("openbb"):
+            importlib.reload(sys.modules[module])
+
+    Hub.delete_session()
+    Local.remove_session_file()
+    plt.close("all")
+
+
 if __name__ == "__main__":
     main()

openbb_terminal/session/session_model.py

@@ -1,29 +0,0 @@
-import os
-import sys
-import importlib
-import matplotlib.pyplot as plt
-import openbb_terminal.session.local_model as Local
-import openbb_terminal.session.hub_model as Hub
-from openbb_terminal.session.user import User
-from openbb_terminal.helper_funcs import system_clear
-
-
-def logout():
-    """Logout and clear session."""
-    system_clear()
-    User.clear()
-
-    # Clear openbb environment variables
-    for v in os.environ:
-        if v.startswith("OPENBB"):
-            os.environ.pop(v)
-
-    # Reload all openbb modules
-    modules = sys.modules.copy()
-    for module in modules:
-        if module.startswith("openbb"):
-            importlib.reload(sys.modules[module])
-
-    Hub.delete_session()
-    Local.remove_session_file()
-    plt.close("all")