#79 reformatted files and removed stuff done twice

requirements.txt

@@ -1,2 +1,3 @@
 aiohttp
-python-dotenv
+python-dotenv
+streamlit

src/bullets/runner.py

@@ -1,5 +1,4 @@
 import csv
-import os
 from datetime import datetime, timedelta
 from bullets.portfolio.transaction import Status
 from bullets.strategy import Strategy
@@ -11,12 +10,11 @@
 import os.path as osp
 import json
 
+
 class Runner:
-    def __init__(self, strategy: Strategy, logdir: str = None):
+    def __init__(self, strategy: Strategy):
         self.strategy = strategy
-        self.logdir = logdir
         self.holidays = None
-        self.stats = {}
 
     def start(self):
         """
@@ -35,8 +33,7 @@ def start(self):
         self.strategy.on_finish()
         logger.info("=========== Backtest complete ===========")
         self._save_backtest_log()
-        if not self.logdir is None:
-            self._save_final_stats()
+        self._open_viewer_app()
 
     def _get_moments(self, resolution: Resolution, start_time: datetime, end_time: datetime):
         moments = []
@@ -105,19 +102,8 @@ def _update_final_timestamp(self):
                 final_timestamp = transaction.timestamp
         self.strategy.update_time(final_timestamp)
 
-    def _save_final_stats(self):
-        self.stats['profit'] = self.strategy.portfolio.cash_balance - self.strategy.starting_balance
-        self.stats['final_balance'] = self.strategy.portfolio.cash_balance
-
-        LOG_REPO = "../log" #TODO : put in env file
-        print(os.getcwd())
-        try:
-            os.mkdir(osp.join(LOG_REPO, self.logdir))
-        except OSError as error:
-            print(error)
-
-        #TODO : add a temporary csv format save so the report can be handled with excel as well
-        with open(osp.join(LOG_REPO,self.logdir,'strategy_report.json'), 'w') as fp:
-            json.dump(self.stats, fp, indent=4)
-        print("Log file successfully saved under {}".format(osp.join(LOG_REPO, self.logdir)))
-        return 0
+    def _open_viewer_app(self):
+        # TODO : Open the viewer app and make it visualise the data stored in the files
+        #        (see _save_stats_to_csv & _save_transactions_to_cvs)
+        #
+        output_folder = self.strategy.output_folder

src/bullets/viewer/__init__.py

@@ -0,0 +1 @@
+from bullets.viewer import *

src/bullets/viewer/graphs/basic_charts.py

@@ -1,9 +1,10 @@
 import plotly.graph_objects as go
 
+
 def candle_chart(df):
     fig = go.Figure(data=[go.Candlestick(x=df['Date'],
                                          open=df['Open'],
                                          high=df['High'],
                                          low=df['Low'],
                                          close=df['Close'])])
-    return fig
+    return fig

src/bullets/viewer/processing/dataloader.py

@@ -2,21 +2,23 @@
 from glob import glob
 import pandas as pd
 
+
 def list_log_files(path_to_log):
-    print(glob(path_to_log + "/*", recursive = True))
+    print(glob(path_to_log + "/*", recursive=True))
     log_dict = {}
-    paths_to_directories = glob(path_to_log + "/*", recursive = True)
+    paths_to_directories = glob(path_to_log + "/*", recursive=True)
     for path in paths_to_directories:
-        if osp.isfile(osp.join(path,'strategy_log.json')):
+        if osp.isfile(osp.join(path, 'strategy_log.json')):
             print(osp.basename(path))
             log_dict[osp.basename(path)] = path
-        elif len(glob(osp.join(path) + "/*", recursive = True))!=0 :
+        elif len(glob(osp.join(path) + "/*", recursive=True)) != 0:
             log_dict.update(list_log_files(path))
-        else :
+        else:
             return {}
     print(log_dict)
     return log_dict
 
+
 def load_strategy(path_to_log):
-    data = pd.read_csv(osp.join(path_to_log,"stock_1.csv"))
-    return data
+    data = pd.read_csv(osp.join(path_to_log, "stock_1.csv"))
+    return data

src/bullets/viewer/viewer_app.py

@@ -2,11 +2,10 @@
 from processing.dataloader import *
 from graphs.basic_charts import *
 
-#CONSTANTS TO FETCH FROM CONFIG FILE
+# CONSTANTS TO FETCH FROM CONFIG FILE
 PATH_TO_LOG = "../../../log/"
 
-
-if 'loaded' not in st.session_state.keys() or st.session_state["loaded"]==False:
+if 'loaded' not in st.session_state.keys() or st.session_state["loaded"] == False:
     file_dict = list_log_files(PATH_TO_LOG)
     st.session_state['file_dict'] = file_dict
     st.session_state['loaded'] = False
@@ -15,8 +14,7 @@
 selected_file = st.selectbox("Select a log file", file_dict.keys())
 is_selected = st.button("Load log file")
 
-
-if is_selected :
+if is_selected:
 
     st.markdown("# Analysing {}".format(selected_file))
     st.markdown("---")
@@ -30,6 +28,5 @@
 
     st.sidebar.markdown("Nice sidebar")
 
-
     st.dataframe(data)
-    st.plotly_chart(candle_chart(data))
+    st.plotly_chart(candle_chart(data))