Skip to content

Commit

Permalink
Merge branch 'develop' into feature/garch
Browse files Browse the repository at this point in the history
  • Loading branch information
@northern-64bit
northern-64bit authored May 3, 2023
2 parents d007d0e + 6964947 commit 0784b29
Show file tree
Hide file tree
Showing 15 changed files with 881 additions and 877 deletions.
34 changes: 17 additions & 17 deletions openbb_terminal/keys_controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,39 +490,39 @@ def call_reddit(self, other_args: List[str]):
type=str,
dest="client_id",
help="Client ID",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-s",
"--secret",
type=str,
dest="client_secret",
help="Client Secret",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-u",
"--username",
type=str,
dest="username",
help="Username",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-p",
"--password",
type=str,
dest="password",
help="Password",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-a",
"--agent",
type=str,
dest="user_agent",
help="User agent",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
nargs="+",
)
if not other_args:
Expand Down Expand Up @@ -560,23 +560,23 @@ def call_twitter(self, other_args: List[str]):
type=str,
dest="key",
help="Key",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-s",
"--secret",
type=str,
dest="secret",
help="Secret key",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-t",
"--token",
type=str,
dest="token",
help="Bearer token",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
if not other_args:
console.print("For your API Key, visit: https://developer.twitter.com")
Expand Down Expand Up @@ -641,15 +641,15 @@ def call_degiro(self, other_args: List[str]):
type=str,
dest="username",
help="username",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-p",
"--password",
type=str,
dest="password",
help="password",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-s",
Expand Down Expand Up @@ -730,15 +730,15 @@ def call_binance(self, other_args: List[str]):
type=str,
dest="key",
help="Key",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-s",
"--secret",
type=str,
dest="secret",
help="Secret key",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
if not other_args:
console.print("For your API Key, visit: https://binance.com")
Expand Down Expand Up @@ -794,23 +794,23 @@ def call_coinbase(self, other_args: List[str]):
type=str,
dest="key",
help="Key",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-s",
"--secret",
type=str,
dest="secret",
help="Secret key",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-p",
"--passphrase",
type=str,
dest="passphrase",
help="Passphrase",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
if not other_args:
console.print("For your API Key, visit: https://docs.pro.coinbase.com/")
Expand Down Expand Up @@ -983,15 +983,15 @@ def call_smartstake(self, other_args: List[str]):
type=str,
dest="key",
help="Key",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
parser.add_argument(
"-t",
"--token",
type=str,
dest="token",
help="Token",
required="-h" not in other_args,
required="-h" not in other_args and "--help" not in other_args,
)
if not other_args:
console.print("For your API Key, visit: https://www.smartstake.io")
Expand Down
6 changes: 3 additions & 3 deletions openbb_terminal/stocks/fundamental_analysis/av_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def display_key(symbol: str, export: str = "", sheet_name: Optional[str] = None)
export,
os.path.dirname(os.path.abspath(__file__)),
"key",
df_key.transpose(),
df_key,
sheet_name,
)

Expand Down Expand Up @@ -271,7 +271,7 @@ def display_balance_sheet(
export,
os.path.dirname(os.path.abspath(__file__)),
"balance",
df_balance.transpose(),
df_balance,
sheet_name,
fig,
)
Expand Down Expand Up @@ -366,7 +366,7 @@ def display_cash_flow(
export,
os.path.dirname(os.path.abspath(__file__)),
"cash",
df_cash.transpose(),
df_cash,
sheet_name,
fig,
)
Expand Down
2 changes: 1 addition & 1 deletion openbb_terminal/stocks/fundamental_analysis/eodhd_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def display_fundamentals(
export,
os.path.dirname(os.path.abspath(__file__)),
statement,
fundamentals.transpose(),
fundamentals,
sheet_name,
fig,
)
12 changes: 6 additions & 6 deletions openbb_terminal/stocks/fundamental_analysis/fmp_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def display_income_statement(
export,
os.path.dirname(os.path.abspath(__file__)),
"income",
income.transpose(),
income,
sheet_name,
fig,
)
Expand Down Expand Up @@ -451,7 +451,7 @@ def display_balance_sheet(
export,
os.path.dirname(os.path.abspath(__file__)),
"balance",
balance.transpose(),
balance,
sheet_name,
fig,
)
Expand Down Expand Up @@ -555,7 +555,7 @@ def display_cash_flow(
export,
os.path.dirname(os.path.abspath(__file__)),
"cash",
cash.transpose(),
cash,
sheet_name,
fig,
)
Expand Down Expand Up @@ -604,7 +604,7 @@ def display_key_metrics(
export,
os.path.dirname(os.path.abspath(__file__)),
"metrics",
key_metrics.transpose(),
key_metrics,
sheet_name,
)
else:
Expand Down Expand Up @@ -652,7 +652,7 @@ def display_financial_ratios(
export,
os.path.dirname(os.path.abspath(__file__)),
"grratiosowth",
ratios.transpose(),
ratios,
sheet_name,
)
else:
Expand Down Expand Up @@ -699,7 +699,7 @@ def display_financial_statement_growth(
export,
os.path.dirname(os.path.abspath(__file__)),
"growth",
growth.transpose(),
growth,
sheet_name,
)
else:
Expand Down
2 changes: 1 addition & 1 deletion openbb_terminal/stocks/fundamental_analysis/polygon_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def display_fundamentals(
export,
os.path.dirname(os.path.abspath(__file__)),
statement,
fundamentals.transpose(),
fundamentals,
sheet_name,
fig,
)
2 changes: 1 addition & 1 deletion openbb_terminal/stocks/fundamental_analysis/yahoo_finance_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ def display_fundamentals(
export,
os.path.dirname(os.path.abspath(__file__)),
statement,
fundamentals.transpose(),
fundamentals,
sheet_name,
fig,
)
Expand Down
4 changes: 4 additions & 0 deletions openbb_terminal/stocks/screener/finviz_model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ def get_screener_data(
else:
df_screen = screen.screener_view(ascend=ascend)

df_screen = df_screen.rename(columns={"\n\nTicker": "Ticker"})
if "Company" in df_screen.columns:
df_screen["Company"] = df_screen["Company"].str.replace(",", "")

return df_screen


Expand Down
2 changes: 1 addition & 1 deletion openbb_terminal/stocks/screener/finviz_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def screener(
sheet_name,
)

return list(df_screen["Ticker"].values)
return df_screen.Ticker.tolist()

console.print(
"Error: The preset selected did not return results."
Expand Down
6 changes: 3 additions & 3 deletions openbb_terminal/stocks/stocks_controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
)
from openbb_terminal.menu import session
from openbb_terminal.parent_classes import StockBaseController
from openbb_terminal.rich_config import MenuText, console, translate
from openbb_terminal.rich_config import MenuText, console
from openbb_terminal.stocks import cboe_view, stocks_helper, stocks_view
from openbb_terminal.terminal_helper import suppress_stdout

Expand Down Expand Up @@ -324,7 +324,7 @@ def call_quote(self, other_args: List[str]):
add_help=False,
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
prog="quote",
description="Current quote for stock ticker",
description="Current quote for the loaded stock ticker.",
)
parser.add_argument(
"-t",
Expand All @@ -333,7 +333,7 @@ def call_quote(self, other_args: List[str]):
dest="s_ticker",
required=False,
default=self.ticker,
help=translate("stocks/QUOTE_ticker"),
help="Get a quote for a specific ticker, or comma-separated list of tickers.",
)

# For the case where a user uses: 'quote BB'
Expand Down
Loading

0 comments on commit 0784b29

Please sign in to comment.