diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index e6f82ba7c7e..bf8d7db31a5 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -10,7 +10,7 @@ jobs: with: mode: minimum count: 1 - labels: "website, bug, build, do not merge, docker, docs, duplicate, enhancement, feat XS, feat S, feat M, feat L, feat XL, help wanted, refactor, tests, discord, dependencies" + labels: "website, bug, build, do not merge, docker, docs, duplicate, enhancement, feat XS, feat S, feat M, feat L, feat XL, help wanted, refactor, tests, discord, dependencies, notebookreports, dashboards" - uses: mheap/github-action-required-labels@v1 with: mode: exactly diff --git a/gamestonk_terminal/jupyter/dashboards/stocks.ipynb b/gamestonk_terminal/jupyter/dashboards/stocks.ipynb index 9e29cf9616f..077dbd2322e 100644 --- a/gamestonk_terminal/jupyter/dashboards/stocks.ipynb +++ b/gamestonk_terminal/jupyter/dashboards/stocks.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "id": "e9ad60bc", "metadata": {}, "outputs": [], @@ -18,7 +18,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "id": "beb36881", "metadata": {}, "outputs": [], @@ -37,11 +37,13 @@ "def format_plotly(fig, calc, data, start, end):\n", " fig.update_yaxes(title=None)\n", " fig.update_xaxes(title=None)\n", + " start_t = start.strftime('%Y/%m/%d')\n", + " end_t = end.strftime('%Y/%m/%d')\n", " if calc:\n", " if len(calc) == 1:\n", - " fig_title = f\"{calc[0]} of {data} from {start.strftime('%Y/%m/%d')} to {end.strftime('%Y/%m/%d')}\"\n", + " fig_title = f\"{calc[0]} of {data} from {start_t} to {end_t}\"\n", " else:\n", - " fig_title = f\"{', '.join(calc)} of {data} from {start.strftime('%Y/%m/%d')} to {end.strftime('%Y/%m/%d')}\"\n", + " fig_title = f\"{', '.join(calc)} of {data} from {start_t} to {end_t}\"\n", " fig.update_layout(\n", " autosize=False,\n", " width=1000,\n", @@ -56,25 +58,49 @@ " )\n", "\n", "\n", - "last_tickers = \"\"" + "last_tickers = \"\"\n", + "last_interval = \"id\"\n" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "id": "f8c2f65c", "metadata": { "tags": [ "parameters" ] }, - "outputs": [], + "outputs": [ + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "a5afde0c81724e56aea90f66027ff74b", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "VBox(children=(HTML(value='

Stock Analysis Dashboard

'), HBox(children=(SelectMultiple(index=(0,), layo…" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], "source": [ - "def view_chart(calculation, data, rolling, start, end, tickers):\n", - " global last_tickers, df\n", + "def view_chart(calculation, data, rolling, start, end, interval, tickers):\n", + " global last_tickers, df, last_interval\n", + " # set_interval_opts(interval_widget,start,end)\n", " if tickers and tickers[-1] == \",\":\n", - " if tickers != last_tickers:\n", - " df = yf.download(tickers, period=\"max\", progress=False)\n", + " if tickers != last_tickers or interval != last_interval:\n", + " if interval in [\"1d\", \"5d\", \"1wk\", \"1mo\", \"3mo\"]:\n", + " df = yf.download(\n", + " tickers, period=\"max\", interval=interval, progress=False\n", + " )\n", + " else:\n", + " df = yf.download(\n", + " tickers, start=start, end=end, interval=interval, progress=False\n", + " )\n", " last_tickers = tickers\n", "\n", " start_n = datetime(start.year, start.month, start.day)\n", @@ -82,67 +108,131 @@ " fig = go.Figure()\n", " for item in calculation:\n", " calcs = views[item](df[data], rolling)\n", - " result = calcs.loc[(calcs.index >= start_n) & (calcs.index <= end_n)]\n", - " \n", + " if interval in [\"1d\", \"5d\", \"1wk\", \"1mo\", \"3mo\"]:\n", + " result = calcs.loc[(calcs.index >= start_n) & (calcs.index <= end_n)]\n", + " else:\n", + " result = calcs\n", + "\n", " if isinstance(result, pd.Series):\n", - " plot = go.Scatter(x=result.index, y=result, mode=\"lines\", name=f\"{tickers.split(',')[0]} {item}\")\n", + " name = f\"{tickers.split(',')[0]} {item}\"\n", + " plot = go.Scatter(x=result.index, y=result, mode=\"lines\", name=name)\n", " fig.add_trace(plot)\n", " else:\n", " for val in result:\n", - " plot = go.Scatter(x=result.index,y=result[val],mode=\"lines\",name=f\"{val.upper()} {item}\")\n", + " name = f\"{val.upper()} {item}\"\n", + " plot = go.Scatter(\n", + " x=result.index,\n", + " y=result[val],\n", + " mode=\"lines\",\n", + " name=name,\n", + " connectgaps=True,\n", + " )\n", " fig.add_trace(plot)\n", "\n", " format_plotly(fig, calculation, data, start, end)\n", - " # Jupyter-lab and Google Colab: do not use renderer argument\n", - " # VS Code: ADD: renderer=\"cocalc\"\n", - " # Voila: ADD: renderer=\"notebook\"\n", - " if os.environ.get('SERVER_SOFTWARE','jupyter').startswith('voila'):\n", + "\n", + " \"\"\"fig.update_layout(legend=dict(\n", + " yanchor=\"top\",\n", + " y=0.99,\n", + " xanchor=\"left\",\n", + " x=0.01\n", + " ))\"\"\"\n", + "\n", + " if os.environ.get(\"SERVER_SOFTWARE\", \"jupyter\").startswith(\"voila\"):\n", " fig.show(config={\"showTips\": False}, renderer=\"notebook\")\n", " else:\n", " fig.show(config={\"showTips\": False})\n", "\n", + "\n", "w_auto = widgets.Layout(width=\"auto\")\n", - "calc_widget = widgets.SelectMultiple(options=list(views.keys()), value=[\"Raw Data\"], layout=w_auto)\n", - "data_widget = widgets.Dropdown(\n", - " options=[\"Open\", \"Close\", \"High\", \"Low\", \"Volume\"], value=\"Close\", layout=w_auto\n", + "calc_widget = widgets.SelectMultiple(\n", + " options=list(views.keys()), value=[\"Raw Data\"], layout=w_auto\n", ")\n", + "\n", + "data_opts = [\"Open\", \"Close\", \"High\", \"Low\", \"Volume\"]\n", + "data_widget = widgets.Dropdown(options=data_opts, value=\"Close\", layout=w_auto)\n", "rolling_widget = widgets.Dropdown(options=list(range(2, 101)), value=60, layout=w_auto)\n", - "start_widget = widgets.DatePicker(value=datetime.today() - timedelta(days=365), layout=w_auto)\n", - "end_widget = widgets.DatePicker(value=datetime.today(), layout=w_auto)\n", - "tickers_widget = widgets.Text(value=\"TSLA,\", layout=w_auto)\n", + "\n", + "base_date = (datetime.today() - timedelta(days=365)).date()\n", + "start_widget = widgets.DatePicker(value=base_date, layout=w_auto)\n", + "end_widget = widgets.DatePicker(value=datetime.today().date(), layout=w_auto)\n", + "interval_opts = [\n", + " \"1m\",\n", + " \"2m\",\n", + " \"5m\",\n", + " \"15m\",\n", + " \"30m\",\n", + " \"60m\",\n", + " \"90m\",\n", + " \"1h\",\n", + " \"1d\",\n", + " \"5d\",\n", + " \"1wk\",\n", + " \"1mo\",\n", + " \"3mo\",\n", + "]\n", + "interval_widget = widgets.Dropdown(options=interval_opts, value=\"1d\", layout=w_auto)\n", + "tickers_widget = widgets.Textarea(value=\"TSLA,\", layout=w_auto)\n", + "\n", "data_box = widgets.VBox([tickers_widget, data_widget, rolling_widget])\n", - "date_box = widgets.VBox([start_widget, end_widget])\n", - "controls = widgets.HBox([calc_widget, data_box, date_box], layout=widgets.Layout(width=\"60%\"))\n", + "date_box = widgets.VBox([start_widget, end_widget, interval_widget])\n", + "controls = widgets.HBox(\n", + " [calc_widget, data_box, date_box], layout=widgets.Layout(width=\"60%\")\n", + ")\n", "\n", "stocks_view = widgets.interactive_output(\n", " view_chart,\n", - " {\"calculation\": calc_widget,\n", - " \"data\": data_widget,\n", - " \"rolling\": rolling_widget,\n", - " \"start\": start_widget,\n", - " \"end\": end_widget,\n", - " \"tickers\": tickers_widget,\n", - " }\n", + " {\n", + " \"calculation\": calc_widget,\n", + " \"data\": data_widget,\n", + " \"rolling\": rolling_widget,\n", + " \"start\": start_widget,\n", + " \"end\": end_widget,\n", + " \"interval\": interval_widget,\n", + " \"tickers\": tickers_widget,\n", + " },\n", ")\n", "\n", - "title_html = '

Stock Analysis Dashboard

'\n", - "warning_html = '

You MUST use a comma after EVERY stock you type in.

'\n", - "app_contents = [widgets.HTML(title_html), controls, widgets.HTML(warning_html), stocks_view]\n", + "title_html = \"

Stock Analysis Dashboard

\"\n", + "warning_html = (\n", + " '

You MUST use a comma after EVERY stock you type in.

'\n", + ")\n", + "app_contents = [\n", + " widgets.HTML(title_html),\n", + " controls,\n", + " widgets.HTML(warning_html),\n", + " stocks_view,\n", + "]\n", "app = widgets.VBox(app_contents)\n", - "\n", - "\n", "display(app)\n" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "b304bcc0-3248-4093-9378-8878093d72be", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { "kernelspec": { - "display_name": "Python 3.9.7 64-bit ('base': conda)", - "name": "python397jvsc74a57bd0e896a00ead8b521528d79ac9ef24990696f2b751eb283ab8e0d078c9c4971ffc" + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" }, "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", "name": "python", - "version": "" + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.8.12" }, "metadata": { "interpreter": {