diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 633c24dd3ea..7e131a46206 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -1,4 +1,4 @@
-name: Trigger Build on Release and PRs to Main
+name: Build & Release
env:
OPENBB_ENABLE_QUICK_EXIT: true
@@ -26,30 +26,37 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
- uses: benc-uk/workflow-dispatch@v1
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: windows10_build.yml
+ token: ${{ secrets.GITHUB_TOKEN }}
+ wait-for-completion-timeout: 2h
trigger-macos-build:
runs-on: ubuntu-latest
steps:
- - name: Trigger Windows Build
- uses: benc-uk/workflow-dispatch@v1
+ - name: Trigger M1 MacOs Build
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: m1_macos_build.yml
+ token: ${{ secrets.GITHUB_TOKEN }}
+ wait-for-completion-timeout: 2h
trigger-intel-build:
runs-on: ubuntu-latest
steps:
- - name: Trigger Windows Build
- uses: benc-uk/workflow-dispatch@v1
+ - name: Trigger Intel MacOs Build
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: intel_macos_build.yml
+ token: ${{ secrets.GITHUB_TOKEN }}
+ wait-for-completion-timeout: 2h
trigger-docker-build:
runs-on: ubuntu-latest
steps:
- - name: Trigger Windows Build
- uses: benc-uk/workflow-dispatch@v1
+ - name: Trigger docker Build
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: docker.yml
+ token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1137494939a..85ad7724476 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -40,4 +40,4 @@ jobs:
- name: Publishing the Docker image
run: |
docker push "${OPENBBTERMINAL_DOCKER_POETRY_IMAGE}"
- if: startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/release/')
+ if: startsWith(github.ref, 'refs/heads/main')
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 644ec94f7af..cf460b9fbaf 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -1,4 +1,4 @@
-name: Nightly Build on the develop branch
+name: Nightly Build
env:
OPENBB_ENABLE_QUICK_EXIT: true
@@ -21,30 +21,37 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
- uses: benc-uk/workflow-dispatch@v1
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: windows10_build.yml
+ token: ${{ secrets.GITHUB_TOKEN }}
+ wait-for-completion-timeout: 2h
trigger-macos-build:
runs-on: ubuntu-latest
steps:
- name: Trigger M1 MacOs Build
- uses: benc-uk/workflow-dispatch@v1
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: m1_macos_build.yml
-
+ token: ${{ secrets.GITHUB_TOKEN }}
+ wait-for-completion-timeout: 2h
+
trigger-intel-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Intel MacOs Build
- uses: benc-uk/workflow-dispatch@v1
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: intel_macos_build.yml
-
+ token: ${{ secrets.GITHUB_TOKEN }}
+ wait-for-completion-timeout: 2h
+
trigger-docker-build:
runs-on: ubuntu-latest
steps:
- name: Trigger docker Build
- uses: benc-uk/workflow-dispatch@v1
+ uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: docker.yml
+ token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml
index f58c91a5d05..a19a91bd05e 100644
--- a/.github/workflows/windows10_build.yml
+++ b/.github/workflows/windows10_build.yml
@@ -16,47 +16,62 @@ concurrency:
jobs:
Windows-Build:
- name: Windows10 Build
- runs-on: [self-hosted, Windows, x64]
+ name: Windows10 Build ENV
+ runs-on: windows-latest
# Configuring -------------
steps:
- name: Setup Windows Git Configuration # This is under the assumption that git is already installed on the system
run: |
Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 1
git config --system core.longpaths true
+
- name: Checkout
uses: actions/checkout@v2.4.2
- - name: Activate Base & Create OpenBB Environment
+
+ - name: Set up Python & Create OpenBB Environment
+ uses: actions/setup-python@v4
+ with:
+ python-version: '3.9'
+
+ - name: Create and start virtual environment
run: |
- conda activate base
- conda env create -n obb --file build/conda/conda-3-9-env-full.yaml
- conda init
- conda activate obb
- conda env list
- - name: Poetry Install
- # Conda activate needs to be run every time because of the way that the workflow steps work
- # on powershell where it creates a new shell every time for every step
+ python -m venv venv
+ source venv/Scripts/activate
+ python -m pip install --upgrade pip
+ python -m pip install poetry==1.1.13
+ python -m pip install setuptools==64.0.2 wheel
+ python -m pip install charset_normalizer==2.1.1
+ python -m poetry install -E installer -E all
+ python -m pip uninstall papermill -y
+ python -m pip install git+https://github.com/nteract/papermill.git@main
+ python -m PyInstaller build/pyinstaller/terminal.spec --clean
+
+ shell: bash
+
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: OpenBB-Windows10-ENV
+ path: dist
+
+
+ Build-Exe:
+ name: Windows10 Build-Exe
+ runs-on: [self-hosted, Windows, x64]
+ needs: Windows-Build
+ # Configuring -------------
+ steps:
+ - name: Setup Windows Git Configuration # This is under the assumption that git is already installed on the system
run: |
- conda activate obb
- poetry install
- - name: Poetry Install Portfolio Optimization and Forecasting Toolkits
- run: |
- conda activate obb
- poetry install -E all
- - name: Poetry Install Installer
- run: |
- conda activate obb
- poetry install -E installer
- - name: Install Specific Papermill
- run: |
- conda activate obb
- pip uninstall papermill -y
- pip install git+https://github.com/nteract/papermill.git@main
- # Building ------------
- - name: Build Terminal.spec file
- run: |
- conda activate obb
- pyinstaller build/pyinstaller/terminal.spec --clean
+ Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 1
+ git config --system core.longpaths true
+
+ - name: Download Artifact
+ uses: actions/download-artifact@v2
+ with:
+ name: OpenBB-Windows10-ENV
+ path: dist
+
- name: Move Files into App Folder
run: cp -r .\dist\OpenBBTerminal\ .\build\nsis\app\
# don't need this because log collection is turned off
@@ -64,16 +79,18 @@ jobs:
# run: Remove-Item .\build\nsis\app\openbb_terminal\logs\ -Recurse
- name: Build Exe File
run: |
- conda activate obb
C:\'.\Program Files (x86)\'\nsis\makensis.exe .\build\nsis\setup.nsi
+
- name: Save Build Artifact
uses: actions/upload-artifact@v3
with:
name: Windows EXE Artifact
path: '.\build\nsis\OpenBB Terminal Setup.exe'
+
- name: Run Integration Tests
run: |
- dist\OpenBBTerminal\OpenBBTerminal.exe C:\Users\Administrator\actions-runner\_work\OpenBBTerminal\OpenBBTerminal\openbb_terminal\miscellaneous\integration_tests_scripts -t
+ dist\OpenBBTerminal\OpenBBTerminal.exe -t
+
# Cleaning ------------------------
# Make sure to add Remove-Item C:\Users\Administrator\Desktop\OPENBB-exports -Recurse whenever integration tests get fixed
- name: Remove Previous Build
@@ -81,10 +98,4 @@ jobs:
Remove-Item '.\build\nsis\OpenBB Terminal Setup.exe' -Recurse
Remove-Item .\build\nsis\app\ -Recurse
Remove-Item .\dist\ -Recurse
- Remove-Item .\build\terminal\ -Recurse
- - name: Deactivate & Remove Conda Environment
- run: |
- conda deactivate obb
- conda deactivate base
- conda env remove -n obb
- Remove-Item C:\Users\Administrator\miniconda3\envs\obb\ -Recurse
+
diff --git a/build/pyinstaller/terminal.spec b/build/pyinstaller/terminal.spec
index e0f193bbc6a..b938962cbaf 100644
--- a/build/pyinstaller/terminal.spec
+++ b/build/pyinstaller/terminal.spec
@@ -1,18 +1,15 @@
# -*- mode: python ; coding: utf-8 -*-
import os
-import pathlib
import subprocess
+import sys
+from pathlib import Path
+
import scipy
-
from dotenv import set_key
-
-from PyInstaller.compat import is_darwin, is_win
-from PyInstaller.building.api import PYZ, EXE, COLLECT
-from PyInstaller.building.splash import Splash
+from PyInstaller.building.api import COLLECT, EXE, PYZ
from PyInstaller.building.build_main import Analysis
-
-
-# import subprocess
+from PyInstaller.building.splash import Splash
+from PyInstaller.compat import is_darwin, is_win
from openbb_terminal.loggers import get_commit_hash
@@ -23,21 +20,30 @@ build_type = (
)
# Local python environment packages folder
-pathex = os.path.join(os.path.dirname(os.__file__), "site-packages")
+venv_path = Path(sys.executable).parent.parent.resolve()
+
+# Check if we are running in a conda environment
+if is_darwin:
+ pathex = os.path.join(os.path.dirname(os.__file__), "site-packages")
+else:
+ if "site-packages" in list(venv_path.iterdir()):
+ pathex = str(venv_path / "site-packages")
+ else:
+ pathex = str(venv_path / "lib" / "site-packages")
+
# Removing unused ARM64 binary
-binary_to_remove = pathlib.Path(
- os.path.join(pathex, "_scs_direct.cpython-39-darwin.so")
-)
+binary_to_remove = Path(os.path.join(pathex, "_scs_direct.cpython-39-darwin.so"))
print("Removing ARM64 Binary: _scs_direct.cpython-39-darwin.so")
binary_to_remove.unlink(missing_ok=True)
+build_assets_folder = os.path.join(os.getcwd(), "build", "pyinstaller")
# Removing inspect hook
-destination = pathlib.Path(
+destination = Path(
os.path.join(pathex, "pyinstaller/hooks/rthooks", "pyi_rth_inspect.py")
)
print("Replacing Pyinstaller Hook: pyi_rth_inspect.py")
-source = "build/pyinstaller/hooks/pyi_rth_inspect.py"
+source = os.path.join(build_assets_folder, "hooks", "pyi_rth_inspect.py")
subprocess.run(["cp", source, str(destination)], check=True)
@@ -77,8 +83,8 @@ added_files = [
]
if is_win:
added_files.append(
- (os.path.join(f"{os.path.dirname(scipy.__file__)}.libs"), "scipy.libs/"),
- )
+ (os.path.join(f"{os.path.dirname(scipy.__file__)}.libs"), "scipy.libs/"),
+ )
# Python libraries that are explicitly pulled into the bundle
hidden_imports = [
"sklearn.utils._cython_blas",
@@ -103,7 +109,7 @@ hidden_imports = [
"_sysconfigdata__darwin_darwin",
"prophet",
"debugpy",
- "scipy.sparse.linalg._isolve._iterative"
+ "scipy.sparse.linalg._isolve._iterative",
]
diff --git a/openbb_terminal/core/integration_tests/integration_controller.py b/openbb_terminal/core/integration_tests/integration_controller.py
index c5b9e3e65dd..8368ef4b06a 100644
--- a/openbb_terminal/core/integration_tests/integration_controller.py
+++ b/openbb_terminal/core/integration_tests/integration_controller.py
@@ -2,35 +2,32 @@
"""Main Testing Module"""
__docformat__ = "numpy"
-from functools import partial
-from multiprocessing.pool import Pool
-from multiprocessing import cpu_count
-from pathlib import Path
-import re
-import time
-from typing import Any, List, Dict, Optional, Tuple
-from traceback import FrameSummary, format_list, extract_tb
import argparse
import logging
-import sys
import os
-from openbb_terminal.helper_funcs import check_positive
+import re
+import sys
+import time
+from functools import partial
+from multiprocessing import cpu_count
+from multiprocessing.pool import Pool
+from pathlib import Path
+from traceback import FrameSummary, extract_tb, format_list
+from typing import Any, Dict, List, Optional, Tuple
-from openbb_terminal.rich_config import console
from openbb_terminal.core.config.paths import (
MISCELLANEOUS_DIRECTORY,
REPOSITORY_DIRECTORY,
)
+from openbb_terminal.helper_funcs import check_positive
+from openbb_terminal.rich_config import console
from openbb_terminal.terminal_controller import (
insert_start_slash,
- terminal,
- replace_dynamic,
obbff,
+ replace_dynamic,
+ terminal,
)
-from openbb_terminal.terminal_helper import (
- is_reset,
- suppress_stdout,
-)
+from openbb_terminal.terminal_helper import is_reset, suppress_stdout
logger = logging.getLogger(__name__)
special_arguments_values = [
@@ -697,6 +694,11 @@ def main():
if "--test" in sys.argv:
sys.argv.remove("--test")
+ os.environ["OPENBB_ENABLE_QUICK_EXIT"] = "True"
+ os.environ["OPENBB_LOG_COLLECT"] = "False"
+ os.environ["OPENBB_USE_ION"] = "False"
+ os.environ["OPENBB_USE_PROMPT_TOOLKIT"] = "False"
+
parse_args_and_run()
diff --git a/openbb_terminal/economy/econdb_model.py b/openbb_terminal/economy/econdb_model.py
index 9e277de8531..49936bdcedf 100644
--- a/openbb_terminal/economy/econdb_model.py
+++ b/openbb_terminal/economy/econdb_model.py
@@ -607,6 +607,10 @@ def get_macro_data(
f"NEW: {df_new_oldest} - {df_new_newest}"
)
+ if not df.empty:
+ df = df.groupby(df.index.strftime("%Y-%m")).head(1)
+ df.index = df.index.strftime("%Y-%m")
+
except HTTPError:
return console.print(
f"There is no data available for the combination {parameter} and {country}."
@@ -724,6 +728,7 @@ def get_aggregated_macro_data(
).T
(df_rounded, denomination) = transform_by_denomination(country_data_df)
+ df_rounded.index = pd.DatetimeIndex(df_rounded.index)
return (
df_rounded,
diff --git a/openbb_terminal/economy/nasdaq_model.py b/openbb_terminal/economy/nasdaq_model.py
index 01d3eb4a40d..943ad69794e 100644
--- a/openbb_terminal/economy/nasdaq_model.py
+++ b/openbb_terminal/economy/nasdaq_model.py
@@ -92,7 +92,7 @@ def get_economic_calendar(
calendar = calendar.rename(
columns={
- "gmt": "Time (GMT)",
+ "gmt": "Time (ET)",
"country": "Country",
"eventName": "Event",
"actual": "Actual",
diff --git a/openbb_terminal/forex/av_model.py b/openbb_terminal/forex/av_model.py
index a2a8ab3f378..e79653252cb 100644
--- a/openbb_terminal/forex/av_model.py
+++ b/openbb_terminal/forex/av_model.py
@@ -100,6 +100,7 @@ def get_historical(
resolution: str = "d",
interval: int = 5,
start_date: str = "",
+ end_date: str = "",
) -> pd.DataFrame:
"""Get historical forex data.
@@ -115,6 +116,8 @@ def get_historical(
Interval for intraday data
start_date : str, optional
Start date for data.
+ end_date : str, optional
+ End date for data.
Returns
-------
@@ -146,6 +149,10 @@ def get_historical(
if not response_json:
console.print("No data found.\n")
else:
+ if "Meta Data" not in response_json and "Information" in response_json:
+ console.print(response_json["Information"])
+ return pd.DataFrame()
+
key = list(response_json.keys())[1]
df = pd.DataFrame.from_dict(response_json[key], orient="index")
@@ -153,6 +160,9 @@ def get_historical(
if start_date and resolution != "i":
df = df[df.index > start_date]
+ if end_date and resolution != "i":
+ df = df[df.index < end_date]
+
df = df.rename(
columns={
"1. open": "Open",
diff --git a/openbb_terminal/forex/forex_controller.py b/openbb_terminal/forex/forex_controller.py
index 5fed5b44736..cc5e965c1b2 100644
--- a/openbb_terminal/forex/forex_controller.py
+++ b/openbb_terminal/forex/forex_controller.py
@@ -150,9 +150,17 @@ class ForexController(BaseController):
"--start",
default=(datetime.now() - timedelta(days=365)),
type=valid_date,
- help="Start date of data.",
+ help="The starting date (format YYYY-MM-DD) of the forex pair",
dest="start_date",
)
+ parser.add_argument(
+ "-e",
+ "--end",
+ type=valid_date,
+ default=datetime.now().strftime("%Y-%m-%d"),
+ dest="end",
+ help="The ending date (format YYYY-MM-DD) of the forex pair",
+ )
if other_args and "-" not in other_args[0][0]:
other_args.insert(0, "-t")
@@ -179,6 +187,7 @@ class ForexController(BaseController):
resolution=ns_parser.resolution,
interval=ns_parser.interval,
start_date=ns_parser.start_date.strftime("%Y-%m-%d"),
+ end_date=ns_parser.end.strftime("%Y-%m-%d"),
source=ns_parser.source,
)
@@ -190,6 +199,7 @@ class ForexController(BaseController):
)
else:
self.data.index.name = "date"
+ console.print(f"{self.from_symbol}-{self.to_symbol} loaded.")
export_data(
ns_parser.export,
@@ -198,12 +208,8 @@ class ForexController(BaseController):
self.data.copy(),
" ".join(ns_parser.sheet_name) if ns_parser.sheet_name else None,
)
-
self.source = ns_parser.source
- if self.source != "YahooFinance":
- console.print(f"{self.from_symbol}-{self.to_symbol} loaded.\n")
else:
-
console.print("\n[red]Make sure to load.[/red]\n")
@log_start_end(log=logger)
diff --git a/openbb_terminal/forex/forex_helper.py b/openbb_terminal/forex/forex_helper.py
index 6e8e1356668..570fcf272c5 100644
--- a/openbb_terminal/forex/forex_helper.py
+++ b/openbb_terminal/forex/forex_helper.py
@@ -98,6 +98,7 @@ def load(
resolution: str = "d",
interval: str = "1day",
start_date: Optional[str] = None,
+ end_date: Optional[str] = None,
source: str = "YahooFinance",
verbose: bool = False,
) -> pd.DataFrame:
@@ -115,6 +116,8 @@ def load(
What interval to get data for, by default "1day"
start_date : Optional[str], optional
When to begin loading in data, by default last_year.strftime("%Y-%m-%d")
+ end_date : Optional[str], optional
+ When to end loading in data, by default None
source : str, optional
Where to get data from, by default "YahooFinance"
verbose : bool, optional
@@ -124,10 +127,17 @@ def load(
-------
pd.DataFrame
The loaded data
+
+ Examples
+ --------
+ >>> from openbb_terminal.sdk import openbb
+ >>> openbb.forex.load(from_symbol="EUR", to_symbol="USD", start_date="2020-11-30", end_date="2022-12-01")
"""
if start_date is None:
start_date = (datetime.now() - timedelta(days=365)).strftime("%Y-%m-%d")
+ if end_date is None:
+ end_date = datetime.now().strftime("%Y-%m-%d")
if source in ["YahooFinance", "AlphaVantage"]:
interval_map = INTERVAL_MAPS[source]
@@ -159,6 +169,7 @@ def load(
resolution=resolution,
interval=clean_interval,
start_date=start_date,
+ end_date=end_date,
)
df.index.name = "date"
return df
@@ -167,6 +178,7 @@ def load(
df = yf.download(
f"{from_symbol}{to_symbol}=X",
start=datetime.strptime(start_date, "%Y-%m-%d"),
+ end=datetime.strptime(end_date, "%Y-%m-%d"),
interval=clean_interval,
progress=verbose,
)
@@ -185,6 +197,7 @@ def load(
multiplier=multiplier,
timespan=timeframe,
start_date=start_date,
+ end_date=end_date,
)
df.index.name = "date"
return df
diff --git a/openbb_terminal/helper_funcs.py b/openbb_terminal/helper_funcs.py
index 264a159aee1..aac76938bb6 100644
--- a/openbb_terminal/helper_funcs.py
+++ b/openbb_terminal/helper_funcs.py
@@ -151,8 +151,6 @@ def parse_and_split_input(an_input: str, custom_filters: List) -> List[str]:
if an_input:
if an_input == "/":
an_input = "home"
- elif an_input[0] == "/":
- an_input = "home" + an_input
# everything from ` -f ` to the next known extension
file_flag = r"(\ -f |\ --file )"
diff --git a/openbb_terminal/miscellaneous/i18n/en.yml b/openbb_terminal/miscellaneous/i18n/en.yml
index 9c26988fff0..12a31f6424a 100644
--- a/openbb_terminal/miscellaneous/i18n/en.yml
+++ b/openbb_terminal/miscellaneous/i18n/en.yml
@@ -1,20 +1,21 @@
en:
_home_: Information, guides and support for the OpenBB Terminal
+ intro: introduction on the OpenBB Terminal
about: discover the capabilities of the OpenBB Terminal (https://openbb.co/docs)
support: pre-populate a support ticket for our team to evaluate
survey: fill in our 2-minute survey so we better understand how we can improve the terminal
update: attempt to update the terminal automatically (GitHub version)
- exe: execute automated routine script
+ wiki: search for an expression in Wikipedia (https://www.wikipedia.org/)
news: display news articles based on term and data sources
- settings: tune settings (export folder, timezone, language, plot size)
+ keys: set API keys and check their validity
featflags: enable and disable feature flags
sources: select your preferred data sources
account: manage your OpenBB account
- keys: set API keys and check their validity
- wiki: search for an expression in Wikipedia (https://www.wikipedia.org/)
- record: record session to be converted into a .openbb routine
- stop: stop session recording
- intro: introduction on the OpenBB Terminal
+ settings: tune settings (export folder, timezone, language, plot size)
+ _scripts_: Record and execute your own .openbb routine scripts
+ record: start recording current session
+ stop: stop session recording and convert to .openbb routine
+ exe: execute .openbb routine scripts (use exe --example for an example)
_configure_: Configure your own terminal
_main_menu_: Main menu
account/_info_: Cloud storage of keys, settings and feature flags
@@ -915,7 +916,7 @@ en:
econometrics/coint: co-integration test on a multitude of columns
portfolio/bro: brokers holdings, supports robinhood, ally, degiro, coinbase
portfolio/po: portfolio optimization, optimize your portfolio weights efficiently
- portfolio/load: load transactions into the portfolio
+ portfolio/load: load transactions into the portfolio (use load --example for an example)
portfolio/_loaded: Loaded transactions
portfolio/_riskfreerate: Risk Free Rate
portfolio/show: show existing transactions
@@ -974,7 +975,7 @@ en:
portfolio/bro/cb/deposits: show all your deposits or internal transfers
portfolio/bro/cb/orders: show all your orders
portfolio/po/file: file that contains portfolio risk parameters
- portfolio/po/load: load tickers and categories from .xlsx or .csv file
+ portfolio/po/load: load tickers and categories from .xlsx or .csv file (use load --example for an example)
portfolio/po/_loaded: Portfolio loaded
portfolio/po/_tickers: Tickers
portfolio/po/_categories: Categories
diff --git a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_po_show_plot_rpf.openbb b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_po_show_plot_rpf.openbb
index 4277466898d..8a0cb7b9022 100644
--- a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_po_show_plot_rpf.openbb
+++ b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_po_show_plot_rpf.openbb
@@ -9,7 +9,7 @@ plot
plot -pf a,b
plot -ct a,b
plot -pf a,b -ct c,d
-load --file 50_30_10_10_Portfolio.xlsx
+load --example
show -pf a,b -ct c,d
show -pf a
show -ct c
@@ -39,7 +39,7 @@ plot -pf name_0,maxsharpe_1 -ct c,sector,current_invested_amount -dd
plot -pf name_0,maxsharpe_1 -ct c,sector,current_invested_amount -rc
plot -pf name_0,maxsharpe_1 -ct c,sector,current_invested_amount -he
..
-load --file market.csv
+load --example
po
equal
show -pf name_0
diff --git a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio.openbb b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio.openbb
index 6fc6c3e2be8..231ff561866 100644
--- a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio.openbb
+++ b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio.openbb
@@ -1,5 +1,5 @@
portfolio
-load -f Public_Equity_Orderbook.xlsx
+load --example
show
bench QQQ
alloc assets -t -l 4
diff --git a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_boolean_args.openbb b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_boolean_args.openbb
index 97abd141325..86200467502 100644
--- a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_boolean_args.openbb
+++ b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_boolean_args.openbb
@@ -1,8 +1,8 @@
portfolio
-load --file Public_Equity_Orderbook.xlsx
+load --example
po
params
-load OpenBB_Parameters_Template_v1.0.0.xlsx
+load
set ef
arg tangency False
arg log_returns True
diff --git a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_po.openbb b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_po.openbb
index b015297f6e7..7a8a62c261d 100644
--- a/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_po.openbb
+++ b/openbb_terminal/miscellaneous/integration_tests_scripts/portfolio/test_portfolio_po.openbb
@@ -1,7 +1,7 @@
portfolio
po
-load 60_40_Portfolio.xlsx
-file --file example.ini
+load --example
+file
maxsharpe -s 2022-10-20
minrisk -r 0.05
maxutil -a 0.1 -ra 2 -tk 0.4 -tr 8
@@ -23,7 +23,7 @@ plot -pf MAXSHARPE_0 -rc
plot -pf MAXSHARPE_0 -he
rpf NAME_6
..
-load --file market.csv
+load --example
po
equal
maxsharpe -s 1995-05-07
diff --git a/openbb_terminal/miscellaneous/integration_tests_scripts/reports/test_reports_portfolio.openbb b/openbb_terminal/miscellaneous/integration_tests_scripts/reports/test_reports_portfolio.openbb
index 24cf93a6264..87790de1c66 100644
--- a/openbb_terminal/miscellaneous/integration_tests_scripts/reports/test_reports_portfolio.openbb
+++ b/openbb_terminal/miscellaneous/integration_tests_scripts/reports/test_reports_portfolio.openbb
@@ -1,8 +1,8 @@
reports
-portfolio Public_Equity_Orderbook.xlsx
+portfolio --transactions holdings_example.xlsx
# Test with invalid path
-portfolio Public_Equity_Orderbook_test.xlsx
+portfolio --transactions holdings_test.xlsx
exit
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/allocation/50_30_10_10_Portfolio.xlsx b/openbb_terminal/miscellaneous/portfolio/allocation_example.xlsx
similarity index 100%
rename from openbb_terminal/miscellaneous/portfolio_examples/allocation/50_30_10_10_Portfolio.xlsx
rename to openbb_terminal/miscellaneous/portfolio/allocation_example.xlsx
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/holdings/Public_Equity_Orderbook.xlsx b/openbb_terminal/miscellaneous/portfolio/holdings_example.xlsx
similarity index 100%
rename from openbb_terminal/miscellaneous/portfolio_examples/holdings/Public_Equity_Orderbook.xlsx
rename to openbb_terminal/miscellaneous/portfolio/holdings_example.xlsx
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/allocation/.gitkeep b/openbb_terminal/miscellaneous/portfolio_examples/allocation/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/allocation/60_40_Portfolio.xlsx b/openbb_terminal/miscellaneous/portfolio_examples/allocation/60_40_Portfolio.xlsx
deleted file mode 100644
index bc503fbb0f8..00000000000
Binary files a/openbb_terminal/miscellaneous/portfolio_examples/allocation/60_40_Portfolio.xlsx and /dev/null differ
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/allocation/Fixed_Income_Portfolio.xlsx b/openbb_terminal/miscellaneous/portfolio_examples/allocation/Fixed_Income_Portfolio.xlsx
deleted file mode 100644
index 234c22aeb67..00000000000
Binary files a/openbb_terminal/miscellaneous/portfolio_examples/allocation/Fixed_Income_Portfolio.xlsx and /dev/null differ
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/allocation/OpenBB_Portfolio_Template_v1.0.0.xlsx b/openbb_terminal/miscellaneous/portfolio_examples/allocation/OpenBB_Portfolio_Template_v1.0.0.xlsx
deleted file mode 100644
index 8dfbece9815..00000000000
Binary files a/openbb_terminal/miscellaneous/portfolio_examples/allocation/OpenBB_Portfolio_Template_v1.0.0.xlsx and /dev/null differ
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/allocation/Public_Equity_Portfolio.xlsx b/openbb_terminal/miscellaneous/portfolio_examples/allocation/Public_Equity_Portfolio.xlsx
deleted file mode 100644
index f336b405f8a..00000000000
Binary files a/openbb_terminal/miscellaneous/portfolio_examples/allocation/Public_Equity_Portfolio.xlsx and /dev/null differ
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/allocation/SP_500_Portfolio.xlsx b/openbb_terminal/miscellaneous/portfolio_examples/allocation/SP_500_Portfolio.xlsx
deleted file mode 100644
index 7ba0a3d4e35..00000000000
Binary files a/openbb_terminal/miscellaneous/portfolio_examples/allocation/SP_500_Portfolio.xlsx and /dev/null differ
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/holdings/Public_Equity_Orderbook_No_Categorization.xlsx b/openbb_terminal/miscellaneous/portfolio_examples/holdings/Public_Equity_Orderbook_No_Categorization.xlsx
deleted file mode 100644
index 17da66e307f..00000000000
Binary files a/openbb_terminal/miscellaneous/portfolio_examples/holdings/Public_Equity_Orderbook_No_Categorization.xlsx and /dev/null differ
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/holdings/bitcoin.csv b/openbb_terminal/miscellaneous/portfolio_examples/holdings/bitcoin.csv
deleted file mode 100644
index beb660ed0dc..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/holdings/bitcoin.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-Date,Ticker,Type,Sector,Industry,Country,Price,Quantity,Fees,Premium,Investment,Side,Currency
-7/20/2021,btc,CRYPTO,Digital Currency,Large,United States,29790,1,0,0,29790,Buy,USD
-7/25/2021,eth,CRYPTO,Digital Asset,Mid,United States,29799,1,0,0,29799,Buy,USD
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/holdings/example.csv b/openbb_terminal/miscellaneous/portfolio_examples/holdings/example.csv
deleted file mode 100644
index 55a8cf7f1a4..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/holdings/example.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Date,Ticker,Type,Sector,Industry,Country,Price,Quantity,Fees,Premium,Investment,Side,Currency
-3/24/2021,aapl,stock,Technology,Communication Services,United States,120.7,300,0,0,0,Buy,USD
-3/26/2021,msft,stock,Technology,Communication Services,United States,232.8,200,0,0,0,Buy,USD
-5/21/2021,btc,crypto,Digital Assets,Digital Assets,United States,37430,1,0,0,0,Buy,USD
-7/2/2021,aapl,stock,Technology,Communication Services,United States,139.8,300,0,0,0,Buy,USD
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/holdings/market.csv b/openbb_terminal/miscellaneous/portfolio_examples/holdings/market.csv
deleted file mode 100644
index ae9346301cb..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/holdings/market.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-Date,Ticker,Type,Sector,Industry,Country,Price,Quantity,Fees,Premium,Investment,Side,Currency
-10/12/2018,QQQ,ETF,American Technology,Large,United States,174.32,30,0,0,0,Buy,USD
-6/5/2020,SPY,ETF,American Market,Large,United States,319.34,10,0,0,0,Buy,USD
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/optimization/.gitkeep b/openbb_terminal/miscellaneous/portfolio_examples/optimization/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/optimization/OpenBB_Parameters_Template_v1.0.0.xlsx b/openbb_terminal/miscellaneous/portfolio_examples/optimization/OpenBB_Parameters_Template_v1.0.0.xlsx
deleted file mode 100644
index 56ffb4d5e05..00000000000
Binary files a/openbb_terminal/miscellaneous/portfolio_examples/optimization/OpenBB_Parameters_Template_v1.0.0.xlsx and /dev/null differ
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/optimization/dany.ini b/openbb_terminal/miscellaneous/portfolio_examples/optimization/dany.ini
deleted file mode 100644
index f83b9c989f0..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/optimization/dany.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[OPENBB]
-freq = d
-maxnan = 0.1923912931924
-method = time
-risk_measure = MV
-alpha = 3
-
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/optimization/dd.ini b/openbb_terminal/miscellaneous/portfolio_examples/optimization/dd.ini
deleted file mode 100644
index dd7f6eaec74..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/optimization/dd.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[OPENBB]
-freq = d
-maxnan = 0.05
-method = time
-risk_measure = MV
-
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/optimization/defaults.ini b/openbb_terminal/miscellaneous/portfolio_examples/optimization/defaults.ini
deleted file mode 100644
index 07a62ace099..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/optimization/defaults.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[OPENBB]
-historic_period=3y
-log_returns=0
-return_frequency=d
-max_nan=0.05
-threshold_value=0.3
-nan_fill_method=time
-significance_level=0.05
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/optimization/example.ini b/openbb_terminal/miscellaneous/portfolio_examples/optimization/example.ini
deleted file mode 100644
index 2d90c95cef0..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/optimization/example.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[OPENBB]
-interval=3y
-log_returns=0
-freq=d
-maxnan=0.05
-threshold=0.3
-alpha=0.05
diff --git a/openbb_terminal/miscellaneous/portfolio_examples/optimization/james.ini b/openbb_terminal/miscellaneous/portfolio_examples/optimization/james.ini
deleted file mode 100644
index d53c47b6845..00000000000
--- a/openbb_terminal/miscellaneous/portfolio_examples/optimization/james.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[OPENBB]
-freq = d
-maxnan = 1.69
-method = time
-risk_measure = MV
-alpha = 3
-
diff --git a/openbb_terminal/miscellaneous/routines/.gitkeep b/openbb_terminal/miscellaneous/routines/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/openbb_terminal/miscellaneous/routines/README.md b/openbb_terminal/miscellaneous/routines/README.md
deleted file mode 100644
index 72dbe67a594..00000000000
--- a/openbb_terminal/miscellaneous/routines/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# ROUTINES
-
-This folder introduces the concept of routines, which are meant for the user to develop and run at once. The notebook reports is a better approach to this idea, but currently the development of this is not trivial. On the other hand, the development of this is trivial as long as the user is familiar with our terminal interface.
-
-Try out with:
-
-```bash
-python terminal.py routines/example.openbb
-```
-
-Or within the Terminal, use:
-
-```bash
-exe routines/example.openbb
-```
diff --git a/openbb_terminal/miscellaneous/routines/comparison_demo.openbb b/openbb_terminal/miscellaneous/routines/comparison_demo.openbb
deleted file mode 100644
index 421be297e85..00000000000
--- a/openbb_terminal/miscellaneous/routines/comparison_demo.openbb
+++ /dev/null
@@ -1,29 +0,0 @@
-# Go into the stocks context
-stocks
-
-# Load a ticker that's given as a first argument of the routine
-load USB
-
-# Go into the Comparison Analysis Menu
-ca
-
-# Get similar companies
-set C,USB,WFC,JPM,TD,GS,PNC,TFC,BAC,COF
-
-# Show the historical prices
-historical -n
-
-# Show a correlation matrix
-hcorr
-
-# Compare valuations
-valuation
-
-# Compare performance
-performance
-
-# Show cashflows
-cashflow
-
-# Return to home
-/
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/darkpool_demo.openbb b/openbb_terminal/miscellaneous/routines/darkpool_demo.openbb
deleted file mode 100644
index ae6fd33616a..00000000000
--- a/openbb_terminal/miscellaneous/routines/darkpool_demo.openbb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Select location folder to export data to (if doesn't exist, will be created by default)
-# export didier_analysis_on_$ARGV[0]
-
-# Go into the stocks context
-stocks
-
-# Navigate to Dark Pools and Short Data Menu
-dps
-
-# Show the most shorted stocks on Yahoo Finance
-shorted
-
-# Show the stocks with the highest short interest on https://highshortinterest.com
-hsi
-
-# Show the top 25 largest Dark Pool positions from https://stockgrid.io
-pos -l 25
-pos -l 25 -a
-
-# Get the Cost-to-Borrow List
-ctb
-
-# Get the days-to-cover list and sort
-sidtc -s si
-sidtc
-
-# Load Apple as a ticker
-load AAPL
-
-# Short Volume vs Position
-spos
-
-# Price vs. Short Interest
-psi
-
-# Export the Cost-to-Borrow list as a spreadsheet to examine.
-ctb
-
-# Return to home
-/
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/dd_demo.openbb b/openbb_terminal/miscellaneous/routines/dd_demo.openbb
deleted file mode 100644
index 873b8e0d745..00000000000
--- a/openbb_terminal/miscellaneous/routines/dd_demo.openbb
+++ /dev/null
@@ -1,38 +0,0 @@
-# Select location folder to export data to (if doesn't exist, will be created by default)
-# export didier_analysis_on_$ARGV[0]
-
-# Go into the stocks context
-stocks
-
-# Load a ticker that's given as a first argument of the routine
-load CF
-
-# Enter the Due Diligence submenu
-dd
-
-# Print last twenty SEC filings
-sec -l 20
-
-# Print a chart and raw table of historical price targets
-pt
-pt -l 20 --raw
-
-# See a list of public companies that are customers of, or suppliers to, CF Industries
-customer
-supplier
-
-# Change tickers to $TSLA
-load tsla
-
-# Display table of the last twenty $TSLA trades across all ARK funds
-arktrades -l 20
-
-# Export a spreadsheet of historic ARK fund trades of $HOOD
-load hood
-arktrades --export xlsx
-
-# Show future earnings estimates for $HOOD
-est
-
-# Show recent analyst upgrades/downgrades
-analyst
diff --git a/openbb_terminal/miscellaneous/routines/discovery_demo.openbb b/openbb_terminal/miscellaneous/routines/discovery_demo.openbb
deleted file mode 100644
index d4a61701214..00000000000
--- a/openbb_terminal/miscellaneous/routines/discovery_demo.openbb
+++ /dev/null
@@ -1,29 +0,0 @@
-# Enter the discovery menu
-stocks/disc
-
-# Show a dividend calendar
-divcal -l 25
-
-# Show upcoming earnings
-upcoming
-
-# Show Ark trades
-arkord
-
-# See news from Alpha Vantage
-cnews -t issuance
-cnews -t m-a
-
-# Gainers and Losers from Yahoo
-gainers
-losers
-active
-
-# Fidelity Order Flow
-ford -l 25
-
-# Next IPOs scheduled
-fipo
-
-# Hot Penny Stocks
-hotpenny -l 25
diff --git a/openbb_terminal/miscellaneous/routines/due_diligence_stock.openbb b/openbb_terminal/miscellaneous/routines/due_diligence_stock.openbb
deleted file mode 100644
index 26a6404cdd6..00000000000
--- a/openbb_terminal/miscellaneous/routines/due_diligence_stock.openbb
+++ /dev/null
@@ -1,83 +0,0 @@
-# This script requires you to use a ticker as an argument. This can be done with the following:
-# exe due_diligence_stock.openbb -i AMT
-
-# Go to the stocks menu
-stocks
-
-# Load a ticker, given the argument used. E.g. -i AMT
-load $ARGV[0]
-
-# Display stock price over time
-candle
-
-# Check market cap
-fa/mktcap
-
-# Check company management
-mgmt
-
-# Check fundamentals
-income/balance/cash
-
-# Look into sustainability
-sust
-
-# Look into historical dividends
-divs
-
-# Display most important notes of SEC filings based on a NLP model
-analysis
-
-# Create discounted cash flow spreadsheet
-dcf
-
-# show latest insider activity
-../ins/stats
-
-# check price vs short interest volume
-../dps/psi
-
-# check historical quarterly government contracts
-../gov/histcont
-
-# check rating from analysts
-../dd/rating
-
-# check price targets over time along share price
-pt
-
-# check annual earnings estimates
-est
-
-# check simple moving average 20,50 window
-../ta/sma
-
-# check recommendation and summary based on main technical analysis indicators
-recom/summary
-
-# check Twitter's sentiment on the ticker
-../ba/sentiment
-
-# go into sector and industry analysis menu
-../sia
-
-# check total cash metrics across similar tickers
-metric tc
-
-# check free cash flow metrics across similar tickers
-metric fcf
-
-# check operating income over time
-vis oi
-
-# go into comparison analysis menu
-ca
-
-# share price over time
-historical
-
-# correlation heatmap
-hcorr
-
-# compare fundamentals across these companies
-cashflow/balance/income
diff --git a/openbb_terminal/miscellaneous/routines/econometrics_demo.openbb b/openbb_terminal/miscellaneous/routines/econometrics_demo.openbb
deleted file mode 100644
index ce9c33b90ee..00000000000
--- a/openbb_terminal/miscellaneous/routines/econometrics_demo.openbb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Go into the econometrics context
-econometrics
-
-# Load the wage_panel dataset and include an alias
-load wage_panel -a wp
-
-# Set the MultiIndex, allowing for Panel regressions to be performed
-index wp -i nr,year
-
-# Change the type of the year column so it can be included as time effects within the regressions
-type wp.year -f category
-
-# Perform a Pooled OLS, Random Effects and Fixed Effects estimation
-panel -d wp.lwage -i wp.black,wp.hisp,wp.exper,wp.expersq,wp.married,wp.educ,wp.union,wp.year
-panel -d wp.lwage -i wp.black,wp.hisp,wp.exper,wp.expersq,wp.married,wp.educ,wp.union,wp.year -r re
-panel -d wp.lwage -i wp.expersq,wp.union,wp.married,wp.year -r fe
-
-# Compare the results obtained from these regressions
-compare
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/example.openbb b/openbb_terminal/miscellaneous/routines/example.openbb
deleted file mode 100644
index 69e4cb4b4a4..00000000000
--- a/openbb_terminal/miscellaneous/routines/example.openbb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Go to the stocks menu
-stocks
-
-# Load Palantir Technologies (PLTR)
-load pltr
-
-# Enter the Due Diligence (dd) menu
-dd
-
-# Show price targets, both the chart and the table
-pt
-pt --raw
-
-# Enter the Insider menu
-../ins
-
-# Show open insider filtered data for Palantir Technologies
-stats
-
-# Enter the Technical Analysis (ta) menu
-../ta
-
-# Show the fibonacci retracement levels
-fib
-
-# Return to home
-/
diff --git a/openbb_terminal/miscellaneous/routines/example_with_inputs.openbb b/openbb_terminal/miscellaneous/routines/example_with_inputs.openbb
deleted file mode 100644
index 20a6397a37f..00000000000
--- a/openbb_terminal/miscellaneous/routines/example_with_inputs.openbb
+++ /dev/null
@@ -1,26 +0,0 @@
-# This script requires you to use arguments. This can be done with the following:
-# exe example_with_inputs.openbb -i TSLA,AAPL,MSFT
-
-# Go to the stocks menu
-stocks
-
-# Load a ticker, given the argument used. E.g. -i TSLA
-load $ARGV[0]
-
-# Enter the Technical Analysis (ta) menu
-ta
-
-# Show the fibonacci retracement levels
-fib
-
-# Enter the comparison analysis (ca) menu
-../ca
-
-# Set two extra tickers based on the arguments used. E.g. -i TSLA,AAPL,MSFT
-set $ARGV[1],$ARGV[2]
-
-# Plot the historical prices
-historical
-
-# Return to home
-/
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/example_with_inputs_saved.openbb b/openbb_terminal/miscellaneous/routines/example_with_inputs_saved.openbb
deleted file mode 100644
index 89355838c11..00000000000
--- a/openbb_terminal/miscellaneous/routines/example_with_inputs_saved.openbb
+++ /dev/null
@@ -1,80 +0,0 @@
-# This script requires you to use an argument. This can be done with the following:
-# exe routines/example_with_inputs_saved.openbb -i AMZN
-
-# Select location folder to export data to (if doesn't exist, will be created by default)
-export didier_analysis_on_$ARGV[0]
-
-# Go into the stocks context
-stocks
-
-# Load a ticker that's given as a first argument of the routine
-load $ARGV[0]
-
-# Go into the Sector and Industry analysis
-sia
-
-# When filtering by industry peers remove market cap filtering
-clear mktcap
-
-# Compare ticker against industry peers regarding their revenues over time
-vis re --export jpg
-
-# Filter by large market cap
-mktcap Large
-
-# Compare industry peers (with large market cap) regarding their current quick ratio
-metric qr --export jpg
-
-# Take these companies to Comparison Analysis menu
-ca
-
-# Access these companies historical raw price since 2019
-historical -s 2019-01-01 -n --export jpg
-
-# Compute their correlation of price
-hcorr -s 2019-01-01 --export jpg
-
-# Compare their income statements for current year
-income --export csv
-
-# Go back one menu to the main stocks context
-..
-
-# Enter in the Dark Pool short menu
-dps
-
-# Shows stock price vs short interest volume
-psi --export jpg,csv
-
-# Go back one menu and go into Behavioural Analysis menu
-../ba
-
-# Check interest on google search of covid and quarantine correlated with ticker price
-interest -s 2019-01-01 -w covid,quarantine --export interest_with_covid_quarantine.jpg
-
-# Correlate headlines news sentiment with stock price
-snews --export jpg
-
-# Check shareholders of company (leave menu, go into Fundamental Analysis command and call command)
-../fa/shrs --export csv
-
-# Get SEC filings
-../dd/sec --export csv
-
-# Analyst ratings over time
-rot --export jpg
-
-# Price targets over time vs stock price
-pt --export jpg
-
-# Apply Relative Strength Index to the stock price
-../ta/rsi --export jpg
-
-# Get similar companies arccording to Finnhub API
-../ca/getfinnhub
-
-# Compare their volume
-volume --export jpg
-
-# Return to home
-/
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/fa_demo.openbb b/openbb_terminal/miscellaneous/routines/fa_demo.openbb
deleted file mode 100644
index 483c15c08e3..00000000000
--- a/openbb_terminal/miscellaneous/routines/fa_demo.openbb
+++ /dev/null
@@ -1,47 +0,0 @@
-# Demonstration of the Fundamental Analysis features, with a user-defined ticker.
-# This can be done on the home menu through 'exe fa_demo.openbb -i AAPL'
-
-# Enter stocks menu, load $ARGV[0], enter the Fundamental Analysis submenu and show a quote and overview statistics.
-stocks
-load $ARGV[0]
-fa
-quote
-overview
-mgmt
-
-# NLP analysis of SEC filings
-analysis
-
-# Table of the corporate executives with links to their recent trading activity.
-mgmt
-
-# Major shareholders
-shrs
-
-# Sustainability Metrics
-sust
-
-# Performance ratios
-key
-enterprise -l 10
-ratios -l 10
-growth -l 10
-metrics -l 10
-
-# Financial Statements
-income --source Polygon
-income -q -l 8 --source Polygon
-balance --source Polygon
-balance -q -l 8 --source Polygon
-cash -l 8 --source FinancialModelingPrep
-data
-
-# Charts
-divs -p
-splits
-mktcap -s 1900-01-01
-
-
-# Discount Cash Flow
-dcfc -l 10
-dcf
diff --git a/openbb_terminal/miscellaneous/routines/gov_demo.openbb b/openbb_terminal/miscellaneous/routines/gov_demo.openbb
deleted file mode 100644
index 3ece377a48f..00000000000
--- a/openbb_terminal/miscellaneous/routines/gov_demo.openbb
+++ /dev/null
@@ -1,43 +0,0 @@
-# This script requires you to use arguments. This can be done with the following:
-# exe routines/example_with_inputs.openbb -i TSLA,AAPL,MSFT
-
-# Go to the Government submenu
-stocks
-gov
-
-# Last Senate, Congress & House trades
-lasttrades congress
-lasttrades senate
-lasttrades house
-
-# Lobbying efforts
-toplobbying
-toplobbying -l 50 --raw
-
-# Government spending
-lastcontracts -p 1 -l 100 -s
-
-# Load Microsoft for analysis
-load msft
-
-# Show government officials trades over six months
-gtrades congress
-gtrades congress --raw
-gtrades senate
-gtrades senate --raw
-gtrades house
-gtrades house --raw
-
-# Show MSFT lobbying efforts on sigle-issue agendas
-lobbying -l 20
-
-# Historical Quarterly Government Contracts Awarded to MSFT
-histcont
-
-# Top tickers for overall trading by elected officials
-topbuys congress
-topbuys senate
-topbuys house
-topsells congress
-topsells senate
-topsells house
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/insider_demo.openbb b/openbb_terminal/miscellaneous/routines/insider_demo.openbb
deleted file mode 100644
index 40a181983f4..00000000000
--- a/openbb_terminal/miscellaneous/routines/insider_demo.openbb
+++ /dev/null
@@ -1,34 +0,0 @@
-# This script does not require you to use arguments.
-
-# Go to the Insider Trading menu.
-stocks
-ins
-
-# Commands not dependent on a loaded ticker
-lcb
-lit
-lis
-blcs
-tispm
-tippm
-lip
-lpsb
-
-# Screener functions
-set Gold-Silver
-filter
-set Retail-Trade
-filter
-set Guided-Missiles
-filter
-set Credit-Industry
-filter
-set Pharmaceuticals
-filter
-
-# Functions requiring a ticker
-
-load spgi -s 2022-01-01
-act
-stats
-lins
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/options_demo.openbb b/openbb_terminal/miscellaneous/routines/options_demo.openbb
deleted file mode 100644
index 7c7091f8b7f..00000000000
--- a/openbb_terminal/miscellaneous/routines/options_demo.openbb
+++ /dev/null
@@ -1,58 +0,0 @@
-# This script does not require you to use arguments.
-
-# Go to the Options menu and load SPY with an expiry that is the second closest date.
-stocks
-options
-load SPY
-exp 0
-
-# Show the chain's info
-info
-
-# Show the Put/Call Ratio with a 10, 30, and 90 day window.
-pcr -l 10
-pcr -l 30
-pcr -l 90
-
-# Show Open Interest and Volume
-vol
-oi
-
-# Plot strike vs last trade date of puts and calls.
-plot -p -x s -y ltd
-plot -x s -y ltd
-
-# Plot the volatility smile of puts and calls.
-plot -c smile
-plot -p -c smile
-
-# Get chains and greeks data and export to spreadsheet.
-
-chains --export xlsx
-greeks -a -d 1.4 -r 1
-greeks -p -a -d 1.4 -r 1
-
-# Binomial pricing for $400 strike put and call.
-binom -s 400
-binom -p -s 400
-
-# Run screeners
-
-screen
-set Highest_OI
-scr
-set Highest_Volume
-scr
-set Highest_IV
-scr
-set SPY_ATM_Calls
-scr
-set SPY_ATM_Poots
-
-# Show unusual options list and export to a spreadsheet
-..
-unu -l 500 --export xlsx
-
-
-
-
diff --git a/openbb_terminal/miscellaneous/routines/portfolio_optimization_demo.openbb b/openbb_terminal/miscellaneous/routines/portfolio_optimization_demo.openbb
deleted file mode 100644
index 8e7826bdd1d..00000000000
--- a/openbb_terminal/miscellaneous/routines/portfolio_optimization_demo.openbb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Go to the Portfolio Optimization (po) menu
-portfolio/po
-
-# Load in an allocation sheet with all S&P 500 tickers
-load SP_500_Portfolio.xlsx
-
-# Load in a parameters file
-file OpenBB_Parameters_Template_v1.0.0.xlsx
-
-# Apply the Hierarchical Risk Parity (hrp) technique
-hrp
-
-# Show HRP results based on sector
-show HRP_0 -ct SECTOR
-
-# Plot the sector distribution
-plot HRP_0 -ct SECTOR -pi
-
-# Show a histogram of returns and drawdowns
-plot HRP_0 -ct SECTOR -hi -dd
-
-# Show assets clustermap and risk contribution
-plot HRP_0 -ct SECTOR -rc -he
-
-# Return to home
-/
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/routine_example.openbb b/openbb_terminal/miscellaneous/routines/routine_example.openbb
new file mode 100644
index 00000000000..95f4efd903a
--- /dev/null
+++ b/openbb_terminal/miscellaneous/routines/routine_example.openbb
@@ -0,0 +1,23 @@
+# Go into the stocks context
+stocks
+
+# Load a company ticker, e.g. Apple
+load AAPL
+
+# Show a candle chart with a 20 day Moving Average
+candle --ma 20
+
+# Switch over to the Due Diligence menu
+dd
+
+# Show analyst ratings
+analyst
+
+# Show price targets charts
+pt
+
+# Show future estimations
+est
+
+# Return to home
+home
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/stock_screener_demo.openbb b/openbb_terminal/miscellaneous/routines/stock_screener_demo.openbb
deleted file mode 100644
index d2d2af3f1fd..00000000000
--- a/openbb_terminal/miscellaneous/routines/stock_screener_demo.openbb
+++ /dev/null
@@ -1,47 +0,0 @@
-# Enter the Stock Screener menu
-stocks/scr
-
-# Top Gainers
-technical -s Gap
-technical -s RSI
-overview -s Volume
-
-# Strong Support Levels Preset
-set stocks_strong_support_levels
-overview
-performance
-financial
-
-# Multiple Bottom Preset
-set multiple_bottom
-technical -l 15 -s RSI
-
-# Cheap Dividend
-set cheap_dividend
-overview -l 20 -s Market Cap
-
-# Potential Reversals
-set potential_reversals
-performance -s Perf Week
-overview -s Volume
-
-# Unusual Volume
-set unusual_volume
-performance -l 20 -s Volume
-overview -l 20 -s Market Cap
-
-# Value stocks
-set value_stocks
-overview -s Market Cap
-performance
-
-# Major News
-set major_news
-overview -l 20 -s Market Cap
-performance -l 20 -s Volume
-
-# Display Correlation Heat Map of the last screened tickers
-ca
-hcorr -t r --display-full-matrix
-
-# Scroll back up the terminal screen to review the different outputs of the screeners
diff --git a/openbb_terminal/miscellaneous/routines/stocks_demo.openbb b/openbb_terminal/miscellaneous/routines/stocks_demo.openbb
deleted file mode 100644
index 834a94e4044..00000000000
--- a/openbb_terminal/miscellaneous/routines/stocks_demo.openbb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Go into the stocks context
-stocks
-
-# Load a company ticker, e.g. Amazon
-load AMZN
-
-# Show a simple plot of the ticker, adding in any basic indicator.
-candle --ma 20,30
-
-# Switch over to the due diligence menu
-dd
-
-# Show the price targets of Amazon, both the graph as well as the table
-pt
-pt --raw
-
-# Show estimates of annual and quarterly earnings as well as quarterly revenue estimates
-est
-
-# Open the comparison analysis menu (ca)
-../ca
-
-# Pick stocks that are competitors to Amazon
-add ebay,wmt,tgt,baba,jd
-
-# Determine the valuations of each company
-valuation
-
-# Show correlations between each company
-hcorr
-
-# Figure out the sentiment perceived of each company
-sentiment
-
-# Return to home
-/
diff --git a/openbb_terminal/miscellaneous/routines/ta_demo.openbb b/openbb_terminal/miscellaneous/routines/ta_demo.openbb
deleted file mode 100644
index ab835c4bad8..00000000000
--- a/openbb_terminal/miscellaneous/routines/ta_demo.openbb
+++ /dev/null
@@ -1,37 +0,0 @@
-# Demonstration of the Technical Analysis features, using SPY. No arguments are required to run this routine.
-
-# Enter stocks menu, load intraday SPY with 30 minute interval, enter the T/A menu.
-stocks
-load spy -i 30
-ta
-
-# Show the RSI and OBV for 30 minute intervals and weekly intervals.
-rsi
-obv
-..
-load spy -w
-ta
-rsi
-obv
-
-# Show one week of OBV, VWAP, Bollinger Bands, MACD, and Fibonacci Retracements with one-minute intervals.
-..
-load spy -i 1
-ta
-obv
-vwap
-bbands
-fib
-macd
-
-# Print T/A summary
-summary
-
-# Show long chart of SPY with monthly intervals with EMA for 3 and 6 months & MACD using six months as the slow and 4 as the signal.
-..
-load spy -s 1993-02-01 -m
-ta
-ema 3,6
-macd -f 1 -s 6 --signal 4
-..
-candle --ma 6,12
\ No newline at end of file
diff --git a/openbb_terminal/miscellaneous/routines/template.openbb b/openbb_terminal/miscellaneous/routines/template.openbb
deleted file mode 100644
index 9e1eb14ea84..00000000000
--- a/openbb_terminal/miscellaneous/routines/template.openbb
+++ /dev/null
@@ -1,17 +0,0 @@
-# This is a comment, below you can find a command
-stocks
-
-# This is another comment
-# There can be multiple lines of comments if desired
-load MSFT
-
-# You can also have multiple commands below each other
-candle
-fa
-
-# You have the ability to move around menus by using /
-/portfolio/po
-/economy
-
-# Returning to home is easily done with home
-home
\ No newline at end of file
diff --git a/openbb_terminal/stocks/insider/presets/Agriculture.ini b/openbb_terminal/miscellaneous/stocks/insider/Agriculture.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Agriculture.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Agriculture.ini
diff --git a/openbb_terminal/stocks/insider/presets/Agro-Chemicals.ini b/openbb_terminal/miscellaneous/stocks/insider/Agro-Chemicals.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Agro-Chemicals.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Agro-Chemicals.ini
diff --git a/openbb_terminal/stocks/insider/presets/Air-Transportation.ini b/openbb_terminal/miscellaneous/stocks/insider/Air-Transportation.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Air-Transportation.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Air-Transportation.ini
diff --git a/openbb_terminal/stocks/insider/presets/Apparel.ini b/openbb_terminal/miscellaneous/stocks/insider/Apparel.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Apparel.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Apparel.ini
diff --git a/openbb_terminal/stocks/insider/presets/Banks.ini b/openbb_terminal/miscellaneous/stocks/insider/Banks.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Banks.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Banks.ini
diff --git a/openbb_terminal/stocks/insider/presets/Brokers.ini b/openbb_terminal/miscellaneous/stocks/insider/Brokers.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Brokers.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Brokers.ini
diff --git a/openbb_terminal/stocks/insider/presets/Building-Materials.ini b/openbb_terminal/miscellaneous/stocks/insider/Building-Materials.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Building-Materials.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Building-Materials.ini
diff --git a/openbb_terminal/stocks/insider/presets/Business-Services.ini b/openbb_terminal/miscellaneous/stocks/insider/Business-Services.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Business-Services.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Business-Services.ini
diff --git a/openbb_terminal/stocks/insider/presets/Closed-End-Funds.ini b/openbb_terminal/miscellaneous/stocks/insider/Closed-End-Funds.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Closed-End-Funds.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Closed-End-Funds.ini
diff --git a/openbb_terminal/stocks/insider/presets/Construction.ini b/openbb_terminal/miscellaneous/stocks/insider/Construction.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Construction.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Construction.ini
diff --git a/openbb_terminal/stocks/insider/presets/Credit-Industry.ini b/openbb_terminal/miscellaneous/stocks/insider/Credit-Industry.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Credit-Industry.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Credit-Industry.ini
diff --git a/openbb_terminal/stocks/insider/presets/Durable-Goods.ini b/openbb_terminal/miscellaneous/stocks/insider/Durable-Goods.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Durable-Goods.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Durable-Goods.ini
diff --git a/openbb_terminal/stocks/insider/presets/Electronics.ini b/openbb_terminal/miscellaneous/stocks/insider/Electronics.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Electronics.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Electronics.ini
diff --git a/openbb_terminal/stocks/insider/presets/Furniture.ini b/openbb_terminal/miscellaneous/stocks/insider/Furniture.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Furniture.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Furniture.ini
diff --git a/openbb_terminal/stocks/insider/presets/Gold-Silver.ini b/openbb_terminal/miscellaneous/stocks/insider/Gold-Silver.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Gold-Silver.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Gold-Silver.ini
diff --git a/openbb_terminal/stocks/insider/presets/Grocery.ini b/openbb_terminal/miscellaneous/stocks/insider/Grocery.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Grocery.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Grocery.ini
diff --git a/openbb_terminal/stocks/insider/presets/Ground-Freight.ini b/openbb_terminal/miscellaneous/stocks/insider/Ground-Freight.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Ground-Freight.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Ground-Freight.ini
diff --git a/openbb_terminal/stocks/insider/presets/Guided-Missiles.ini b/openbb_terminal/miscellaneous/stocks/insider/Guided-Missiles.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Guided-Missiles.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Guided-Missiles.ini
diff --git a/openbb_terminal/stocks/insider/presets/Health.ini b/openbb_terminal/miscellaneous/stocks/insider/Health.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Health.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Health.ini
diff --git a/openbb_terminal/stocks/insider/presets/Hotels.ini b/openbb_terminal/miscellaneous/stocks/insider/Hotels.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Hotels.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Hotels.ini
diff --git a/openbb_terminal/stocks/insider/presets/Insurance-Agents.ini b/openbb_terminal/miscellaneous/stocks/insider/Insurance-Agents.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Insurance-Agents.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Insurance-Agents.ini
diff --git a/openbb_terminal/stocks/insider/presets/Insurance-Carriers.ini b/openbb_terminal/miscellaneous/stocks/insider/Insurance-Carriers.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Insurance-Carriers.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Insurance-Carriers.ini
diff --git a/openbb_terminal/stocks/insider/presets/Investment-Offices.ini b/openbb_terminal/miscellaneous/stocks/insider/Investment-Offices.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Investment-Offices.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Investment-Offices.ini
diff --git a/openbb_terminal/stocks/insider/presets/Legal.ini b/openbb_terminal/miscellaneous/stocks/insider/Legal.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Legal.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Legal.ini
diff --git a/openbb_terminal/stocks/insider/presets/Lumber.ini b/openbb_terminal/miscellaneous/stocks/insider/Lumber.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Lumber.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Lumber.ini
diff --git a/openbb_terminal/stocks/insider/presets/Manufacturing.ini b/openbb_terminal/miscellaneous/stocks/insider/Manufacturing.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Manufacturing.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Manufacturing.ini
diff --git a/openbb_terminal/stocks/insider/presets/Mining.ini b/openbb_terminal/miscellaneous/stocks/insider/Mining.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Mining.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Mining.ini
diff --git a/openbb_terminal/stocks/insider/presets/Mortgages.ini b/openbb_terminal/miscellaneous/stocks/insider/Mortgages.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Mortgages.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Mortgages.ini
diff --git a/openbb_terminal/stocks/insider/presets/Nondurable-Goods.ini b/openbb_terminal/miscellaneous/stocks/insider/Nondurable-Goods.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Nondurable-Goods.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Nondurable-Goods.ini
diff --git a/openbb_terminal/stocks/insider/presets/Personal-Credit.ini b/openbb_terminal/miscellaneous/stocks/insider/Personal-Credit.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Personal-Credit.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Personal-Credit.ini
diff --git a/openbb_terminal/stocks/insider/presets/Pharmaceuticals.ini b/openbb_terminal/miscellaneous/stocks/insider/Pharmaceuticals.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Pharmaceuticals.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Pharmaceuticals.ini
diff --git a/openbb_terminal/stocks/insider/presets/Professional-Services.ini b/openbb_terminal/miscellaneous/stocks/insider/Professional-Services.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Professional-Services.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Professional-Services.ini
diff --git a/openbb_terminal/stocks/insider/presets/Railroads.ini b/openbb_terminal/miscellaneous/stocks/insider/Railroads.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Railroads.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Railroads.ini
diff --git a/openbb_terminal/stocks/insider/presets/Real-Estate.ini b/openbb_terminal/miscellaneous/stocks/insider/Real-Estate.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Real-Estate.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Real-Estate.ini
diff --git a/openbb_terminal/stocks/insider/presets/Restaurants.ini b/openbb_terminal/miscellaneous/stocks/insider/Restaurants.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Restaurants.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Restaurants.ini
diff --git a/openbb_terminal/stocks/insider/presets/Retail-Stores.ini b/openbb_terminal/miscellaneous/stocks/insider/Retail-Stores.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Retail-Stores.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Retail-Stores.ini
diff --git a/openbb_terminal/stocks/insider/presets/Retail-Trade.ini b/openbb_terminal/miscellaneous/stocks/insider/Retail-Trade.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Retail-Trade.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Retail-Trade.ini
diff --git a/openbb_terminal/stocks/insider/presets/Tobacco.ini b/openbb_terminal/miscellaneous/stocks/insider/Tobacco.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Tobacco.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Tobacco.ini
diff --git a/openbb_terminal/stocks/insider/presets/Utility-Communications.ini b/openbb_terminal/miscellaneous/stocks/insider/Utility-Communications.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Utility-Communications.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Utility-Communications.ini
diff --git a/openbb_terminal/stocks/insider/presets/Utility-Gas.ini b/openbb_terminal/miscellaneous/stocks/insider/Utility-Gas.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Utility-Gas.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Utility-Gas.ini
diff --git a/openbb_terminal/stocks/insider/presets/Wholesale-Trade.ini b/openbb_terminal/miscellaneous/stocks/insider/Wholesale-Trade.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/Wholesale-Trade.ini
rename to openbb_terminal/miscellaneous/stocks/insider/Wholesale-Trade.ini
diff --git a/openbb_terminal/stocks/insider/presets/template.ini b/openbb_terminal/miscellaneous/stocks/insider/template.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/template.ini
rename to openbb_terminal/miscellaneous/stocks/insider/template.ini
diff --git a/openbb_terminal/stocks/insider/presets/whales.ini b/openbb_terminal/miscellaneous/stocks/insider/whales.ini
similarity index 100%
rename from openbb_terminal/stocks/insider/presets/whales.ini
rename to openbb_terminal/miscellaneous/stocks/insider/whales.ini
diff --git a/openbb_terminal/stocks/screener/presets/5pct_above_low.ini b/openbb_terminal/miscellaneous/stocks/screener/5pct_above_low.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/5pct_above_low.ini
rename to openbb_terminal/miscellaneous/stocks/screener/5pct_above_low.ini
diff --git a/openbb_terminal/stocks/screener/presets/analyst_strong_buy.ini b/openbb_terminal/miscellaneous/stocks/screener/analyst_strong_buy.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/analyst_strong_buy.ini
rename to openbb_terminal/miscellaneous/stocks/screener/analyst_strong_buy.ini
diff --git a/openbb_terminal/stocks/screener/presets/break_out_stocks.ini b/openbb_terminal/miscellaneous/stocks/screener/break_out_stocks.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/break_out_stocks.ini
rename to openbb_terminal/miscellaneous/stocks/screener/break_out_stocks.ini
diff --git a/openbb_terminal/stocks/screener/presets/buffett_like.ini b/openbb_terminal/miscellaneous/stocks/screener/buffett_like.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/buffett_like.ini
rename to openbb_terminal/miscellaneous/stocks/screener/buffett_like.ini
diff --git a/openbb_terminal/stocks/screener/presets/bull_runs_over_10pct.ini b/openbb_terminal/miscellaneous/stocks/screener/bull_runs_over_10pct.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/bull_runs_over_10pct.ini
rename to openbb_terminal/miscellaneous/stocks/screener/bull_runs_over_10pct.ini
diff --git a/openbb_terminal/stocks/screener/presets/channel_up_and_low_debt_and_sma_50and200.ini b/openbb_terminal/miscellaneous/stocks/screener/channel_up_and_low_debt_and_sma_50and200.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/channel_up_and_low_debt_and_sma_50and200.ini
rename to openbb_terminal/miscellaneous/stocks/screener/channel_up_and_low_debt_and_sma_50and200.ini
diff --git a/openbb_terminal/stocks/screener/presets/cheap_bottom_dividend.ini b/openbb_terminal/miscellaneous/stocks/screener/cheap_bottom_dividend.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/cheap_bottom_dividend.ini
rename to openbb_terminal/miscellaneous/stocks/screener/cheap_bottom_dividend.ini
diff --git a/openbb_terminal/stocks/screener/presets/cheap_dividend.ini b/openbb_terminal/miscellaneous/stocks/screener/cheap_dividend.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/cheap_dividend.ini
rename to openbb_terminal/miscellaneous/stocks/screener/cheap_dividend.ini
diff --git a/openbb_terminal/stocks/screener/presets/cheap_oversold.ini b/openbb_terminal/miscellaneous/stocks/screener/cheap_oversold.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/cheap_oversold.ini
rename to openbb_terminal/miscellaneous/stocks/screener/cheap_oversold.ini
diff --git a/openbb_terminal/stocks/screener/presets/continued_momentum_scan.ini b/openbb_terminal/miscellaneous/stocks/screener/continued_momentum_scan.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/continued_momentum_scan.ini
rename to openbb_terminal/miscellaneous/stocks/screener/continued_momentum_scan.ini
diff --git a/openbb_terminal/stocks/screener/presets/death_cross.ini b/openbb_terminal/miscellaneous/stocks/screener/death_cross.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/death_cross.ini
rename to openbb_terminal/miscellaneous/stocks/screener/death_cross.ini
diff --git a/openbb_terminal/stocks/screener/presets/golden_cross.ini b/openbb_terminal/miscellaneous/stocks/screener/golden_cross.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/golden_cross.ini
rename to openbb_terminal/miscellaneous/stocks/screener/golden_cross.ini
diff --git a/openbb_terminal/stocks/screener/presets/golden_cross_penny.ini b/openbb_terminal/miscellaneous/stocks/screener/golden_cross_penny.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/golden_cross_penny.ini
rename to openbb_terminal/miscellaneous/stocks/screener/golden_cross_penny.ini
diff --git a/openbb_terminal/stocks/screener/presets/growth_stocks.ini b/openbb_terminal/miscellaneous/stocks/screener/growth_stocks.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/growth_stocks.ini
rename to openbb_terminal/miscellaneous/stocks/screener/growth_stocks.ini
diff --git a/openbb_terminal/stocks/screener/presets/heavy_inst_ins.ini b/openbb_terminal/miscellaneous/stocks/screener/heavy_inst_ins.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/heavy_inst_ins.ini
rename to openbb_terminal/miscellaneous/stocks/screener/heavy_inst_ins.ini
diff --git a/openbb_terminal/stocks/screener/presets/high_vol_and_low_debt.ini b/openbb_terminal/miscellaneous/stocks/screener/high_vol_and_low_debt.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/high_vol_and_low_debt.ini
rename to openbb_terminal/miscellaneous/stocks/screener/high_vol_and_low_debt.ini
diff --git a/openbb_terminal/stocks/screener/presets/modified_dreman.ini b/openbb_terminal/miscellaneous/stocks/screener/modified_dreman.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/modified_dreman.ini
rename to openbb_terminal/miscellaneous/stocks/screener/modified_dreman.ini
diff --git a/openbb_terminal/stocks/screener/presets/modified_neff.ini b/openbb_terminal/miscellaneous/stocks/screener/modified_neff.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/modified_neff.ini
rename to openbb_terminal/miscellaneous/stocks/screener/modified_neff.ini
diff --git a/openbb_terminal/stocks/screener/presets/news_scanner.ini b/openbb_terminal/miscellaneous/stocks/screener/news_scanner.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/news_scanner.ini
rename to openbb_terminal/miscellaneous/stocks/screener/news_scanner.ini
diff --git a/openbb_terminal/stocks/screener/presets/oversold.ini b/openbb_terminal/miscellaneous/stocks/screener/oversold.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/oversold.ini
rename to openbb_terminal/miscellaneous/stocks/screener/oversold.ini
diff --git a/openbb_terminal/stocks/screener/presets/oversold_under_3dol.ini b/openbb_terminal/miscellaneous/stocks/screener/oversold_under_3dol.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/oversold_under_3dol.ini
rename to openbb_terminal/miscellaneous/stocks/screener/oversold_under_3dol.ini
diff --git a/openbb_terminal/stocks/screener/presets/oversold_under_5dol.ini b/openbb_terminal/miscellaneous/stocks/screener/oversold_under_5dol.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/oversold_under_5dol.ini
rename to openbb_terminal/miscellaneous/stocks/screener/oversold_under_5dol.ini
diff --git a/openbb_terminal/stocks/screener/presets/potential_reversals.ini b/openbb_terminal/miscellaneous/stocks/screener/potential_reversals.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/potential_reversals.ini
rename to openbb_terminal/miscellaneous/stocks/screener/potential_reversals.ini
diff --git a/openbb_terminal/stocks/screener/presets/recent_growth_and_support.ini b/openbb_terminal/miscellaneous/stocks/screener/recent_growth_and_support.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/recent_growth_and_support.ini
rename to openbb_terminal/miscellaneous/stocks/screener/recent_growth_and_support.ini
diff --git a/openbb_terminal/stocks/screener/presets/rosenwald.ini b/openbb_terminal/miscellaneous/stocks/screener/rosenwald.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/rosenwald.ini
rename to openbb_terminal/miscellaneous/stocks/screener/rosenwald.ini
diff --git a/openbb_terminal/stocks/screener/presets/rosenwald_gtfo.ini b/openbb_terminal/miscellaneous/stocks/screener/rosenwald_gtfo.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/rosenwald_gtfo.ini
rename to openbb_terminal/miscellaneous/stocks/screener/rosenwald_gtfo.ini
diff --git a/openbb_terminal/stocks/screener/presets/sexy_year.ini b/openbb_terminal/miscellaneous/stocks/screener/sexy_year.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/sexy_year.ini
rename to openbb_terminal/miscellaneous/stocks/screener/sexy_year.ini
diff --git a/openbb_terminal/stocks/screener/presets/short_squeeze_scan.ini b/openbb_terminal/miscellaneous/stocks/screener/short_squeeze_scan.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/short_squeeze_scan.ini
rename to openbb_terminal/miscellaneous/stocks/screener/short_squeeze_scan.ini
diff --git a/openbb_terminal/stocks/screener/presets/simplistic_momentum_scanner_under_7dol.ini b/openbb_terminal/miscellaneous/stocks/screener/simplistic_momentum_scanner_under_7dol.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/simplistic_momentum_scanner_under_7dol.ini
rename to openbb_terminal/miscellaneous/stocks/screener/simplistic_momentum_scanner_under_7dol.ini
diff --git a/openbb_terminal/stocks/screener/presets/stocks_strong_support_levels.ini b/openbb_terminal/miscellaneous/stocks/screener/stocks_strong_support_levels.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/stocks_strong_support_levels.ini
rename to openbb_terminal/miscellaneous/stocks/screener/stocks_strong_support_levels.ini
diff --git a/openbb_terminal/stocks/screener/presets/top_performers_all.ini b/openbb_terminal/miscellaneous/stocks/screener/top_performers_all.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/top_performers_all.ini
rename to openbb_terminal/miscellaneous/stocks/screener/top_performers_all.ini
diff --git a/openbb_terminal/stocks/screener/presets/top_performers_healthcare.ini b/openbb_terminal/miscellaneous/stocks/screener/top_performers_healthcare.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/top_performers_healthcare.ini
rename to openbb_terminal/miscellaneous/stocks/screener/top_performers_healthcare.ini
diff --git a/openbb_terminal/stocks/screener/presets/top_performers_tech.ini b/openbb_terminal/miscellaneous/stocks/screener/top_performers_tech.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/top_performers_tech.ini
rename to openbb_terminal/miscellaneous/stocks/screener/top_performers_tech.ini
diff --git a/openbb_terminal/stocks/screener/presets/under_15dol_stocks.ini b/openbb_terminal/miscellaneous/stocks/screener/under_15dol_stocks.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/under_15dol_stocks.ini
rename to openbb_terminal/miscellaneous/stocks/screener/under_15dol_stocks.ini
diff --git a/openbb_terminal/stocks/screener/presets/undervalue.ini b/openbb_terminal/miscellaneous/stocks/screener/undervalue.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/undervalue.ini
rename to openbb_terminal/miscellaneous/stocks/screener/undervalue.ini
diff --git a/openbb_terminal/stocks/screener/presets/unusual_volume.ini b/openbb_terminal/miscellaneous/stocks/screener/unusual_volume.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/unusual_volume.ini
rename to openbb_terminal/miscellaneous/stocks/screener/unusual_volume.ini
diff --git a/openbb_terminal/stocks/screener/presets/value_stocks.ini b/openbb_terminal/miscellaneous/stocks/screener/value_stocks.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/value_stocks.ini
rename to openbb_terminal/miscellaneous/stocks/screener/value_stocks.ini
diff --git a/openbb_terminal/stocks/screener/presets/weak_support_and_top_performers.ini b/openbb_terminal/miscellaneous/stocks/screener/weak_support_and_top_performers.ini
similarity index 100%
rename from openbb_terminal/stocks/screener/presets/weak_support_and_top_performers.ini
rename to openbb_terminal/miscellaneous/stocks/screener/weak_support_and_top_performers.ini
diff --git a/openbb_terminal/parent_classes.py b/openbb_terminal/parent_classes.py
index bc7eca3bbf9..3a4a33738e1 100644
--- a/openbb_terminal/parent_classes.py
+++ b/openbb_terminal/parent_classes.py
@@ -104,6 +104,7 @@ class BaseController(metaclass=ABCMeta):
CHOICES_MENUS: List[str] = []
SUPPORT_CHOICES: dict = {}
ABOUT_CHOICES: dict = {}
+ NEWS_CHOICES: dict = {}
COMMAND_SEPARATOR = "/"
KEYS_MENU = "keys" + COMMAND_SEPARATOR
TRY_RELOAD = False
@@ -164,6 +165,7 @@ class BaseController(metaclass=ABCMeta):
c for c in self.controller_choices if c not in self.CHOICES_COMMON
]
+ # Add in support options
support_choices: dict = {c: {} for c in self.controller_choices}
support_choices = {c: None for c in (["generic"] + self.support_commands)}
@@ -178,6 +180,10 @@ class BaseController(metaclass=ABCMeta):
self.SUPPORT_CHOICES = support_choices
+ # Add in news options
+ news_choices = ["--term", "-t", "--sources", "-s", "--help", "-h"]
+ self.NEWS_CHOICES = {c: None for c in news_choices}
+
def check_path(self) -> None:
"""Check if command path is valid."""
path = self.PATH
@@ -413,7 +419,7 @@ class BaseController(metaclass=ABCMeta):
dest="command",
default=None,
help="Obtain documentation on the given command or menu",
- choices=self.CHOICES_COMMANDS + self.CHOICES_MENUS,
+ choices=self.CHOICES_COMMANDS + self.CHOICES_MENUS + self.CHOICES_COMMON,
)
if other_args and "-" not in other_args[0][0]:
diff --git a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py
index 4535277a911..6577d7324d0 100644
--- a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py
+++ b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py
@@ -161,13 +161,13 @@ class ParametersController(BaseController):
add_help=False,
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
prog="file",
- description="Load portfolio risk parameters (ini or xlsx)",
+ description="Select parameter file to use (ini or xlsx). The OpenBB Parameters Template can be "
+ "found inside the Portfolio Optimization documentation. Please type `about` to access the documentation.",
)
parser.add_argument(
"-f",
"--file",
- required="-h" not in other_args,
nargs="+",
dest="file",
help="Parameter file to be used",
@@ -178,14 +178,21 @@ class ParametersController(BaseController):
ns_parser = self.parse_known_args_and_warn(parser, other_args)
if ns_parser:
- self.current_file = " ".join(ns_parser.file)
-
- if self.current_file in self.DATA_FILES:
- file_location = str(self.DATA_FILES[self.current_file])
+ if not ns_parser.file:
+ console.print(
+ "[green]The OpenBB Parameters Template can be found inside "
+ "the Portfolio Optimization documentation. Please type `about` "
+ "to access the documentation. [green]\n"
+ )
else:
- file_location = str(self.current_file)
+ self.current_file = " ".join(ns_parser.file)
- self.params, self.current_model = params_view.load_file(file_location)
+ if self.current_file in self.DATA_FILES:
+ file_location = str(self.DATA_FILES[self.current_file])
+ else:
+ file_location = str(self.current_file)
+
+ self.params, self.current_model = params_view.load_file(file_location)
@log_start_end(log=logger)
def call_save(self, other_args: List[str]):
diff --git a/openbb_terminal/portfolio/portfolio_optimization/po_controller.py b/openbb_terminal/portfolio/portfolio_optimization/po_controller.py
index d6b41d56cef..12cf786d001 100644
--- a/openbb_terminal/portfolio/portfolio_optimization/po_controller.py
+++ b/openbb_terminal/portfolio/portfolio_optimization/po_controller.py
@@ -155,9 +155,6 @@ def get_valid_portfolio_categories(
class PortfolioOptimizationController(BaseController):
"""Portfolio Optimization Controller class"""
- DEFAULT_PORTFOLIO_DIRECTORY = MISCELLANEOUS_DIRECTORY / "portfolio_examples"
- DEFAULT_ALLOCATION_DIRECTORY = DEFAULT_PORTFOLIO_DIRECTORY / "allocation"
- DEFAULT_OPTIMIZATION_DIRECTORY = DEFAULT_PORTFOLIO_DIRECTORY / "optimization"
FILE_TYPE_LIST = ["xlsx", "ini"]
CHOICES_COMMANDS = [
@@ -196,17 +193,10 @@ class PortfolioOptimizationController(BaseController):
allocation_file_map = {
filepath.name: filepath
for file_type in cls.FILE_TYPE_LIST
- for filepath in cls.DEFAULT_ALLOCATION_DIRECTORY.rglob(f"*.{file_type}")
+ for filepath in (USER_PORTFOLIO_DATA_DIRECTORY / "allocation").rglob(
+ f"*.{file_type}"
+ )
}
- allocation_file_map.update(
- {
- filepath.name: filepath
- for file_type in cls.FILE_TYPE_LIST
- for filepath in (USER_PORTFOLIO_DATA_DIRECTORY / "allocation").rglob(
- f"*.{file_type}"
- )
- }
- )
return allocation_file_map
@@ -215,19 +205,11 @@ class PortfolioOptimizationController(BaseController):
optimization_file_map = {
filepath.name: filepath
for file_type in cls.FILE_TYPE_LIST
- for filepath in cls.DEFAULT_OPTIMIZATION_DIRECTORY.rglob(f"*.{file_type}")
+ for filepath in (USER_PORTFOLIO_DATA_DIRECTORY / "optimization").rglob(
+ f"*.{file_type}"
+ )
}
- optimization_file_map.update(
- {
- filepath.name: filepath
- for file_type in cls.FILE_TYPE_LIST
- for filepath in (USER_PORTFOLIO_DATA_DIRECTORY / "optimization").rglob(
- f"*.{file_type}"
- )
- }
- )
-
return optimization_file_map
def __init__(
@@ -564,13 +546,13 @@ class PortfolioOptimizationController(BaseController):
add_help=False,
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
prog="file",
- description="Select parameter file to use",
+ description="Select parameter file to use. The OpenBB Parameters Template can be "
+ "found inside the Portfolio Optimization documentation. Please type `about` to access the documentation.",
)
parser.add_argument(
"-f",
"--file",
- required="-h" not in other_args,
nargs="+",
dest="file",
help="Parameter file to be used",
@@ -583,14 +565,21 @@ class PortfolioOptimizationController(BaseController):
ns_parser = self.parse_known_args_and_warn(parser, other_args)
if ns_parser:
- self.current_file = " ".join(ns_parser.file)
-
- if self.current_file in self.optimization_file_map:
- file_location = self.optimization_file_map[self.current_file]
+ if not ns_parser.file:
+ console.print(
+ "[green]The OpenBB Parameters Template can be found inside "
+ "the Portfolio Optimization documentation. Please type `about` "
+ "to access the documentation. [green]\n"
+ )
else:
- file_location = self.current_file # type: ignore
+ self.current_file = " ".join(ns_parser.file)
- self.params, self.current_model = params_view.load_file(file_location)
+ if self.current_file in self.optimization_file_map:
+ file_location = self.optimization_file_map[self.current_file]
+ else:
+ file_location = self.current_file # type: ignore
+
+ self.params, self.current_model = params_view.load_file(file_location)
@log_start_end(log=logger)
def call_params(self, _):
@@ -677,13 +666,13 @@ class PortfolioOptimizationController(BaseController):
if portfolio in portfolios:
self.portfolios.pop(portfolio)
portfolios.remove(portfolio)
- console.print(f"[yellow]Removed '{portfolio}'.[/yellow]")
+ console.print(f"[param]Removed '{portfolio}'.[/param]")
else:
console.print(f"[red]Portfolio '{portfolio}' does not exist.[/red]")
if self.portfolios:
console.print(
- f"\n[yellow]Current Portfolios: [/yellow]{('None', ', '.join(portfolios))[bool(portfolios)]}"
+ f"\n[param]Current Portfolios: [/param]{('None', ', '.join(portfolios))[bool(portfolios)]}"
)
self.update_runtime_choices()
@@ -699,31 +688,68 @@ class PortfolioOptimizationController(BaseController):
parser.add_argument(
"-f",
"--file",
- required="-h" not in other_args,
nargs="+",
dest="file",
help="Allocation file to be used",
choices=self.allocation_file_map.keys(),
)
+ parser.add_argument(
+ "-e",
+ "--example",
+ help="Run an example allocation file to understand how the portfolio optimization menu can be used.",
+ dest="example",
+ action="store_true",
+ default=False,
+ )
if other_args and "-" not in other_args[0][0]:
other_args.insert(0, "--file")
ns_parser = self.parse_known_args_and_warn(parser, other_args)
if ns_parser:
- filename = " ".join(ns_parser.file)
+ filename = ""
- if filename in self.allocation_file_map:
- file_location = self.allocation_file_map[filename]
+ if ns_parser.file:
+ filename = " ".join(ns_parser.file)
+ elif ns_parser.example:
+ filename = "OpenBB Example Portfolio"
else:
- file_location = filename # type: ignore
+ console.print(
+ "[green]Please input a filename with load --file or obtain an example with load --example[/green]"
+ )
- self.tickers, self.categories = excel_model.load_allocation(file_location)
- self.available_categories = list(self.categories.keys())
- if "CURRENT_INVESTED_AMOUNT" in self.available_categories:
- self.available_categories.remove("CURRENT_INVESTED_AMOUNT")
- self.portfolios = dict()
- self.update_runtime_choices()
- self.current_portfolio = filename
+ if filename:
+ if ns_parser.example:
+ file_location = (
+ MISCELLANEOUS_DIRECTORY
+ / "portfolio"
+ / "allocation_example.xlsx"
+ )
+
+ console.print(
+ "[green]Loading an example, please type `about` "
+ "to learn how to create your own Portfolio Optimization Excel sheet.[/green]\n"
+ )
+ elif filename in self.allocation_file_map:
+ file_location = self.allocation_file_map[filename]
+ else:
+ file_location = filename # type: ignore
+
+ self.tickers, self.categories = excel_model.load_allocation(
+ file_location
+ )
+ self.available_categories = list(self.categories.keys())
+ if "CURRENT_INVESTED_AMOUNT" in self.available_categories:
+ self.available_categories.remove("CURRENT_INVESTED_AMOUNT")
+ self.portfolios = dict()
+ self.update_runtime_choices()
+ self.current_portfolio = filename
+
+ console.print(
+ f"[param]Portfolio loaded:[/param] {self.current_portfolio}"
+ )
+ console.print(
+ f"[param]Categories:[/param] {', '.join(self.available_categories)}\n"
+ )
@log_start_end(log=logger)
def call_plot(self, other_args: List[str]):
@@ -820,8 +846,8 @@ class PortfolioOptimizationController(BaseController):
or ns_parser.heat
):
console.print(
- "[yellow]Please select at least one chart to plot[/yellow]",
- "[yellow]from the following: -pi, -hi, -dd, -rc, -he.[/yellow]",
+ "[red]Please select at least one chart to plot "
+ "from the following: -pi, -hi, -dd, -rc, -he.[/red]",
)
return
diff --git a/openbb_terminal/reports/reports_model.py b/openbb_terminal/reports/reports_model.py
index 9bf91ce74aa..2a1201249f4 100644
--- a/openbb_terminal/reports/reports_model.py
+++ b/openbb_terminal/reports/reports_model.py
@@ -56,11 +56,9 @@ PORTFOLIO_HOLDINGS_FILES = {
PORTFOLIO_HOLDINGS_FILES.update(
{
- filepath.name: filepath
- for file_type in ["xlsx", "csv"]
- for filepath in (
- MISCELLANEOUS_DIRECTORY / "portfolio_examples" / "holdings"
- ).rglob(f"*.{file_type}")
+ "holdings_example.xlsx": MISCELLANEOUS_DIRECTORY
+ / "portfolio"
+ / "holdings_example.xlsx"
}
)
diff --git a/openbb_terminal/reports/templates/portfolio.ipynb b/openbb_terminal/reports/templates/portfolio.ipynb
index 6be92d9ba2d..8ed34dde174 100644
--- a/openbb_terminal/reports/templates/portfolio.ipynb
+++ b/openbb_terminal/reports/templates/portfolio.ipynb
@@ -92,7 +92,7 @@
"source": [
"# Parameters that will be replaced when calling this notebook\n",
"# Do not leave parameters blank as notebook will not run otherwise\n",
- "transactions = \"market.csv\"\n",
+ "transactions = \"holdings_example.xlsx\"\n",
"report_name = \"Portfolio Report\""
]
},
@@ -105,7 +105,7 @@
"source": [
"file_0 = (\n",
" str(REPOSITORY_DIRECTORY)\n",
- " + \"/openbb_terminal/miscellaneous/portfolio_examples/holdings/\"\n",
+ " + \"/openbb_terminal/miscellaneous/portfolio/\"\n",
" + transactions\n",
")\n",
"file_1 = str(USER_PORTFOLIO_DATA_DIRECTORY) + \"/holdings/\" + transactions\n",
@@ -489,7 +489,7 @@
"metadata": {
"celltoolbar": "Tags",
"kernelspec": {
- "display_name": "Python 3.9.13 ('obb')",
+ "display_name": "obb",
"language": "python",
"name": "python3"
},
@@ -503,11 +503,11 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.6"
+ "version": "3.9.6 | packaged by conda-forge | (default, Jul 11 2021, 03:36:15) \n[Clang 11.1.0 ]"
},
"vscode": {
"interpreter": {
- "hash": "e784374cc4f9a84ed6af2983247aaf351b155c82bcc2188134a65f3c99031000"
+ "hash": "100174a9203096c0c10fb537684ff280825ee9e252451beb8786068677204f06"
}
}
},
diff --git a/openbb_terminal/stocks/insider/openinsider_model.py b/openbb_terminal/stocks/insider/openinsider_model.py
index 784a38f6d32..bc9b980c84d 100644
--- a/openbb_terminal/stocks/insider/openinsider_model.py
+++ b/openbb_terminal/stocks/insider/openinsider_model.py
@@ -2,13 +2,15 @@ import configparser
import logging
import textwrap
from datetime import datetime
-from pathlib import Path
from typing import Dict, List
import pandas as pd
from bs4 import BeautifulSoup
-from openbb_terminal.core.config.paths import USER_PRESETS_DIRECTORY
+from openbb_terminal.core.config.paths import (
+ USER_PRESETS_DIRECTORY,
+ MISCELLANEOUS_DIRECTORY,
+)
from openbb_terminal.decorators import log_start_end
from openbb_terminal.rich_config import console
from openbb_terminal.helper_funcs import request
@@ -1110,7 +1112,7 @@ def get_preset_choices() -> Dict:
"""
PRESETS_PATH = USER_PRESETS_DIRECTORY / "stocks" / "insider"
- PRESETS_PATH_DEFAULT = Path(__file__).parent / "presets"
+ PRESETS_PATH_DEFAULT = MISCELLANEOUS_DIRECTORY / "stocks" / "insider"
preset_choices = {
filepath.name.strip(".ini"): filepath
for filepath in PRESETS_PATH.iterdir()
diff --git a/openbb_terminal/stocks/insider/presets/__init__.py b/openbb_terminal/stocks/insider/presets/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/openbb_terminal/stocks/options/options_controller.py b/openbb_terminal/stocks/options/options_controller.py
index 97010299278..351a0731a5f 100644
--- a/openbb_terminal/stocks/options/options_controller.py
+++ b/openbb_terminal/stocks/options/options_controller.py
@@ -1251,9 +1251,6 @@ class OptionsController(BaseController):
y=ns_parser.y,
custom=ns_parser.custom,
export=ns_parser.export,
- sheet_name=" ".join(ns_parser.sheet_name)
- if ns_parser.sheet_name
- else None,
)
else:
console.print("No expiry loaded. First use `exp {expiry date}`")
@@ -1286,9 +1283,6 @@ class OptionsController(BaseController):
yfinance_view.display_vol_surface(
self.ticker,
export=ns_parser.export,
- sheet_name=" ".join(ns_parser.sheet_name)
- if ns_parser.sheet_name
- else None,
z=ns_parser.z,
)
diff --git a/openbb_terminal/stocks/screener/finviz_model.py b/openbb_terminal/stocks/screener/finviz_model.py
index b24822158a8..60112cd554b 100644
--- a/openbb_terminal/stocks/screener/finviz_model.py
+++ b/openbb_terminal/stocks/screener/finviz_model.py
@@ -1,6 +1,5 @@
import configparser
import logging
-from pathlib import Path
import pandas as pd
from finvizfinance.screener import (
@@ -13,13 +12,16 @@ from finvizfinance.screener import (
)
from openbb_terminal.decorators import log_start_end
-from openbb_terminal.core.config.paths import USER_PRESETS_DIRECTORY
+from openbb_terminal.core.config.paths import (
+ USER_PRESETS_DIRECTORY,
+ MISCELLANEOUS_DIRECTORY,
+)
from openbb_terminal.rich_config import console
logger = logging.getLogger(__name__)
PRESETS_PATH = USER_PRESETS_DIRECTORY / "stocks" / "screener"
-PRESETS_PATH_DEFAULT = Path(__file__).parent / "presets"
+PRESETS_PATH_DEFAULT = MISCELLANEOUS_DIRECTORY / "stocks" / "screener"
preset_choices = {
filepath.name: filepath
for filepath in PRESETS_PATH.iterdir()
diff --git a/openbb_terminal/stocks/screener/presets/README.md b/openbb_terminal/stocks/screener/presets/README.md
deleted file mode 100644
index c12f0da327b..00000000000
--- a/openbb_terminal/stocks/screener/presets/README.md
+++ /dev/null
@@ -1,183 +0,0 @@
-# PRESETS
-
-- [How to add presets](#how-to-add-presets)
-- [template](#template)
-- [sexy_year](#sexy_year)
-- [buffett_like](#buffett_like)
-- [cheap_bottom_dividend](#cheap_bottom_dividend)
-- [cheap_dividend](#cheap_dividend)
-- [cheap_oversold](#cheap_oversold)
-- [cdeath_cross](#death_cross)
-- [golden_cross](#golden_cross)
-- [heavy_inst_ins](#heavy_inst_ins)
-- [modified_dreman](#modified_dreman)
-- [modified_neff](#modified_neff)
-- [rosenwald](#rosenwald)
-- [rosenwald_gtfo](#rosenwald_gtfo)
-- [undervalue](#undervalue)
-
----
-
-## How to add presets
-
-1. Go to the folder OpenBBTerminal/openbb_terminal/screener/presets.
-
-2. There should be a `README.md` file and multiple `.ini` files. One of these `.ini` files should be named `template.ini`.
-
- 
-
-3. Copy the `template.ini` file and paste it in the same directory.
-4. Rename that file to something you find meaningful, e.g. `my_own_filter.ini`.
-
- 
-
-5. Open the file you just renamed (e.g. `my_own_filter.ini`), and set the parameters you want to filter.
-
- 
-
-6. It may be useful to play with the main source since you can tweak these and
- understand how they influence the outcome of the filtered stocks.
-
- 
-
-7. Update the Author and Description name. E.g.
-
- 
-
-8. Start the terminal, and go to the `> scr` menu. In there, you can play with it on the terminal as shown:
-
- - **view**: Allows to see the screeners available. I.e. all `.ini` files in presets folder.
- 
-
- - **view **: Allows to see the specific parameters set for the preset selected.
- 
-
- - **set **: Allows to set this preset as main filter. See that the help menu will display a different
- `PRESET: my_own_filter`
- 
-
- - **historical, overview, valuation, financial, ownership, performance, technical** commands will now be performed on
- tickers that are filtered with the selected preset. Note: Since it is likely that there will be a big range of
- tickers, we cap it to 10 randomly. So, it is normal if for the same filter the user sees 10 different tickers.
- If the user wants to see more than 10 tickers, it can select a different limit using `-l` flag.
-
- 
-
-9. Share with other Apes. You can do so by either creating yourself a Pull Request with this change, or asking a dev
- (e.g. @Sexy_Year) on our discord server to add it for you.
-
----
-
-## template
-
-- **Author of preset:** OpenBBTerminal
-- **Contact:**
-- **Description:** Template with all available filters and their options menu. More information can be found in
- and
-
----
-
-## sexy_year
-
-- **Author of preset:** Sexy Year
-- **Contact:** Add contact of author, if (s)he whishes to be contacted. This can be an hyperlink, an e-mail, wtv
-- **Description:** This is just a sample. The user that adds the preset can add a description for what type of stocks
- these filters are aimed for
-
----
-
-## buffett_like
-
-- **Author of preset:** Traceabl3
-- **Contact:** via smoke signals
-- **Description:** Buffet like value screener (Value invsting for long term growth)
-
----
-
-## cheap_bottom_dividend
-
-- **Author of preset:** Traceabl3
-- **Contact:** swing the bullroarer
-- **ABOUT:** High Yield Dividend stonks that are at-or-near their lowest price. Inverse Head and shoulders pattern recognized.
-
----
-
-## cheap_dividend
-
-- **Author of preset:** Traceabl3
-- **Contact:** illuminated bat symbol in the sky
-- **Description:** cheap dividend stocks
-
----
-
-## cheap_oversold
-
-- **Author of preset:** Traceabl3
-- **Contact:** hit me on my skytel pager
-- **Description:** Cheap stonks that are oversold: under 10% above the low, and oversold on the RSI.
-
----
-
-## death_cross
-
-- **Author of preset:** Traceabl3
-- **Contact:** take the red pill
-- **Description:** Death cross : when the 50sma crosses below the 200 sma
-- **More information:**
-
----
-
-## golden_cross
-
-- **Author of preset:** Traceabl3
-- **Contact:** flip the pigeons
-- **Description:** Golden Cross when the 50 day moves above the 200 day from below.
-
----
-
-## heavy_inst_ins
-
-- **Author of preset:** Traceabl3
-- **Contact:** blow into the conch shell
-- **Description:** Heavily owned by institutions and insiders (>30% each)
-
----
-
-## modified_dreman
-
-- **Author of preset:** Traceabl3
-- **Contact:** Drum Telegraphy
-- **Description:** Modified Version of the Dreman Screener.
-
----
-
-## modified_neff
-
-- **Author of preset:** Traceabl3
-- **Contact:** bang the drums
-- **Description:** Neff Screener with modifications // operational margin <50%
-- **More information:**
-
----
-
-## rosenwald
-
-- **Author of preset:** Traceabl3
-- **Contact:** three shots in the air.
-- **Description:** the classic rosenwald screen based on some dude I work with best guess.
-
----
-
-## rosenwald_gtfo
-
-- **Author of preset:** Traceabl3
-- **Contact:** wave the white flag
-- **Description:** Too many indicators indicating an impending downturn.
-
----
-
-## undervalue
-
-- **Author of preset:** Traceabl3
-- **Contact:** message on tor browser.
-- **Description:** Potential Undervalued stocks
diff --git a/openbb_terminal/stocks/screener/presets/template.ini b/openbb_terminal/stocks/screener/presets/template.ini
deleted file mode 100644
index 7d60fc68e4d..00000000000
--- a/openbb_terminal/stocks/screener/presets/template.ini
+++ /dev/null
@@ -1,212 +0,0 @@
-# Author of preset: OpenBBTerminal (https://github.com/OpenBB-finance/OpenBBTerminal)
-# Description: Template with all available filters and their options menu.
-# More information can be found in https://finviz.com/help/screener.ashx
-# and https://finviz.com/help/technical-analysis/charts-patterns.ashx
-
-[General]
-# Ticker, Company, Sector, Industry, Country, Market Cap., Price/Earnings, Forward Price/Earnings, PEG (Price/Earnings/Growth), Price/Sales, Price/Book, Price/Cash, Price/Free Cash Flow, Dividend Yield, Payout Ratio, EPS (ttm), EPS growth this year, EPS growth next year, EPS growth past 5 years, EPS growth next 5 years, Sales growth past 5 years, EPS growth qtr over qtr, Sales growth qtr over qtr, Shares Outstanding, Shares Float, Insider Ownership, Insider Transactions, Institutional Ownership, Institutional Transactions, Short Interest Share, Short Interest Ratio, Earnings Date, Return on Assets, Return on Equity, Return on Investment, Current Ratio, Quick Ratio, LT Debt/Equity, Total Debt/Equity, Gross Margin, Operating Margin, Net Profit Margin, Analyst Recommendation, Performance (Week), Performance (Month), Performance (Quarter), Performance (Half Year), Performance (Year), Performance (Year To Date), Beta, Average True Range, Volatility (Week), Volatility (Month), 20-Day SMA (Relative), 50-Day SMA (Relative), 200-Day SMA (Relative), 50-Day High (Relative), 50-Day Low (Relative), 52-Week High (Relative), 52-Week Low (Relative), Relative Strength Index (14), Average Volume (3 Month), Relative Volume, Change, Change from Open, Gap, Volume, Price, Target Price, IPO Date
-Order = Ticker
-
-# None (all stocks), Top Gainers, Top Losers, New High, New Low, Most Volatile, Most Active, Unusual Volume, Overbought, Oversold, Downgrades, Upgrades, Earnings Before, Earnings After, Recent Insider Buying, Recent Insider Selling, Major News, Horizontal S/R, TL Resistance, TL Support, Wedge Up, Wedge Down, Triangle Ascending, Triangle Descending, Wedge, Channel Up, Channel Down, Channel, Double Top, Double Bottom, Multiple Top, Multiple Bottom, Head & Shoulders, Head & Shoulders Inverse
-Signal = Top Gainers
-
-
-[Descriptive]
-# Any, AMEX, NASDAQ, NYSE
-Exchange = Any
-
-# Any, Mega ($200bln and more), Large ($10bln to $200bln), Mid ($2bl to $10bln), Small ($300mln to $2bln), Micro ($50mln to $300mln), Nano (under $50mln), +Large (over $50mln), +Mid (over $2bln), +Small (over $300mln), +Micro (over $50mln), -Large (under $200bln), -Mid (under $10bln), -Small (under $2bln), -Micro (under $300mln)
-Market Cap. = Any
-
-# Any, Today, Today Before Market Open, Today Before Market Close, Tomorrow, Tomorrow Before Market Open, Tomorrow Before Market Close, Yesterday, Yesterday Before Market Open, Yesterday Before Market Close, Next 5 Days, Previous 5 Days, This Week, Next Week, Previous Week, This Month
-Earnings Date = Any
-
-# Any, 50% Above Price, 40% Above Price, 30% Above Price, 20% Above Price, 10% Above Price, 5% Above Price, Above Price, Below Price, 5% Below Price, 10% Below Price, 20% Below Price, 30% Below Price, 40% Below Price, 50% Below Price
-Target Price = Any
-
-# Any, S&P 500, DJIA
-Index = Any
-
-# Any, None (0%), Positive (>0%), High (>5%), Very High (>10%), Over 1%, Over 2%, Over 3%, Over 4%, Over 5%, Over 6%, Over 7%, Over 8%, Over 9%, Over 10%
-Dividend Yield = Any
-
-# Any, Under 50K, Under 100K, Under 500K, Under 750K, Under 1M, Over 50K, Over 100K, Over 300K, Over 400K, Over 500K, Over 750K, Over 1M, Over 2M, 100K to 500K, 100K to 1M, 500K to 1M, 500K to 10M
-Average Volume = Any
-
-# Any, Today, Yesterday, In the last week, In the last month, In the last quarter, In the last year, In the last 2 years, In the last 3 years, In the last 5 years, More than a year ago, More that 5 years ago, More than 10 years ago, More than 15 years ago, More than 20 years ago, More than 25 years ago
-IPO Date = Any
-
-# Any, Basic Materials, Communication Services, Consumer Cyclical, Consumer Defensive, Energy, Financial, Healthcare, Industrials, Real Estate, Technology, Utilities
-Sector = Any
-
-# Any, Low (<5%), High (>20%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-Float Short = Any
-
-# Any, Over 10, Over 5, Over 3, Over 2, Over 1.5, Over 1, Over 0.75, Over 0.5, Over 0.25, Under 2, Under 1, Under 1.5, Under 1, Under 0.75, Under 0.5, Under 0.25, Under 0.1
-Relative Volume = Any
-
-# Any, Under 1M, Under 5M, Under 10M, Under 20M, Under 50M, Under 100M, Over 1M, Over 2M, Over 5M, Over 10M, Over 20M, Over 50M, Over 100M, Over 200M, Over 500M, Over 1000M
-Shares Outstanding = Any
-
-# Any, Agricultural Inputs, Aluminum, Building Materials, Chemicals, Coking Coal, Copper, Gold, Lumber & Wood Production, Other Industrial Metals & Mining, Other Precious Metals & Mining, Paper & Paper Products, Silver, Specialty Chemicals, Steel
-Industry = Any
-
-# Any, Strong Buy (1), Buy or Better, Buy, Hold or better, Hold, Hold or worse, Sell, Sell or worse, Strong Sell (5)
-Analyst Recom. = Any
-
-# Any, Under 100K, Under 500K, Under 750K, Under 1M, Over 0, Over 50K, Over 100K, Over 200K, Over 300K, Over 400K, Over 500K, Over 750K, Over 1M, Over 2M, Over 5M, Over 10M, Over 20M
-Current Volume = Any
-
-# Any, Under 1M, Under 5M, Under 10M, Under 20M, Under 50M, Under 100M, Over 1M, Over 2M, Over 5M, Over 10M, Over 20M, Over 50M, Over 100M, Over 200M, Over 500M, Over 1000M
-Float = Any
-
-# Any, Asia, Europe, Latin America, BRIC, Argentina, Australia, Bahamas, Belgium, BeNeLux, Bermuda, Brazil, Canada, Cayman Islands, Chile, China, China & Hong Kong, Colombia, Cyprus, Denmark, Finland, France, Germany, Greece, Hong Kong, Hungary, Iceland, India, Indonesia, Ireland, Israel, Italy, Japan, Kazakhstan, Luxembourg, Malaysia, Malta, Mexico, Monaco, Netherlands, New Zealand, Norway, Panama, Peru, Philippines, Portugal, Russia, Singapore, South Africa, South Korea, Spain, Sweden, Switzerland, Taiwan, Turkey, United Arab Emirates, United Kingdom, Uruguay
-Country = Any
-
-# Any, Optionable, Shortable, Optionable and shortable
-Option/Short = Any
-
-# Any, Under $1, Under $2, Under $3, Under $4, Under $5, Under $7, Under $10, Under $15, Under $20, Under $30, Under $40, Under $50, Over $1, Over $2, Over $3, Over $4, Over $5 ,Over $7, Over $10, Over $15, Over $20, Over $30, Over $40, Over $50, Over $60, Over $70, Over $80, Over $90, Over $100, $1 to $5, $1 to $10, $1 to $20, $5 to $10, $5 to $20, $5 to $50, $10 to $20, $10 to $50, $20 to $50, $50 to $100
-Price = Any
-
-
-[Fundamental]
-# Any, Low (<15), Profitable (>0), High (>50), Under 5, Under 10, Under 15, Under 20, Under 25, Under 30, Under 35, Under 40, Under 45, Under 50, Over 5, Over 10, Over 15, Over 25, Over 30, Over 35, Over 40, Over 45, Over 50
-P/E = Any
-
-# Any, Low (<3), High (>50), Under 1, Under 2, Under 3, Under 4, Under 5, Under 6, Under 7, Under 8, Under 9, Under 10, Over 1, Over 2, Over 3, Over 4, Over 5, Over 6, Over 7, Over 8, Over 9, Over 10, Over 20, Over 30, Over 40, Over 50
-Price/Cash = Any
-
-# Any, Negative (<0%), Positive (>0%), Positive Low (<10%), High (>25%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-EPS growthnext 5 years = Any
-
-# Any, Positive (>0%), Negative (<0%), Very Positive (>30%), Very Negative (<-15%), Under -50%, Under -40%, Under -35%, Under -30%, Under -25%, Under -20%, Under -15%, Under -10%, Under -5%, Over +50%, Over +45%, Over +40%, Over +35%, Over +30%, Over +25%, Over +20%, Over +15%, Over +10%, Over +5%
-Return on Equity = Any
-
-# Any, High (>0.5), Low (<0.1), Under 1, Under 0.9, Under 0.8, Under 0.7, Under 0.6, Under 0.5, Under 0.4, Under 0.3, Under 0.2, Under 0.1, Over 0.1, Over 0.2, Over 0.3, Over 0.4, Over 0.5, Over 0.6, Over 0.7, Over 0.8, Over 0.9, Over 1
-Debt/Equity = Any
-
-# Any, Low (<5%), High (>30%), Very High (>50%), Over 10%, Over 20%, Over 30%, Over 40%, Over 50%, Over 60%, Over 70%, Over 80%, Over 90%
-InsiderOwnership = Any
-
-# Any, Low (<15), Profitable (>0), High (>50), Under 5, Under 10, Under 15, Under 20, Under 25, Under 30, Under 35, Under 40, Under 45, Under 50, Over 5, Over 10, Over 15, Over 20, Over 25, Over 30, Over 35, Over 40, Over 45, Over 50
-Forward P/E = Any
-
-# Any, Low (<15), High (>50), Under 5, Under 10, Under 15, Under 20, Under 25, Under 30, Under 35, Under 40, Under 45, Under 50, Under 60, Under 70, Under 80, Under 90, Under 100, Over 5, Over 10, Over 15, Over 20, Over 25, Over 30, Over 35, Over 40, Over 45, Over 50, Over 60, Over 70, Over 80, Over 90, Over 100
-Price/Free Cash Flow = Any
-
-# Any, Negative (<0%), Positive (>0%), Positive Low (0-10%), High (>25%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-Sales growthpast 5 years = Any
-
-# Any, Positive (>0%), Negative (<0%), Very Positive (>25%), Very Negative (<-10%), Under -50%, Under -45%, Under -40%, Under -35%, Under -30%, Under -25%, Under -20%, Under -15%, Under -10%, Under -5%, Over +5%, Over +10%, Over +15%, Over +20%, Over +25%, Over +30%, Over +35%, Over +40%, Over +45%, Over +50%
-Return on Investment = Any
-
-# Any, Positive (>0%), Negative (<0%), High (>50%), Under 90%, Under 80%, Under 70%, Under 60%, Under 50%, Under 45%, Under 40%, Under 35%, Under 30%, Under 25%, Under 20%, Under 15%, Under 10%, Under 5%, Under 0%, Under -10%, Under -20%, Under -30%, Under -50%, Under -70%, Under -100%, Over 0%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%, Over 40%, Over 45%, Over 50%, Over 60%, Over 70%, Over 80%, Over 90%
-Gross Margin = Any
-
-# Any, Very Negative (<20%), Negative (<0%), Positive (>0%), Very Positive (>20%), Under -90%, Under -80%, Under -70%, Under -60%, Under -50%, Under -45%, Under -40%, Under -35%, Under -30%, Under -25%, Under -20%, Under -15%, Under -10%, Under -5%, Over +5%, Over +10%, Over +15%, Over +20%, Over +25%, Over +30%, Over +35%, Over +40%, Over +45%, Over +50%, Over +60%, Over +70%, Over +80%, Over +90%
-InsiderTransactions = Any
-
-# Any, Low (<1), High (>2), Under 1, Under 2, Under 3, Over 1, Over 2, Over 3
-PEG = Any
-
-# Any, Negative (<0%), Positive (>0%), Positive Low (0-10%), High (>25%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-EPS growththis year = Any
-
-# Any, Negative (<0%), Positive (>0%), Positive Low (0-10%), High (>25%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-EPS growthqtr over qtr = Any
-
-# Any, High (>3), Low (<1), Under 1, Under 0.5, Over 0.5, Over 1, Over 1.5, Over 2, Over 3, Over 4, Over 5, Over 10
-Current Ratio = Any
-
-# Any, Negative (<0%), Positive (>0%), Very Negative (<-20%), High (>25%), Under 90%, Under 80%, Under 70%, Under 60%, Under 50%, Under 45%, Under 40%, Under 35%, Under 30%, Under 25%, Under 20%, Under 15%, Under 10%, Under 5%, Under 0%, Under -10%, Under -20%, Under -30%, Under -50%, Under -70%, Under -100%, Over 0%, Over 10%, Under 15%, Over 20%, Over 25%, Over 30%, Over 35%, Over 40%, Over 45%, Over 50%, Over 60%, Over 70%, Over 80%, Over 90%
-Operating Margin = Any
-
-# Any, Low (<5%), High (>90%), Under 90%, Under 80%, Under 70%, Under 60%, Under 50%, Under 40%, Under 30%, Under 20%, Under 10%, Over 10%, Over 20%, Over 30%, Over 40%, Over 50%, Over 60%, Over 70%, Over 80%, Over 90%
-InstitutionalOwnership = Any
-
-# Any, Low (<1), High (>10), Under 1, Under 2, Under 3, Under 4, Under 5, Under 6, Under 7, Under 8, Under 9, Under 10, Over 1, Over 2, Over 3, Over 4, Over 5, Over 6, Over 6, Over 7, Over 8, Over 9, Over 10
-P/S = Any
-
-# Any, Negative (<0%), Positive (>0%), Positive Low (0-10%), High (>25%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-EPS growthnext year = Any
-
-# Any, Negative (<0%), Positive (>0%), Positive Low (0-10%), High (>25%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-Sales growthqtr over qtr = Any
-
-# Any, High (>3), Low (<0.5), Under 1, Under 0.5, Over 0.5, Over 1, Over 1.5, Over 2, Over 3, Over 4, Over 5, Over 10
-Quick Ratio = Any
-
-# Any, Positive (>0%), Negative (<0%), Very Negative (<-20%), High (>20%), Under 90%, Under 80%, Under 70%, Under 60%, Under 50%, Under 45%, Under 40%, Under 35%, Under 30%, Under 25%, Under 20%, Under 15%, Under 10%, Under 5%, Under 0%, Under -10%, Under -20%, Under -30%, Under -50%, Under -70%, Under -100%, Over 0%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%, Over 35%, Over 40%, Over 45%, Over 50%, Over 60%, Over 70%, Over 80%, Over 90%
-Net Profit Margin = Any
-
-# Any, Very Negative (<20%), Negative (<0%), Positive (>0%), Very Positive (>20%), Under -50%, Under -45%, Under -40%, Under -35%, Under -30%, Under -25%, Under -20%, Under -15%, Under -10%, Under -5%, Over +5%, Over +10%, Over +15%, Over +20%, Over +25%, Over +30%, Over +35%, Over +40%, Over +45%, Over +50%
-InstitutionalTransactions = Any
-
-# Any, Low (<1), High (>5), Under 1, Under 2, Under 3, Under 4, Under 5, Under 6, Under 7, Under 8, Under 9, Under 10, Over 1, Over 2, Over 3, Over 4, Over 5, Over 6, Over 7, Over 8, Over 9, Over 10
-P/B = Any
-
-# Any, Negative (<0%), Positive (>0%), Positive Low (0-10%), High (>25%), Under 5%, Under 10%, Under 15%, Under 20%, Under 25%, Under 30%, Over 5%, Over 10%, Over 15%, Over 20%, Over 25%, Over 30%
-EPS growthpast 5 years = Any
-
-# Any, Positive (>0%), Negative (<0%), Very Positive (>15%), Very Negative (<-15%), Under -50%, Under -45%, Under -40%, Under -35%, Under -30%, Under -25%, Under -20%, Under -15%, Under -10%, Under -5%, Over +5%, Over +10%, Over +15%, Over +20%, Over +25%, Over +30%, Over +35%, Over +40%, Over +45%, Over +50%
-Return on Assets = Any
-
-# Any, High (>0.5), Low (<0.1), Under 1, Under 0.9, Under 0.8, Under 0.7, Under 0.6, Under 0.5, Under 0.4, Under 0.3, Under 0.2, Under 0.1, Over 0.1, Over 0.2, Over 0.3, Over 0.4, Over.5, Over 0.6, Over 0.7, Over 0.8, Over 0.9, Over 1
-LT Debt/Equity = Any
-
-# Any, None (0%), Positive (>0%), Low (<20%), High (>50%), Over 0%, Over 10%, Over 20%, Over 30%, Over 40%, Over 50%, Over 60%, Over 70%, Over 80%, Over 90%, Over 100%, Under 10%, Under 20%, Under 30%, Under 40%, Under 50%, Under 60%, Under 70%, Under 80%, Under 90%, Under 100%
-Payout Ratio = Any
-
-
-[Technical]
-# Any, Today Up, Today Down, Today -15%, Today -10%, Today -5%, Today +5%, Today +10%, Today +15%, Week -30%, Week -20%, Week -10%, Week Down, Week Up, Week +10%, Week +20%, Week +30%, Month -50%, Month -30%, Month -20%, Month -10%, Month Down, Month Up, Month +10%, Month +20%, Month +30%, Month +50%, Quarter -50%, Quarter -30%, Quarter -20%, Quarter -10%, Quarter Down, Quarter Up, Quarter +10%, Quarter +20%, Quarter +30%, Quarter +50%, Half -75%, Half -50%, Half -30%, Half -20%, Half -10%, Half Down, Half Up, Half +10%, Half +20%, Half +30%, Half +50%, Half +100%, Year -75%, Year -50%, Year -30%, Year -20%, Year -10%, Year Down, Year Up, Year +10%, Year +20%, Year +30%, Year +50%, Year +100%, Year +200%, Year +300%, Year +500%, YTD -75%, YTD -50%, YTD -30%, YTD -20%, YTD -10%, YTD -5%, YTD Down, YTD Up, YTD +5%, YTD +10%, YTD +20%, YTD +30, YTD +50%, YTD +100%
-Performance = Any
-
-# Any, Price below SMA20, Price 10% below SMA20, Price 20% below SMA20, Price 30% below SMA20, Price 40% below SMA20, Price 50% below SMA20, Price above SMA20, Price 10% above SMA20, Price 20% above SMA20, Price 30% above SMA20, Price 40% above SMA20, Price 50% above SMA20, Price crossed SMA20, Price crossed SMA20 above, Price crossed SMA20 below, SMA20 crossed SMA50, SMA20 crossed SMA50 above, SMA20 crossed SMA50 below, SMA20 cross SMA200, SMA20 crossed SMA200 below, SMA20 crossed SMA200 above, SMA20 above SMA50, SMA20 below SMA50, SMA20 above SMA200, SMA20 below SMA200
-20-Day Simple Moving Average = Any
-
-# Any, New High, New Low, 5% or more below High, 10% or more below High, 15% or more below High, 20% or more below High, 30% or more below High, 40% or more below High, 50% or more below High, 0-3% below High, 0-5% below High, 0-10% below High, 5% or more above Low, 10% or more above Low, 15% or more above Low, 20% or more above Low, 30% or more above Low, 40% or more above Low, 50% or more above Low, 0-3% above Low, 0-5% above Low, 0-10% above Low
-20-Day High/Low = Any
-
-# Any, Under 0, Under 0.5, Under 1, Under 1.5, Under 2, Over 0, Over 0.5, Over 1, Over 1.5, Over 2, Over 2.5, Over 3, Over 4, 0 to 0.5, 0 to 1, 0.5 to 1, 0.5 to 1.5, 1 to 1.5, 1 to 2
-Beta = Any
-
-# Any, Today Up, Today Down, Today -15%, Today -10%, Today -5%, Today +5%, Today +10%, Today +15%, Week -30%, Week -20%, Week -10%, Week Down, Week Up, Week +10%, Week +20%, Week +30%, Month -50%, Month -30%, Month -20%, Month -10%, Month Down, Month Up, Month +10%, Month +20%, Month +30%, Month +50%, Quarter -50%, Quarter -30%, Quarter -20%, Quarter -10%, Quarter Down, Quarter Up, Quarter +10%, Quarter +20%, Quarter +30%, Quarter +50%, Half -75%, Half -50%, Half -30%, Half -20%, Half -10%, Half Down, Half Up, Half +10%, Half +20%, Half +30%, Half +50%, Half +100%, Year -75%, Year -50%, Year -30%, Year -20%, Year -10%, Year Down, Year Up, Year +10%, Year +20%, Year +30%, Year +50%, Year +100%, Year +200%, Year +300%, Year +500%, YTD -75%, YTD -50%, YTD -30%, YTD -20%, YTD -10%, YTD -5%, YTD Down, YTD Up, YTD +5%, YTD +10%, YTD +20%, YTD +30, YTD +50%, YTD +100%
-Performance 2 = Any
-
-# Any, Price below SMA50, Price 10% below SMA50, Price 20% below SMA50, Price 30% below SMA50, Price 40% below SMA50, Price 50% below SMA50, Price above SMA50, Price 10% above SMA50, Price 20% above SMA50, Price 30% above SMA50, Price 40% above SMA50, Price 50% above SMA50, Price crossed SMA50, Price crossed SMA50 above, Price crossed SMA50 below, SMA50 crossed SMA20, SMA50 crossed SMA20 above, SMA50 crossed SMA20 below, SMA50 cross SMA200, SMA50 crossed SMA200 below, SMA50 crossed SMA200 above, SMA50 above SMA20, SMA50 below SMA20, SMA50 above SMA200, SMA50 below SMA200
-50-Day Simple Moving Average = Any
-
-# Any, New High, New Low, 5% or more below High, 10% or more below High, 15% or more below High, 20% or more below High, 30% or more below High, 40% or more below High, 50% or more below High, 0-3% below High, 0-5% below High, 0-10% below High, 5% or more above Low, 10% or more above Low, 15% or more above Low, 20% or more above Low, 30% or more above Low, 40% or more above Low, 50% or more above Low, 0-3% above Low, 0-5% above Low, 0-10% above Low
-50-Day High/Low = Any
-
-# Any, Over 0.25, Over 0.5, Over 0.75, Over 1, Over 1.5, Over 2. Over 2.5, Over 3, Over 3.5, Over 4, Over 4.5, Over 5, Under 0.25, Under 0.5, Under 0.75, Under 1, Under 1.5, Under 2, Under 2.5, Under 3, Under 3.5, Under 4, Under 4.5, Under 5
-Average True Range = Any
-
-# Any, Week - Over 3%, Week - Over 4%, Week - Over 5%, Week - Over 6%, Week - Over 7%, Week - Over 8%, Week - Over 9%, Week - Over 10%, Week - Over 12%, Week - Over 15%, Month - Over2%, Month - Over3%, Month - Over4%, Month - Over 5%, Month - Over 5%, Month - Over 6%, Month - Over 7%, Month - Over 8%, Month - Over 9%, Month - Over 10%, Month - Over 12%, Month - Over 15%
-Volatility = Any
-
-# Any, Price below SMA200, Price 10% below SMA200, Price 20% below SMA200, Price 30% below SMA200, Price 40% below SMA200, Price 50% below SMA200, Price above SMA200, Price 10% above SMA200, Price 20% above SMA200, Price 30% above SMA200, Price 40% above SMA200, Price 50% above SMA200, Price crossed SMA200, Price crossed SMA200 above, Price crossed SMA200 below, SMA200 crossed SMA20, SMA20 crossed SMA20 above, SMA20 crossed SMA20 below, SMA200 cross SMA50, SMA200 crossed SMA50 below, SMA200 crossed SMA50 above, SMA200 above SMA20, SMA200 below SMA20, SMA200 above SMA50, SMA200 below SMA50
-200-Day Simple Moving Average = Any
-
-# Any, New High, New Low, 5% or more below High, 10% or more below High, 15% or more below High, 20% or more below High, 30% or more below High, 40% or more below High, 50% or more below High, 0-3% below High, 0-5% below High, 0-10% below High, 5% or more above Low, 10% or more above Low, 15% or more above Low, 20% or more above Low, 30% or more above Low, 40% or more above Low, 50% or more above Low, 0-3% above Low, 0-5% above Low, 0-10% above Low
-52-Week High/Low = Any
-
-# Any, Overbought (90), Overbought (80), Overbought (70), Overbought (60), Oversold (40), Oversold (30), Oversold (20), Oversold (10), Not Overbought (<60), Not Overbought (<