diff --git a/discordbot/stocks/government/contracts.py b/discordbot/stocks/government/contracts.py index 5c719908ac6..051473fa132 100644 --- a/discordbot/stocks/government/contracts.py +++ b/discordbot/stocks/government/contracts.py @@ -3,13 +3,13 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.config_plot import PLOT_DPI from gamestonk_terminal.stocks.government import quiverquant_model from gamestonk_terminal.helper_funcs import plot_autoscale +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def contracts_command(ctx, ticker="", past_transaction_days="", raw=""): """Displays contracts associated with tickers [quiverquant.com]""" diff --git a/discordbot/stocks/government/gtrades.py b/discordbot/stocks/government/gtrades.py index bb15edc69dd..20b767ca33c 100644 --- a/discordbot/stocks/government/gtrades.py +++ b/discordbot/stocks/government/gtrades.py @@ -5,13 +5,13 @@ from matplotlib import pyplot as plt import matplotlib.dates as mdates import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.config_plot import PLOT_DPI from gamestonk_terminal.stocks.government import quiverquant_model from gamestonk_terminal.helper_funcs import plot_autoscale +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def gtrades_command( ctx, ticker="", gov_type="", past_transactions_months="", raw="" diff --git a/discordbot/stocks/government/histcont.py b/discordbot/stocks/government/histcont.py index b9d5a933e03..948051a3da3 100644 --- a/discordbot/stocks/government/histcont.py +++ b/discordbot/stocks/government/histcont.py @@ -3,13 +3,13 @@ import discord from matplotlib import pyplot as plt import numpy as np -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.config_plot import PLOT_DPI from gamestonk_terminal.stocks.government import quiverquant_model from gamestonk_terminal.helper_funcs import plot_autoscale +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def histcont_command(ctx, ticker=""): """Displays historical quarterly-contracts [quiverquant.com]""" diff --git a/discordbot/stocks/government/lastcontracts.py b/discordbot/stocks/government/lastcontracts.py index 9f35d25b420..a352d6b85fd 100644 --- a/discordbot/stocks/government/lastcontracts.py +++ b/discordbot/stocks/government/lastcontracts.py @@ -1,11 +1,10 @@ import discord import pandas as pd +from gamestonk_terminal.stocks.government import quiverquant_model import discordbot.config_discordbot as cfg from discordbot.helpers import pagination -from gamestonk_terminal.stocks.government import quiverquant_model - async def lastcontracts_command(ctx, past_transactions_days="", num=""): """Displays last government contracts [quiverquant.com]""" diff --git a/discordbot/stocks/government/lasttrades.py b/discordbot/stocks/government/lasttrades.py index faef8e74fbe..c57cbfb2a45 100644 --- a/discordbot/stocks/government/lasttrades.py +++ b/discordbot/stocks/government/lasttrades.py @@ -1,8 +1,8 @@ import discord -import discordbot.config_discordbot as cfg -from discordbot.helpers import pagination from gamestonk_terminal.stocks.government import quiverquant_model +import discordbot.config_discordbot as cfg +from discordbot.helpers import pagination async def lasttrades_command( diff --git a/discordbot/stocks/government/lobbying.py b/discordbot/stocks/government/lobbying.py index 94459c41310..9e4e9a11ce0 100644 --- a/discordbot/stocks/government/lobbying.py +++ b/discordbot/stocks/government/lobbying.py @@ -1,8 +1,8 @@ import discord -import discordbot.config_discordbot as cfg -from discordbot.helpers import pagination from gamestonk_terminal.stocks.government import quiverquant_model +import discordbot.config_discordbot as cfg +from discordbot.helpers import pagination async def lobbying_command(ctx, ticker="", num=""): diff --git a/discordbot/stocks/government/qtrcontracts.py b/discordbot/stocks/government/qtrcontracts.py index cc183332576..f1b04d20f63 100644 --- a/discordbot/stocks/government/qtrcontracts.py +++ b/discordbot/stocks/government/qtrcontracts.py @@ -3,13 +3,13 @@ import discord from matplotlib import pyplot as plt import numpy as np -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.config_plot import PLOT_DPI from gamestonk_terminal.stocks.government import quiverquant_model from gamestonk_terminal.helper_funcs import plot_autoscale +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def qtrcontracts_command(ctx, num="", analysis=""): """Displays a look at government contracts [quiverquant.com]""" diff --git a/discordbot/stocks/government/topbuys.py b/discordbot/stocks/government/topbuys.py index 8e62ddad319..d051f5da5f9 100644 --- a/discordbot/stocks/government/topbuys.py +++ b/discordbot/stocks/government/topbuys.py @@ -4,13 +4,13 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.config_plot import PLOT_DPI from gamestonk_terminal.stocks.government import quiverquant_model from gamestonk_terminal.helper_funcs import plot_autoscale +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def topbuys_command( ctx, gov_type="", past_transactions_months="", num="", raw="" diff --git a/discordbot/stocks/government/toplobbying.py b/discordbot/stocks/government/toplobbying.py index 46abc6b9bd9..ec0b500e464 100644 --- a/discordbot/stocks/government/toplobbying.py +++ b/discordbot/stocks/government/toplobbying.py @@ -3,13 +3,13 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.config_plot import PLOT_DPI from gamestonk_terminal.stocks.government import quiverquant_model from gamestonk_terminal.helper_funcs import plot_autoscale +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def toplobbying_command(ctx, num="", raw=""): """Displays top lobbying firms [quiverquant.com]""" diff --git a/discordbot/stocks/government/topsells.py b/discordbot/stocks/government/topsells.py index 3b099d75977..5063a5fd7f9 100644 --- a/discordbot/stocks/government/topsells.py +++ b/discordbot/stocks/government/topsells.py @@ -4,13 +4,13 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.config_plot import PLOT_DPI from gamestonk_terminal.stocks.government import quiverquant_model from gamestonk_terminal.helper_funcs import plot_autoscale +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def topsells_command( ctx, gov_type="", past_transactions_months="", num="", raw="" diff --git a/discordbot/stocks/technical_analysis/ad.py b/discordbot/stocks/technical_analysis/ad.py index 9104475e0fa..db26413e858 100644 --- a/discordbot/stocks/technical_analysis/ad.py +++ b/discordbot/stocks/technical_analysis/ad.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import volume_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def ad_command(ctx, ticker="", is_open="False", start="", end=""): """Displays chart with accumulation/distribution line [Yahoo Finance]""" diff --git a/discordbot/stocks/technical_analysis/adosc.py b/discordbot/stocks/technical_analysis/adosc.py index 59fa8155098..4a5ceaf0425 100644 --- a/discordbot/stocks/technical_analysis/adosc.py +++ b/discordbot/stocks/technical_analysis/adosc.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import volume_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def adosc_command( ctx, ticker="", is_open="False", fast="3", slow="10", start="", end="" diff --git a/discordbot/stocks/technical_analysis/adx.py b/discordbot/stocks/technical_analysis/adx.py index 6c009cdcfeb..ffec07fb747 100644 --- a/discordbot/stocks/technical_analysis/adx.py +++ b/discordbot/stocks/technical_analysis/adx.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import trend_indicators_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def adx_command( ctx, ticker="", length="14", scalar="100", drift="1", start="", end="" diff --git a/discordbot/stocks/technical_analysis/aroon.py b/discordbot/stocks/technical_analysis/aroon.py index 85234f3450e..bd7f551ec86 100644 --- a/discordbot/stocks/technical_analysis/aroon.py +++ b/discordbot/stocks/technical_analysis/aroon.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import trend_indicators_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def aroon_command(ctx, ticker="", length="25", scalar="100", start="", end=""): """Displays chart with aroon indicator [Yahoo Finance]""" diff --git a/discordbot/stocks/technical_analysis/bbands.py b/discordbot/stocks/technical_analysis/bbands.py index a81451f70b4..c0df5a6962c 100644 --- a/discordbot/stocks/technical_analysis/bbands.py +++ b/discordbot/stocks/technical_analysis/bbands.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import volatility_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def bbands_command( ctx, ticker="", length="5", n_std="2", mamode="sma", start="", end="" diff --git a/discordbot/stocks/technical_analysis/cci.py b/discordbot/stocks/technical_analysis/cci.py index 3a65eeb6074..90c2bd5f3d9 100644 --- a/discordbot/stocks/technical_analysis/cci.py +++ b/discordbot/stocks/technical_analysis/cci.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import momentum_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def cci_command(ctx, ticker="", length="14", scalar="0.015", start="", end=""): """Displays chart with commodity channel index [Yahoo Finance]""" diff --git a/discordbot/stocks/technical_analysis/cg.py b/discordbot/stocks/technical_analysis/cg.py index 507c8a58740..99b8f7cba83 100644 --- a/discordbot/stocks/technical_analysis/cg.py +++ b/discordbot/stocks/technical_analysis/cg.py @@ -4,14 +4,14 @@ import discord from matplotlib import pyplot as plt import numpy as np -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import momentum_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def cg_command(ctx, ticker="", length="14", start="", end=""): """Displays chart with centre of gravity [Yahoo Finance]""" diff --git a/discordbot/stocks/technical_analysis/donchian.py b/discordbot/stocks/technical_analysis/donchian.py index 2035e0e2ab6..5697ceefa07 100644 --- a/discordbot/stocks/technical_analysis/donchian.py +++ b/discordbot/stocks/technical_analysis/donchian.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import volatility_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def donchian_command( ctx, ticker="", upper_length="25", lower_length="100", start="", end="" diff --git a/discordbot/stocks/technical_analysis/ema.py b/discordbot/stocks/technical_analysis/ema.py index 023ac74f8af..31d5e5f2160 100644 --- a/discordbot/stocks/technical_analysis/ema.py +++ b/discordbot/stocks/technical_analysis/ema.py @@ -4,14 +4,14 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import overlap_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def ema_command(ctx, ticker="", window="", offset="", start="", end=""): """Displays chart with exponential moving average [Yahoo Finance]""" @@ -40,15 +40,12 @@ async def ema_command(ctx, ticker="", window="", offset="", start="", end=""): if window == "": window = [20, 50] else: - window_temp = [] - i = 0 - b = 0 - while i < len(window): - if window[i] == ",": - window_temp.append(float(window[b:i])) - l_legend.append(float(window[b:i])) - b = i - i += 1 + window_temp = list() + for wind in window.split(","): + try: + window_temp.append(float(wind)) + except Exception as e: + raise Exception("Window needs to be a float") from e window = window_temp if offset == "": diff --git a/discordbot/stocks/technical_analysis/fib.py b/discordbot/stocks/technical_analysis/fib.py index b99963f516b..472c8c0016f 100644 --- a/discordbot/stocks/technical_analysis/fib.py +++ b/discordbot/stocks/technical_analysis/fib.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import custom_indicators_model from gamestonk_terminal import config_plot as cfp +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def fib_command(ctx, ticker="", start="", end=""): """Displays chart with fibonacci retracement [Yahoo Finance]""" diff --git a/discordbot/stocks/technical_analysis/fisher.py b/discordbot/stocks/technical_analysis/fisher.py index 30bc89577d6..82a9f1bc0e1 100644 --- a/discordbot/stocks/technical_analysis/fisher.py +++ b/discordbot/stocks/technical_analysis/fisher.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import momentum_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def fisher_command(ctx, ticker="", length="14", start="", end=""): """Displays chart with fisher transformation [Yahoo Finance]""" diff --git a/discordbot/stocks/technical_analysis/hma.py b/discordbot/stocks/technical_analysis/hma.py index f830f7da0f8..e0adc0975c1 100644 --- a/discordbot/stocks/technical_analysis/hma.py +++ b/discordbot/stocks/technical_analysis/hma.py @@ -4,14 +4,14 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import overlap_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def hma_command(ctx, ticker="", window="", offset="", start="", end=""): """Displays chart with hull moving average [Yahoo Finance]""" @@ -40,15 +40,12 @@ async def hma_command(ctx, ticker="", window="", offset="", start="", end=""): if window == "": window = [20, 50] else: - window_temp = [] - i = 0 - b = 0 - while i < len(window): - if window[i] == ",": - window_temp.append(float(window[b:i])) - l_legend.append(float(window[b:i])) - b = i - i += 1 + window_temp = list() + for wind in window.split(","): + try: + window_temp.append(float(wind)) + except Exception as e: + raise Exception("Window needs to be a float") from e window = window_temp if offset == "": diff --git a/discordbot/stocks/technical_analysis/kc.py b/discordbot/stocks/technical_analysis/kc.py index d1fb2890d34..15b5cf199e2 100644 --- a/discordbot/stocks/technical_analysis/kc.py +++ b/discordbot/stocks/technical_analysis/kc.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import volatility_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def kc_command( ctx, ticker="", length="20", scalar="2", mamode="sma", offset="0", start="", end="" diff --git a/discordbot/stocks/technical_analysis/macd.py b/discordbot/stocks/technical_analysis/macd.py index 464342ebce9..f7cf23ed01a 100644 --- a/discordbot/stocks/technical_analysis/macd.py +++ b/discordbot/stocks/technical_analysis/macd.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import momentum_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def macd_command( ctx, ticker="", fast="12", slow="26", signal="9", start="", end="" diff --git a/discordbot/stocks/technical_analysis/obv.py b/discordbot/stocks/technical_analysis/obv.py index e622a132f8f..10661620f37 100644 --- a/discordbot/stocks/technical_analysis/obv.py +++ b/discordbot/stocks/technical_analysis/obv.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import volume_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def obv_command(ctx, ticker="", start="", end=""): """Displays chart with on balance volume [Yahoo Finance]""" diff --git a/discordbot/stocks/technical_analysis/recom.py b/discordbot/stocks/technical_analysis/recom.py index 385f6afae6d..ec957b140dd 100644 --- a/discordbot/stocks/technical_analysis/recom.py +++ b/discordbot/stocks/technical_analysis/recom.py @@ -1,8 +1,9 @@ import discord -import discordbot.config_discordbot as cfg from gamestonk_terminal.stocks.technical_analysis import tradingview_model +import discordbot.config_discordbot as cfg + async def recom_command(ctx, ticker=""): """Displays text of a given stocks recommendation based on ta [Tradingview API]""" diff --git a/discordbot/stocks/technical_analysis/rsi.py b/discordbot/stocks/technical_analysis/rsi.py index 658815cb00a..56987a1fda6 100644 --- a/discordbot/stocks/technical_analysis/rsi.py +++ b/discordbot/stocks/technical_analysis/rsi.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import momentum_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def rsi_command( ctx, ticker="", length="14", scalar="100", drift="1", start="", end="" diff --git a/discordbot/stocks/technical_analysis/sma.py b/discordbot/stocks/technical_analysis/sma.py index 7af513d7f13..e6627df7ad1 100644 --- a/discordbot/stocks/technical_analysis/sma.py +++ b/discordbot/stocks/technical_analysis/sma.py @@ -4,14 +4,14 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import overlap_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def sma_command(ctx, ticker="", window="", offset="", start="", end=""): """Displays chart with simple moving average [Yahoo Finance]""" @@ -40,15 +40,12 @@ async def sma_command(ctx, ticker="", window="", offset="", start="", end=""): if window == "": window = [20, 50] else: - window_temp = [] - i = 0 - b = 0 - while i < len(window): - if window[i] == ",": - window_temp.append(float(window[b:i])) - l_legend.append(float(window[b:i])) - b = i - i += 1 + window_temp = list() + for wind in window.split(","): + try: + window_temp.append(float(wind)) + except Exception as e: + raise Exception("Window needs to be a float") from e window = window_temp if offset == "": diff --git a/discordbot/stocks/technical_analysis/stoch.py b/discordbot/stocks/technical_analysis/stoch.py index 459c9e03615..c10abd7108b 100644 --- a/discordbot/stocks/technical_analysis/stoch.py +++ b/discordbot/stocks/technical_analysis/stoch.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta import discord from matplotlib import pyplot as plt -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import momentum_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def stoch_command( ctx, ticker="", fast_k="14", slow_d="3", slow_k="3", start="", end="" diff --git a/discordbot/stocks/technical_analysis/summary.py b/discordbot/stocks/technical_analysis/summary.py index cd23ab87e96..898d011325b 100644 --- a/discordbot/stocks/technical_analysis/summary.py +++ b/discordbot/stocks/technical_analysis/summary.py @@ -1,8 +1,9 @@ import discord -import discordbot.config_discordbot as cfg from gamestonk_terminal.stocks.technical_analysis import finbrain_model +import discordbot.config_discordbot as cfg + async def summary_command(ctx, ticker=""): """Displays text of a given stocks ta summary [FinBrain API]""" diff --git a/discordbot/stocks/technical_analysis/view.py b/discordbot/stocks/technical_analysis/view.py index 36988b07213..946b63b8a52 100644 --- a/discordbot/stocks/technical_analysis/view.py +++ b/discordbot/stocks/technical_analysis/view.py @@ -4,14 +4,13 @@ import discord import matplotlib.pyplot as plt from PIL import Image -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur - from gamestonk_terminal.helper_funcs import plot_autoscale - from gamestonk_terminal.stocks.technical_analysis import finviz_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur + async def view_command(ctx, ticker=""): """Displays image from Finviz [Finviz]""" diff --git a/discordbot/stocks/technical_analysis/wma.py b/discordbot/stocks/technical_analysis/wma.py index ecab0f4ff93..3bdb9bcaf47 100644 --- a/discordbot/stocks/technical_analysis/wma.py +++ b/discordbot/stocks/technical_analysis/wma.py @@ -4,14 +4,14 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import overlap_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def wma_command(ctx, ticker="", window="", offset="", start="", end=""): """Displays chart with weighted moving average [Yahoo Finance]""" @@ -40,15 +40,12 @@ async def wma_command(ctx, ticker="", window="", offset="", start="", end=""): if window == "": window = [20, 50] else: - window_temp = [] - i = 0 - b = 0 - while i < len(window): - if window[i] == ",": - window_temp.append(float(window[b:i])) - l_legend.append(float(window[b:i])) - b = i - i += 1 + window_temp = list() + for wind in window.split(","): + try: + window_temp.append(float(wind)) + except Exception as e: + raise Exception("Window needs to be a float") from e window = window_temp if offset == "": diff --git a/discordbot/stocks/technical_analysis/zlma.py b/discordbot/stocks/technical_analysis/zlma.py index a04340363d4..14756a9c59a 100644 --- a/discordbot/stocks/technical_analysis/zlma.py +++ b/discordbot/stocks/technical_analysis/zlma.py @@ -4,14 +4,14 @@ import discord from matplotlib import pyplot as plt import pandas as pd -import discordbot.config_discordbot as cfg -from discordbot.run_discordbot import gst_imgur -import discordbot.helpers - from gamestonk_terminal.helper_funcs import plot_autoscale from gamestonk_terminal.common.technical_analysis import overlap_model from gamestonk_terminal.config_plot import PLOT_DPI +import discordbot.config_discordbot as cfg +from discordbot.run_discordbot import gst_imgur +import discordbot.helpers + async def zlma_command(ctx, ticker="", window="", offset="", start="", end=""): """Displays chart with zero lag moving average [Yahoo Finance]""" @@ -40,15 +40,12 @@ async def zlma_command(ctx, ticker="", window="", offset="", start="", end=""): if window == "": window = [20] else: - window_temp = [] - i = 0 - b = 0 - while i < len(window): - if window[i] == ",": - window_temp.append(float(window[b:i])) - l_legend.append(float(window[b:i])) - b = i - i += 1 + window_temp = list() + for wind in window.split(","): + try: + window_temp.append(float(wind)) + except Exception as e: + raise Exception("Window needs to be a float") from e window = window_temp if offset == "":