From 2977c9be082cb9ed3a390fd87f21bc29ef9bbb23 Mon Sep 17 00:00:00 2001 From: Colin Delahunty <72827203+colin99d@users.noreply.github.com> Date: Fri, 4 Nov 2022 17:28:56 +0100 Subject: [PATCH] Moves futures.csv to the misc folder (#3306) * Moves futures.csv * Finishing futures changes Co-authored-by: James Maslek --- .../dashboards/voila/forecast.ipynb | 4 +- openbb_terminal/dashboards/voila/futures.csv | 187 ------------------ .../dashboards/voila/futures.ipynb | 7 +- openbb_terminal/futures/yfinance_model.py | 3 +- .../{ => miscellaneous}/futures/futures.csv | 0 5 files changed, 6 insertions(+), 195 deletions(-) delete mode 100644 openbb_terminal/dashboards/voila/futures.csv rename openbb_terminal/{ => miscellaneous}/futures/futures.csv (100%) diff --git a/openbb_terminal/dashboards/voila/forecast.ipynb b/openbb_terminal/dashboards/voila/forecast.ipynb index f117808accd..5ff4a989750 100644 --- a/openbb_terminal/dashboards/voila/forecast.ipynb +++ b/openbb_terminal/dashboards/voila/forecast.ipynb @@ -364,7 +364,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3.10.4 ('obb')", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -378,7 +378,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.4" + "version": "3.9.6" }, "metadata": { "interpreter": { diff --git a/openbb_terminal/dashboards/voila/futures.csv b/openbb_terminal/dashboards/voila/futures.csv deleted file mode 100644 index 8dddd27bbc7..00000000000 --- a/openbb_terminal/dashboards/voila/futures.csv +++ /dev/null @@ -1,187 +0,0 @@ -Ticker,Description,Exchange,Category -YI=F,"1,000 oz Mini Silver Futures",NYB,Metals -ALI=F,Aluminum Futures,CMX,Metals -BLK=F,Block Cheese Futures,CME,Agriculture -AW=F,Bloomberg Commodity Index Futures,CBT,Index -BZ=F,Brent Crude Oil Last Day Finance Futures,NYM,Hydrocarbon -BZT=F,Brent Crude Oil Last Day TAS Futures,NYM,Hydrocarbon -CB=F,Cash-Settled Butter Futures,CME,Agriculture -CSC=F,Cash-Settled Cheese Futures,CME,Agriculture -GEO=F,CBL Global Emissions Offset Futures,NYM,Hydrocarbon -ZW=F,Chicago SRW Wheat Futures,CBT,Agriculture -ZWT=F,Chicago SRW Wheat TAS Futures,CBT,Agriculture -DC=F,Class III Milk Futures,CME,Agriculture -GDK=F,Class IV Milk Futures,CME,Agriculture -HG0=F,Copper Spot TAS Futures,CMX,Metals -HGT=F,Copper TAS Futures,CMX,Metals -ZC=F,Corn Futures,CBT,Agriculture -ZCT=F,Corn TAS Futures,CBT,Agriculture -CLT=F,Crude Oil TAS Futures,NYM,Hydrocarbon -DY=F,Dry Whey Futures,CME,Agriculture -QC=F,E-mini Copper Futures,CMX,Metals -QM=F,E-mini Crude Oil Futures,NYM,Hydrocarbon -XAE=F,E-mini Energy Select Sector Futures,CME,Index -QO=F,E-mini Gold Futures,CMX,Metals -GC=F,CME Gold Futures,CMX,Metals -SGU=F,Shanghai Gold (USD) Futures,CMX,Metals -QG=F,E-mini Natural Gas Futures,NYM,Hydrocarbon -QH=F,E-mini NY Harbor ULSD Futures,NYM,Hydrocarbon -QU=F,E-mini RBOB Gasoline Futures,NYM,Hydrocarbon -QI=F,E-mini Silver Futures,CMX,Metals -GF=F,Feeder Cattle Futures,CME,Agriculture -GFT=F,Feeder Cattle TAS Futures,CME,Agriculture -GCT=F,Gold TAS Futures Futures,CMX,Metals -KE=F,KC HRW Wheat Futures,CBT,Agriculture -KET=F,KC HRW Wheat TAS Futures,CBT,Agriculture -HE=F,Lean Hogs Futures,CME,Agriculture -HET=F,Lean Hogs TAS Futures,CME,Agriculture -LE=F,Live Cattle Futures,CME,Agriculture -LET=F,Live Cattle TAS Futures,CME,Agriculture -HG=F,Copper Futures,CMX,Metals -MHG=F,E-mini Micro Copper Futures,CMX,Metals -MGC=F,E-mini Micro Gold Futures,CMX,Metals -SIL=F,E-mini Micro Silver Futures ,CMX,Metals -MCL=F,Micro WTI Crude Oil Futures,NYM,Hydrocarbon -YG=F,E-mini Gold Futures,NYB,Metals -XK=F,Mini Soybean Futures,CBT,Agriculture -XC=F,Mini Corn Futures,CBT,Agriculture -XW=F,Mini Chicago SRW Wheat Futures,CBT,Agriculture -GNF=F,Nonfat Dry Milk Futures,CME,Agriculture -ZO=F,Oats Futures,CBT,Agriculture -PRK=F,Pork Cutout Futures,CME,Agriculture -RBT=F,RBOB Gasoline TAS Futures,NYM,Hydrocarbon -ZR=F,Rough Rice Futures,CBT,Agriculture -GD=F,S&P GSCI Commodity Index Futures,CME,Index -SIT=F,Silver TAS Futures,CMX,Metals -ZS=F,Soybean Futures,CBT,Agriculture -ZM=F,Soybean Meal Futures,CBT,Agriculture -ZMT=F,Soybean Meal TAS Futures,CBT,Agriculture -ZL=F,Soybean Oil Futures,CBT,Agriculture -ZLT=F,Soybean Oil TAS Futures,CBT,Agriculture -SBT=F,Soybean TAS Futures,CBT,Agriculture -ZN=F,10-Year T-Note Futures,CBT,Interest Rates -N1U=F,10-Year USD MAC Swap Futures,CBT,Interest Rates -TWE=F,20-Year U.S. Treasury Bond Futures,CBT,Interest Rates -ZT=F,2-Year T-Note Futures,CBT,Interest Rates -F1U=F,5-Year USD MAC Swap Futures,CBT,Interest Rates -RX=F,Dow Jones Real Estate Index Futures,CBT,Index -GE=F,Eurodollar Futures,CME,Currency -GLB=F,One-Month Eurodollar Futures,CME,Currency -ZF=F,Five-Year US Treasury Note Futures,CBT,Interest Rates -10Y=F,Micro 10-Year Yield Futures,CBT,Interest Rates -2YY=F,Micro 2-Year Yield Futures,CBT,Interest Rates -30Y=F,Micro 30-Year Yield Futures,CBT,Interest Rates -5YY=F,Micro 5-Year Yield Futures,CBT,Interest Rates -SR1=F,One-Month SOFR Futures,CME,Interest Rates -ZFT=F,TAS on 5-Year Treasury Note Futures,CBT,Interest Rates -ZQ=F,Thirty-Day Fed Fund Futures,CBT,Interest Rates -Z3N=F,Three Year Treasury Note Futures,CBT,Interest Rates -SR3=F,Three-Month SOFR Futures,CME,Interest Rates -ZB=F,U.S. Treasury Bond Futures,CBT,Interest Rates -UB=F,Ultra U.S. Treasury Bond Futures,CBT,Interest Rates -BTM=F,Bakkt BTC (USD) Monthly Futures,NYB,Currency -BTC=F,Bitcoin Futures,CME,Currency -ETH=F,Ether Futures,CME,Currency -MBT=F,E-mini Micro Bitcoin Futures,CME,Currency -MET=F,E-mini Micro Ether Futures,CME,Currency -6A=F,Australian Dollar Futures,CME,Currency -6L=F,Brazilian Real Futures,CME,Currency -6B=F,British Pound Futures,CME,Currency -PJY=F,British Pound/Japanese Yen Futures,CME,Currency -PSF=F,British Pound/Swiss Franc Futures,CME,Currency -6C=F,Canadian Dollar Futures,CME,Currency -E7=F,E-mini Euro FX Futures,CME,Currency -J7=F,E-mini Japanese Yen Futures,CME,Currency -6E=F,Euro FX Futures,CME,Currency -EAD=F,Euro/Australian Dollar Futures,CME,Currency -RP=F,Euro/British Pound Futures,CME,Currency -ECD=F,Euro/Canadian Dollar Futures,CME,Currency -RY=F,Euro/Japanese Yen Futures,CME,Currency -ENK=F,Euro/Norwegian Krone Futures,CME,Currency -ESK=F,Euro/Swedish Krona Futures,CME,Currency -RF=F,Euro/Swiss Franc Futures,CME,Currency -SIR=F,Indian Rupee/USD Futures,CME,Currency -6J=F,Japanese Yen Futures,CME,Currency -KRW=F,Korean Won Futures,CME,Currency -6M=F,Mexican Peso Futures,CME,Currency -M6A=F,Micro AUD/USD Futures,CME,Currency -MCD=F,Micro CAD/USD Futures,CME,Currency -MSF=F,Micro CHF/USD Futures,CME,Currency -M6E=F,Micro EUR/USD Futures,CME,Currency -M6B=F,Micro GBP/USD Futures,CME,Currency -MIR=F,Micro INR/USD Futures,CME,Currency -M6C=F,Micro USD/CAD Futures,CME,Currency -M6J=F,Micro USD/JPY Futures,CME,Currency -6N=F,New Zealand Dollar Futures,CME,Currency -NKD=F,Nikkei Index (USD) Futures,CME,Index -NIY=F,Nikkei Index (YEN) Futures,CME,Index -NOK=F,Norwegian Krone Futures,CME,Currency -6R=F,Russian Ruble Futures,CME,Currency -6Z=F,South African Rand Futures,CME,Currency -SEK=F,Swedish Krona Futures,CME,Currency -6S=F,Swiss Franc Futures,CME,Currency -SJY=F,Swiss Franc/Japanese Yen Futures,CME,Currency -TPY=F,Yen Denominated TOPIX Futures,CME,Index -YMT=F,E-mini DJIA Index BTIC Futures,CBT,Index -NQT=F,E-mini Nasdaq 100 BTIC Futures,CME,Index -EST=F,E-mini S&P 500 BTIC Futures,CME,Index -XAF=F,E-mini S&P 500 Financial Select Sector Index Futures,CME,Index -RS1=F,E-mini Russell 1000 Index Futures,CME,Index -RSG=F,E-mini Russell 1000 Growth Index Futures,CME,Index -RSV=F,E-mini Russell 1000 Value Index Futures,CME,Index -RTY=F,E-mini Russell 2000 Index Futures,CME,Index -M2K=F,E-mini Micro Russell 2000 Index Futures,CME,Index -ESG=F,E-mini S&P 500 ESG Index Futures,CME,Index -EMT=F,E-mini S&P MidCap 400 Index BTIC Futures,CME,Index -EMD=F,E-mini S&P MidCap 400 Index Futures,CME,Index -MNQ=F,E-mini Micro Nasdaq 100 Index Futures,CME,Index -MES=F,E-mini Micro S&P 500 Index Futures,CME,Index -FNG=F,ICE Micro FANG+ Index Futures,NYB,Index -MMW=F,ICE MSCI ACWI NTR Index Futures,NYB,Index -CHH=F,ICE MSCI China NTR Futures,NYB,Index -MFS=F,ICE MSCI EAFE Index Futures,NYB,Index -ASN=F,ICE MSCI EM Asia NTR Index Futures,NYB,Index -LFM=F,ICE MSCI EM ESG Leaders NTR Index Futures,NYB,Index -MML=F,ICE MSCI EM Latin America NTR Index Futures,NYB,Index -MME=F,ICE MSCI Emerging Markets Index Futures,NYB,Index -MIN=F,ICE MSCI India NTR Index Futures,NYB,Index -USS=F,ICE MSCI USA GTR Index Futures,NYB,Index -MWL=F,ICE MSCI World Index Futures,NYB,Index -MWS=F,ICE MSCI World NTR Index Futures,NYB,Index -VLQ=F,Nasdaq 100 Volatility Index Futures,CME,Index -SDA=F,S&P 500 Annual Dividend Index Futures,CME,Index -SED=F,SED (SOFR-Eurodollar) Spread Futures,CME,Interest Rates -PL=F,Platinum Futures,NYM,Metals -PA=F,Palladium Futures,NYM,Metals -BUS=F,US Midwest Busheling Ferrous Futures,CMX,Metals -AUP=F,Aluminum MW U.S. Transaction,CMX,Metals -GLI=F,European Low Sulphur Gasoil Futures,NYM,Hydrocarbon -DX=F,ICE U.S. Dollar Index Futures,NYB,Index -FT5=F,E-mini FTSE China 50 Index Futures,CME,Index -MMM=F,ICE MSCI Emerging Markets EMEA NTR Index Futures,NYB,Index -MMN=F,ICE MSCI Emerging Markets NTR Index Futures,NYB,Index -MLE=F,ICE MSCI Latin America Index Futures,NYB,Index -YM=F,E-mini DJ $5 Index Futures,CBT,Index -XAI=F,E-mini S&P 500 Industrial Select Sector Futures,CME,Index -XAB=F,E-mini S&P 500 Materials Select Sector Futures,CME,Index -XAK=F,E-mini S&P 500 Technology Select Sector Futures,CME,Index -XAP=F,E-mini S&P 500 Consumer Staples Select Sector Futures,CME,Index -XAR=F,E-mini S&P 500 Real Estate Select Sector Futures,CME,Index -XAU=F,E-mini S&P 500 Utilities Select Sector Futures,CME,Index -XAV=F,E-mini S&P 500 Health Care Select Sector Futures,CME,Index -XAY=F,E-mini S&P 500 Consumer Discretionary Select Sector Futures,CME,Index -XAZ=F,E-mini S&P 500 Communication Services Select Sector Futures,CME,Index -BIO=F,E-mini Nasdaq Biotech Industry Futures,CME,Index -NQ=F,CME Nasdaq 100 Index Futures,CME,Index -NQQ=F,TACO on E-mini Nasdaq 100 Index Futures,CME,Index -UFV=F,Urea (Granular) FOB US Gulf Futures,CBT,Agriculture -CC=F,Cocoa Futures,NYB,Agriculture -KC=F,Coffee Futures,NYB,Agriculture -CT=F,Cotton Futures,NYB,Agriculture -SF=F,Sugar No. 16 Futures,NYB,Agriculture -SB=F,Sugar No. 11 Futures,NYB,Agriculture -OJ=F,Orange Juice Futures,NYB,Agriculture -NG=F,Natural Gas Futures,NYM,Hydrocarbon -RB=F,RBOB Gasoline Futures,NYM,Hydrocarbon -CL=F,WTI Crude Oil Futures,CMX,Hydrocarbon -TRM=F,ICE TRY/USD Futures,NYB,Currency diff --git a/openbb_terminal/dashboards/voila/futures.ipynb b/openbb_terminal/dashboards/voila/futures.ipynb index 8266d107afb..71482d3e250 100644 --- a/openbb_terminal/dashboards/voila/futures.ipynb +++ b/openbb_terminal/dashboards/voila/futures.ipynb @@ -28,7 +28,7 @@ "metadata": {}, "outputs": [], "source": [ - "df = pd.read_csv(\"futures.csv\")\n", + "df = pd.read_csv(MISCELLANEOUS_DIRECTORY / \"futures\" / \"futures.csv\")\n", "\n", "# These are the symbols that futures use for each month\n", "months = [\"F\", \"G\", \"H\", \"J\", \"K\", \"M\", \"N\", \"Q\", \"U\", \"V\", \"X\", \"Z\"]" @@ -41,9 +41,6 @@ "metadata": {}, "outputs": [], "source": [ - "import os, sys\n", - "\n", - "\n", "class HiddenPrints:\n", " def __enter__(self):\n", " self._original_stdout = sys.stdout\n", @@ -101,7 +98,7 @@ "\n", "def build_ticker(ticker: str, month: int, year: int) -> str:\n", " if ticker:\n", - " row = df[df[\"Ticker\"] == f\"{ticker.split(':')[0]}=F\"].iloc[0]\n", + " row = df[df[\"Ticker\"] == f\"{ticker.split(':')[0]}\"].iloc[0]\n", " row = row.to_dict()\n", " the_tick = row[\"Ticker\"].replace(\"=F\", \"\")\n", " return f\"{the_tick}{months[month-1]}{str(year)[-2:]}.{row['Exchange']}\"\n", diff --git a/openbb_terminal/futures/yfinance_model.py b/openbb_terminal/futures/yfinance_model.py index f3b92c4464a..9f244645ff8 100644 --- a/openbb_terminal/futures/yfinance_model.py +++ b/openbb_terminal/futures/yfinance_model.py @@ -12,12 +12,13 @@ import pandas as pd from dateutil.relativedelta import relativedelta from openbb_terminal.decorators import log_start_end +from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY # pylint: disable=attribute-defined-outside-init logger = logging.getLogger(__name__) -FUTURES_DATA = pd.read_csv(os.path.join("openbb_terminal", "futures", "futures.csv")) +FUTURES_DATA = pd.read_csv(MISCELLANEOUS_DIRECTORY / "futures" / "futures.csv") MONTHS = { 1: "F", diff --git a/openbb_terminal/futures/futures.csv b/openbb_terminal/miscellaneous/futures/futures.csv similarity index 100% rename from openbb_terminal/futures/futures.csv rename to openbb_terminal/miscellaneous/futures/futures.csv