From 081ccd2fbd28225eb4017b32a470d7ff0c72305d Mon Sep 17 00:00:00 2001 From: Chavithra Date: Mon, 17 Oct 2022 15:35:19 +0200 Subject: [PATCH] Moving `custom_imports` into `openbbterminal` folder. (#2858) * Move custom_imports * Tests : updating paths * Removed custom imports * Fixed the futures dashboard * Removed old tests Co-authored-by: Colin Delahunty <72827203+colin99d@users.noreply.github.com> Co-authored-by: colin99d Co-authored-by: martinb-bb <105685594+martinb-bb@users.noreply.github.com> --- custom_imports/forecasting/.gitkeep | 0 custom_imports/stocks/.gitkeep | 0 .../stocks/btc.csv/discovery/.gitkeep | 0 .../stocks/btc.csv/due_diligence/.gitkeep | 0 custom_imports/stocks/btc.csv/nft/.gitkeep | 0 .../stocks/btc.csv/onchain/.gitkeep | 0 .../stocks/btc.csv/overview/.gitkeep | 0 .../btc.csv/technical_analysis/.gitkeep | 0 custom_imports/stocks/test.csv | 254 ------------------ .../dashboards/voila}/futures.csv | 0 .../dashboards/voila/futures.ipynb | 9 +- .../forecast/forecast_controller.py | 21 +- openbb_terminal/forecast/forecast_model.py | 12 +- .../stocks/test_stocks_helper.py | 22 -- website/content/terminal/forecast/_index.md | 2 +- 15 files changed, 20 insertions(+), 300 deletions(-) delete mode 100644 custom_imports/forecasting/.gitkeep delete mode 100644 custom_imports/stocks/.gitkeep delete mode 100644 custom_imports/stocks/btc.csv/discovery/.gitkeep delete mode 100644 custom_imports/stocks/btc.csv/due_diligence/.gitkeep delete mode 100644 custom_imports/stocks/btc.csv/nft/.gitkeep delete mode 100644 custom_imports/stocks/btc.csv/onchain/.gitkeep delete mode 100644 custom_imports/stocks/btc.csv/overview/.gitkeep delete mode 100644 custom_imports/stocks/btc.csv/technical_analysis/.gitkeep delete mode 100644 custom_imports/stocks/test.csv rename {custom_imports/dashboards => openbb_terminal/dashboards/voila}/futures.csv (100%) diff --git a/custom_imports/forecasting/.gitkeep b/custom_imports/forecasting/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/.gitkeep b/custom_imports/stocks/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/btc.csv/discovery/.gitkeep b/custom_imports/stocks/btc.csv/discovery/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/btc.csv/due_diligence/.gitkeep b/custom_imports/stocks/btc.csv/due_diligence/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/btc.csv/nft/.gitkeep b/custom_imports/stocks/btc.csv/nft/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/btc.csv/onchain/.gitkeep b/custom_imports/stocks/btc.csv/onchain/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/btc.csv/overview/.gitkeep b/custom_imports/stocks/btc.csv/overview/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/btc.csv/technical_analysis/.gitkeep b/custom_imports/stocks/btc.csv/technical_analysis/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/custom_imports/stocks/test.csv b/custom_imports/stocks/test.csv deleted file mode 100644 index da1f14829ca..00000000000 --- a/custom_imports/stocks/test.csv +++ /dev/null @@ -1,254 +0,0 @@ -Date,Close/Last,Volume,Open,High,Low -03/14/2022,$102.25,89731680,$102.99,$105.2397,$101.04 -03/11/2022,$104.29,87584430,$108.13,$108.19,$104.08 -03/10/2022,$106.46,102557400,$108.89,$109.07,$103.07 -03/09/2022,$111.05,102310300,$108.41,$111.71,$106.85 -03/08/2022,$105.53,135348300,$102.81,$109.9,$100.08 -03/07/2022,$102.95,92599970,$108.53,$109.53,$102.82 -03/04/2022,$108.41,100671300,$112,$113,$106.81 -03/03/2022,$111.98,123916700,$118.13,$118.26,$111.05 -03/02/2022,$118.28,118354500,$115.47,$119.48,$113.31 -03/01/2022,$113.83,126552200,$122.33,$122.43,$112.8 -02/28/2022,$123.34,124666100,$120.31,$124.61,$119.2 -02/25/2022,$121.06,127821000,$117.16,$121.23,$116.0421 -02/24/2022,$116.61,142956600,$104.56,$116.96,$104.26 -02/23/2022,$109.76,120299400,$117.4,$118.65,$109.04 -02/22/2022,$115.65,141648500,$115.27,$119.2,$113.61 -02/18/2022,$113.83,114321200,$113.9,$115.635,$109.89 -02/17/2022,$112.37,98179640,$116.26,$116.98,$112.26 -02/16/2022,$117.69,119109600,$119.05,$119.54,$114.22 -02/15/2022,$121.47,144139700,$117.19,$121.88,$114.36 -02/14/2022,$114.27,135146400,$115.51,$118.37,$113.46 -02/11/2022,$113.18,164723200,$126.14,$127.1699,$111.81 -02/10/2022,$125.77,108939900,$128.84,$131.7589,$124.61 -02/09/2022,$132.85,92948860,$129.6,$132.96,$127.65 -02/08/2022,$128.23,84902750,$122.38,$128.705,$122.05 -02/07/2022,$123.67,81672500,$123.56,$127.63,$122.785 -02/04/2022,$123.6,86212010,$120.34,$124.96,$118.58 -02/03/2022,$120.08,103599500,$120.32,$125.37,$118.816 -02/02/2022,$122.76,180065000,$129.89,$130.06,$120.64 -02/01/2022,$116.78,122467900,$116.75,$117.26,$112.73 -01/31/2022,$114.25,97205990,$107.93,$114.31,$106.9 -01/28/2022,$105.24,98749520,$101.55,$105.4,$99.35 -01/27/2022,$102.6,125954100,$111.96,$112.75,$101.94 -01/26/2022,$110.71,94752610,$114.55,$117.16,$108.63 -01/25/2022,$111.13,85102910,$114.1,$114.82,$109.86 -01/24/2022,$116.53,116301800,$115.4,$116.77,$107.5 -01/21/2022,$118.81,95685270,$120.14,$125.02,$118.39 -01/20/2022,$121.89,91157290,$126.04,$128.51,$121.41 -01/19/2022,$128.27,69831850,$133.55,$134.57,$128.02 -01/18/2022,$131.93,56589460,$134.5,$136.3893,$131.59 -01/14/2022,$136.88,71078440,$131.68,$137,$131.43 -01/13/2022,$132.74,76618060,$139.44,$141.25,$131.81 -01/12/2022,$137.47,69669600,$138.585,$140.57,$135.77 -01/11/2022,$137.31,77153910,$133.45,$138.99,$131.59 -01/10/2022,$132,84671340,$129.08,$132.42,$125.03 -01/07/2022,$132,58441100,$136.28,$137.44,$131.13 -01/06/2022,$136.23,64802940,$136.19,$138,$131.77 -01/05/2022,$136.15,65403170,$142.815,$143.76,$135.29 -01/04/2022,$144.42,80200460,$151.01,$152.42,$140.7 -01/03/2022,$150.24,59477670,$145.135,$151.65,$145.02 -12/31/2021,$143.9,49448140,$146.16,$148.61,$143.55 -12/30/2021,$145.15,44358000,$147.44,$148.85,$144.85 -12/29/2021,$148.26,51300210,$152.82,$154.3399,$147.29 -12/28/2021,$153.15,58699070,$155.88,$156.73,$151.38 -12/27/2021,$154.36,53296380,$147.51,$154.89,$147.25 -12/23/2021,$146.14,48653790,$143.89,$149.018,$143.85 -12/22/2021,$143.88,46923680,$142.65,$144.5,$140.27 -12/21/2021,$144.25,57785240,$138.185,$144.5,$135.15 -12/20/2021,$135.8,38195400,$135.97,$138.26,$133.52 -12/17/2021,$137.75,55692280,$136.3,$142.04,$136.11 -12/16/2021,$138.64,63369550,$147,$147.93,$137.02 -12/15/2021,$146.5,72425780,$135.11,$146.69,$133.81 -12/14/2021,$135.6,50754640,$131.67,$137.24,$130.6 -12/13/2021,$133.8,42173960,$138.25,$139.4,$133.415 -12/10/2021,$138.55,42224280,$141.29,$141.365,$135.82 -12/09/2021,$138.1,53019930,$145.16,$146.69,$137.8 -12/08/2021,$145.24,40977480,$144.96,$147.04,$142.7 -12/07/2021,$144.85,53359430,$143.9,$145.76,$141.0001 -12/06/2021,$139.06,66776490,$141.135,$141.31,$134.2 -12/03/2021,$144.01,65910030,$151.645,$152.38,$140.72 -12/02/2021,$150.68,56161220,$147.675,$152.53,$146.47 -12/01/2021,$149.11,64185120,$160.37,$160.88,$148.92 -11/30/2021,$158.37,75182550,$163.28,$164.4599,$155.6801 -11/29/2021,$161.91,57438870,$157.5,$162.505,$156.1 -11/26/2021,$154.81,36245070,$155.8,$158.1,$152.81 -11/24/2021,$157.8,60677060,$149.46,$157.93,$147.19 -11/23/2021,$149.92,62852710,$150.41,$152.66,$145.2996 -11/22/2021,$152.52,58674080,$157.14,$161.8799,$152.39 -11/19/2021,$155.41,41668860,$155.76,$156.92,$153.445 -11/18/2021,$155.02,60612730,$157.07,$158.89,$152.56 -11/17/2021,$151.34,54527480,$151.98,$154.6599,$149.69 -11/16/2021,$152.45,53100810,$145.93,$153.08,$145.34 -11/15/2021,$146.49,52271270,$148,$148.98,$142.86 -11/12/2021,$147.89,52162140,$146.025,$148.59,$144.25 -11/11/2021,$146.01,67934850,$142.955,$146.47,$140.84 -11/10/2021,$139.87,82989150,$143.93,$146.3,$138.52 -11/09/2021,$148.92,98442600,$154.01,$155.65,$143.89 -11/08/2021,$150.16,141493800,$137.7,$153.6,$137.7 -11/05/2021,$136.34,64920600,$139.185,$141.22,$134.42 -11/04/2021,$137.5,84825160,$132.01,$139,$130.77 -11/03/2021,$130.53,59537820,$127.75,$130.6,$126.7901 -11/02/2021,$127.63,53491940,$124.98,$128.455,$124.2 -11/01/2021,$125.23,54559780,$119.45,$125.67,$118.1301 -10/29/2021,$120.23,43320130,$120.95,$122.57,$119.88 -10/28/2021,$121.16,58002460,$122.855,$123.5,$120.26 -10/27/2021,$122.28,98245320,$121.63,$128.08,$121.05 -10/26/2021,$122.93,59458930,$122.99,$127.2,$122.5782 -10/25/2021,$122.36,47834120,$120.515,$123.4599,$118.6 -10/22/2021,$119.82,38992690,$120.825,$121.56,$118.37 -10/21/2021,$119.33,34794950,$116.5,$119.68,$116.26 -10/20/2021,$116.39,34244810,$116.29,$118.3001,$115.421 -10/19/2021,$116.33,39593940,$116.16,$117.17,$114.47 -10/18/2021,$116.43,47537760,$111.9,$116.88,$111.37 -10/15/2021,$112.12,34203010,$112.505,$112.835,$111.11 -10/14/2021,$111.99,46900160,$110.5,$112.22,$109.6301 -10/13/2021,$109.16,55631920,$106.275,$109.88,$106.25 -10/12/2021,$105.04,34039910,$105.165,$106.04,$104.34 -10/11/2021,$104.68,31284390,$104.62,$107.2,$104.022 -10/08/2021,$105.06,30623050,$106.55,$107.28,$104.89 -10/07/2021,$106.45,41543110,$104.6,$107.95,$104.46 -10/06/2021,$103.64,39071700,$100.445,$103.72,$100.35 -10/05/2021,$101.81,31455250,$100.92,$102.8699,$100.6101 -10/04/2021,$100.34,41967150,$101.742,$101.85,$99.82 -10/01/2021,$102.45,41491590,$102.6,$103,$100.64 -09/30/2021,$102.9,57636700,$102.08,$104.44,$101.99 -09/29/2021,$100.35,52224720,$102.295,$102.66,$99.81 -09/28/2021,$101.52,74468970,$106.835,$107.65,$101.42 -09/27/2021,$108.16,51944350,$105.065,$108.44,$103.44 -09/24/2021,$105.8,26482610,$105.185,$106.0499,$104.68 -09/23/2021,$106.15,32816660,$104.89,$106.86,$103.89 -09/22/2021,$104.38,34126280,$102.815,$104.56,$102.21 -09/21/2021,$102.82,35481500,$102.15,$103.4299,$101.18 -09/20/2021,$101.55,45228410,$101.58,$102.51,$99.51 -09/17/2021,$103.88,44528340,$105.555,$105.98,$103.71 -09/16/2021,$106.22,38150270,$104.915,$106.75,$103.76 -09/15/2021,$105.6,37998940,$106,$106.32,$104.03 -09/14/2021,$105.73,40629530,$105.52,$106.82,$104.42 -09/13/2021,$104.8,37767790,$105.26,$105.28,$102.63 -09/10/2021,$105.2,32602290,$106.99,$106.9913,$104.98 -09/09/2021,$106.15,31857870,$106.56,$107.2953,$105.84 -09/08/2021,$106.17,43067910,$108.88,$109.3,$105.52 -09/07/2021,$109.15,28815230,$109.955,$110.58,$108.66 -09/03/2021,$109.92,42623780,$108.85,$111.17,$108.5 -09/02/2021,$109.2,40108760,$110.32,$110.88,$108.77 -09/01/2021,$109.99,38579560,$111.3,$111.85,$109.85 -08/31/2021,$110.72,49338960,$111.26,$111.26,$109.0343 -08/30/2021,$111.32,56130470,$112.61,$114.4899,$111.26 -08/27/2021,$111.4,61030010,$108.01,$111.78,$107.8 -08/26/2021,$107.27,51442550,$108.57,$109.2299,$106.84 -08/25/2021,$108.3,45485500,$108.13,$109.91,$107.45 -08/24/2021,$107.65,51239300,$109.45,$109.61,$107.28 -08/23/2021,$108.77,68835280,$105.295,$109.02,$104.86 -08/20/2021,$104.65,55227560,$104.32,$105.98,$103.99 -08/19/2021,$103.7,71117490,$103.315,$106.18,$101.975 -08/18/2021,$103.44,79387940,$107.35,$108.07,$103.27 -08/17/2021,$107.56,74053910,$106.644,$108.7,$105.35 -08/16/2021,$107.48,73398940,$110.2,$111.58,$105.865 -08/13/2021,$110.55,100135700,$107.17,$111.71,$106.57 -08/12/2021,$106.5,60625730,$107.39,$108.44,$105.86 -08/11/2021,$107.68,91788290,$107.6,$109.79,$105.62 -08/10/2021,$106.48,113012300,$107.895,$109.17,$104.36 -08/09/2021,$107.58,115749900,$111.31,$112.33,$107.06 -08/06/2021,$110.11,143899000,$110.55,$116.2599,$109.7 -08/05/2021,$112.35,137860900,$116.63,$117.68,$111.59 -08/04/2021,$118.77,225368700,$114.36,$122.49,$114.16 -08/03/2021,$112.56,157723100,$108.15,$114.85,$107.66 -08/02/2021,$108.63,115581900,$105.93,$110.33,$103.83 -07/30/2021,$106.19,125632000,$101.6,$106.97,$101.38 -07/29/2021,$102.95,164091800,$96.58,$105.74,$96.58 -07/28/2021,$97.93,140561000,$93.44,$98.71,$89.65 -07/27/2021,$91.03,69427020,$92.94,$94.1,$89.1 -07/26/2021,$91.82,27668460,$92.01,$92.75,$91.12 -07/23/2021,$92.15,31708900,$91.348,$92.37,$90.19 -07/22/2021,$91.21,33730080,$89.4,$91.36,$89.08 -07/21/2021,$89.41,29469860,$87.25,$89.49,$86.9 -07/20/2021,$87.11,28088960,$87.09,$87.77,$85.165 -07/19/2021,$86.58,39244800,$84.99,$87.2294,$84.24 -07/16/2021,$85.89,35860740,$87.32,$88.03,$85.68 -07/15/2021,$86.93,38944740,$89.78,$89.78,$86.1801 -07/14/2021,$89.05,28108510,$90.76,$91.395,$88.94 -07/13/2021,$90.26,30367600,$90.48,$91.41,$89.8299 -07/12/2021,$90.81,28526560,$91.22,$91.9,$89.65 -07/09/2021,$90.9,35278420,$90.04,$91.26,$88.53 -07/08/2021,$89.74,45673450,$87.86,$90.3399,$87.45 -07/07/2021,$90.54,51498480,$95.02,$95.44,$90.31 -07/06/2021,$94.47,44930120,$94.875,$95.41,$93.32 -07/02/2021,$94.7,51342980,$93.28,$95.27,$92.205 -07/01/2021,$93.31,58059020,$94.04,$94.175,$91.7 -06/30/2021,$93.93,70721530,$90.82,$94.335,$90.6 -06/29/2021,$89.52,46181000,$87.41,$90.3,$86.66 -06/28/2021,$87.08,30262040,$86.38,$88,$86.15 -06/25/2021,$85.62,27804540,$86.34,$86.36,$85.1 -06/24/2021,$86.1,42217670,$84.39,$87.1399,$84.365 -06/23/2021,$83.82,25992440,$83.83,$84.485,$83.1603 -06/22/2021,$83.58,32107700,$82.9,$84.04,$82.48 -06/21/2021,$82.59,44417110,$83.49,$84.19,$82.21 -06/18/2021,$84.65,58736810,$84.28,$85.77,$83.48 -06/17/2021,$84.56,77822820,$80.77,$85.37,$80.57 -06/16/2021,$80.11,29598310,$80.75,$81.45,$78.96 -06/15/2021,$80.47,26194340,$81.59,$81.68,$80.225 -06/14/2021,$81.55,27830240,$81.51,$81.55,$80.2 -06/11/2021,$81.31,24310890,$81.61,$82.33,$80.7 -06/10/2021,$81.56,28606360,$80.02,$81.71,$79.7 -06/09/2021,$79.96,28454650,$81.09,$81.677,$79.8 -06/08/2021,$80.89,26956630,$81.87,$82.645,$80.45 -06/07/2021,$81.35,29006780,$81.4,$81.68,$80.38 -06/04/2021,$81.58,26387800,$80.92,$82.19,$80.81 -06/03/2021,$80.28,29811970,$81.13,$81.89,$80.26 -06/02/2021,$81.97,35203220,$81,$82.6,$80.66 -06/01/2021,$80.81,43433040,$81.01,$82.91,$80.66 -05/28/2021,$80.08,40952660,$78.66,$81.09,$78.66 -05/27/2021,$78.42,35883220,$78.11,$78.43,$77.47 -05/26/2021,$78.34,30354000,$77.83,$78.59,$77.59 -05/25/2021,$77.86,47353100,$77.33,$78.77,$76.8365 -05/24/2021,$77.44,33194290,$77.26,$78.01,$76.8 -05/21/2021,$77.17,40201090,$78.55,$78.81,$77.04 -05/20/2021,$78.06,49135010,$76.81,$78.27,$76.25 -05/19/2021,$76.23,73966160,$73.16,$76.97,$72.76 -05/18/2021,$74.44,31982480,$74.74,$75.7699,$74.24 -05/17/2021,$74.65,40722380,$74.215,$75.52,$73.41 -05/14/2021,$74.59,38355790,$74.02,$75.0274,$72.72 -05/13/2021,$73.09,48646750,$75.21,$75.7,$72.5 -05/12/2021,$74.64,42531420,$75.09,$76.13,$74.16 -05/11/2021,$76.83,51008240,$73.57,$76.93,$72.75 -05/10/2021,$75.99,45134490,$78.2,$78.3,$75.92 -05/07/2021,$78.81,36954180,$78.75,$79.5718,$78.22 -05/06/2021,$77.89,38661330,$77.63,$78.0599,$76.47 -05/05/2021,$77.83,42310150,$79.05,$79.3,$77.36 -05/04/2021,$78.61,59194330,$77.95,$78.67,$77.04 -05/03/2021,$78.55,66323270,$81.97,$82,$78.46 -04/30/2021,$81.62,46601860,$82.97,$84.1,$81.415 -04/29/2021,$83.91,51294530,$84.7,$85.27,$82.63 -04/28/2021,$84.02,108920300,$88.85,$89.2,$83.92 -04/27/2021,$85.21,61909870,$85.67,$87.15,$85.13 -04/26/2021,$85.41,57594540,$83.35,$85.9,$82.7 -04/23/2021,$82.76,49267280,$80.21,$83.3,$79.96 -04/22/2021,$79.06,38846050,$81.61,$81.79,$78.59 -04/21/2021,$81.61,35068960,$78.99,$81.66,$78.86 -04/20/2021,$79.27,34977750,$80.82,$81.11,$78.51 -04/19/2021,$81.11,39115460,$82.13,$83.18,$80.39 -04/16/2021,$82.15,47280570,$83.3,$83.59,$81.53 -04/15/2021,$83.01,68942820,$80.32,$83.95,$79.97 -04/14/2021,$78.55,34263830,$79.88,$80.13,$77.935 -04/13/2021,$80.19,37767260,$79.67,$80.72,$78.98 -04/12/2021,$78.58,62098800,$82.055,$82.18,$78.03 -04/09/2021,$82.76,32759870,$82.8,$83.59,$82.16 -04/08/2021,$83.35,41925280,$83.32,$83.79,$82.435 -04/07/2021,$82.2,35590930,$81.32,$83.1,$80.35 -04/06/2021,$81.44,29327950,$81.21,$82.455,$80.88 -04/05/2021,$81.43,32610550,$81.74,$81.9,$80.39 -04/01/2021,$81.09,40182380,$80.155,$81.31,$79.48 -03/31/2021,$78.5,43659460,$76.57,$79.13,$76.52 -03/30/2021,$76,39169250,$76.47,$76.56,$74.85 -03/29/2021,$77.14,37144300,$77.03,$78.02,$76.26 -03/26/2021,$77.41,49148660,$76.62,$77.4995,$75.03 -03/25/2021,$76.22,44735100,$75.85,$76.95,$74.96 -03/24/2021,$76.48,43753640,$77.55,$78.8,$76.4 -03/23/2021,$78.38,40466640,$80.13,$80.34,$77.95 -03/22/2021,$80.3,39648610,$79.99,$81.265,$79.22 -03/19/2021,$79.06,42283390,$78.49,$79.34,$77.59 -03/18/2021,$78.12,51036500,$81.055,$81.62,$78.01 -03/17/2021,$82.63,43320570,$81.75,$83.25,$80.411 -03/16/2021,$82.75,42971550,$83.66,$84.75,$82.255 -03/15/2021,$82.5,39365420,$81.91,$83.39,$81.2 diff --git a/custom_imports/dashboards/futures.csv b/openbb_terminal/dashboards/voila/futures.csv similarity index 100% rename from custom_imports/dashboards/futures.csv rename to openbb_terminal/dashboards/voila/futures.csv diff --git a/openbb_terminal/dashboards/voila/futures.ipynb b/openbb_terminal/dashboards/voila/futures.ipynb index 375ca9da511..8266d107afb 100644 --- a/openbb_terminal/dashboards/voila/futures.ipynb +++ b/openbb_terminal/dashboards/voila/futures.ipynb @@ -18,7 +18,7 @@ "from IPython.display import display\n", "from pathlib import Path\n", "\n", - "from openbb_terminal.core.config.paths import REPOSITORY_DIRECTORY" + "from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY" ] }, { @@ -28,8 +28,9 @@ "metadata": {}, "outputs": [], "source": [ - "full_path = REPOSITORY_DIRECTORY / \"custom_imports\" / \"dashboards\" / \"futures.csv\"\n", - "df = pd.read_csv(full_path)\n", + "df = pd.read_csv(\"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\"]" ] }, @@ -312,7 +313,7 @@ }, "vscode": { "interpreter": { - "hash": "ab0e87f2bc73919b75956d1b3e303320699d53da895be1bb46287d7dc67c6497" + "hash": "811a8ebb02a69a0058b89c341233bddbf2d95a877272f2a215e4ccb65781d230" } } }, diff --git a/openbb_terminal/forecast/forecast_controller.py b/openbb_terminal/forecast/forecast_controller.py index 8d6f9561d1c..cfe953260c9 100644 --- a/openbb_terminal/forecast/forecast_controller.py +++ b/openbb_terminal/forecast/forecast_controller.py @@ -5,7 +5,6 @@ __docformat__ = "numpy" import argparse import logging -from itertools import chain from typing import Any, Optional, List, Dict try: @@ -32,6 +31,10 @@ except ModuleNotFoundError: import pandas as pd import psutil +from openbb_terminal.core.config.paths import ( + USER_EXPORTS_DIRECTORY, + USER_CUSTOM_IMPORTS_DIRECTORY, +) from openbb_terminal import feature_flags as obbff from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end @@ -65,10 +68,6 @@ from openbb_terminal.forecast import ( trans_view, nhits_view, ) -from openbb_terminal.core.config.paths import ( - USER_EXPORTS_DIRECTORY, - USER_CUSTOM_IMPORTS_DIRECTORY, -) logger = logging.getLogger(__name__) empty_df = pd.DataFrame() @@ -183,16 +182,8 @@ class ForecastController(BaseController): "mod": "%", "pow": "**", } - self.file_types = ["csv", "xlsx"] - self.DATA_FILES = { - filepath.name: filepath - for file_type in self.file_types - for filepath in chain( - USER_EXPORTS_DIRECTORY.rglob(f"*.{file_type}"), - USER_CUSTOM_IMPORTS_DIRECTORY.rglob(f"*.{file_type}"), - ) - if filepath.is_file() - } + self.file_types = forecast_model.base_file_types + self.DATA_FILES = forecast_model.default_files # setting device on GPU if available, else CPU self.device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/openbb_terminal/forecast/forecast_model.py b/openbb_terminal/forecast/forecast_model.py index 78536fdf7db..db162698935 100644 --- a/openbb_terminal/forecast/forecast_model.py +++ b/openbb_terminal/forecast/forecast_model.py @@ -12,19 +12,23 @@ import pandas as pd from pandas import DataFrame import numpy as np -from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console +from openbb_terminal.core.config.paths import ( + USER_EXPORTS_DIRECTORY, + USER_CUSTOM_IMPORTS_DIRECTORY, +) logger = logging.getLogger(__name__) +base_file_types = ["csv", "xlsx"] default_files = { filepath.name: filepath - for file_type in ["csv", "xlsx"] + for file_type in base_file_types for filepath in chain( - (MISCELLANEOUS_DIRECTORY / "exports").rglob(f"*.{file_type}"), - Path("custom_imports").rglob(f"*.{file_type}"), + USER_EXPORTS_DIRECTORY.rglob(f"*.{file_type}"), + USER_CUSTOM_IMPORTS_DIRECTORY.rglob(f"*.{file_type}"), ) if filepath.is_file() } diff --git a/tests/openbb_terminal/stocks/test_stocks_helper.py b/tests/openbb_terminal/stocks/test_stocks_helper.py index 97d9482bc73..ed405dc60b7 100644 --- a/tests/openbb_terminal/stocks/test_stocks_helper.py +++ b/tests/openbb_terminal/stocks/test_stocks_helper.py @@ -3,12 +3,10 @@ from datetime import datetime import os # IMPORTATION THIRDPARTY -import pandas as pd import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks import stocks_helper -from openbb_terminal.core.config.paths import REPOSITORY_DIRECTORY from openbb_terminal import helper_funcs @@ -104,16 +102,6 @@ def test_load_week_or_month(recorder, weekly, monthly): recorder.capture(result_df) -@pytest.mark.vcr -@pytest.mark.record_stdout -@pytest.mark.parametrize( - "path", - ["none", REPOSITORY_DIRECTORY / "custom_imports" / "stocks" / "test.csv"], -) -def test_load_custom_output(path): - stocks_helper.load_custom(path) - - @pytest.mark.vcr @pytest.mark.record_stdout @pytest.mark.parametrize( @@ -124,16 +112,6 @@ def test_load_custom_output_wrong_path(path): stocks_helper.load_custom(path) -@pytest.mark.vcr -@pytest.mark.parametrize( - "path", - [REPOSITORY_DIRECTORY / "custom_imports" / "stocks" / "test.csv"], -) -def test_load_custom_output_df(path): - df = stocks_helper.load_custom(path) - assert isinstance(df, pd.DataFrame) - - @pytest.mark.default_cassette("test_display_candle") @pytest.mark.vcr @pytest.mark.parametrize( diff --git a/website/content/terminal/forecast/_index.md b/website/content/terminal/forecast/_index.md index 378a6ab88af..a201da7c9f1 100644 --- a/website/content/terminal/forecast/_index.md +++ b/website/content/terminal/forecast/_index.md @@ -17,7 +17,7 @@ The Forecast menu is called upon by typing `forecast` which opens the following ## How to Use -To begin any machine learning, you must first load in data. The menu supports importing both terminal datasets found in `stocks` and `cryptocurrency`, along with external datasets in the form of `.csv` that can be placed in the following location: `.../OpenBBTerminal/custom_imports/forecast/` +To begin any machine learning, you must first load in data. The menu supports importing both terminal datasets found in `stocks` and `cryptocurrency`, along with external datasets in the form of `.csv` that can be placed in the following location: `~/OpenBBUserData/custom_imports/forecast/` It is important to note, if you ever have troubles on running a command, please read the help commands to guide you on what is available. You can do this by trailing any command with a `-h`