From 05ec5c5e54fddd0b8a071bb181d922a9499c7794 Mon Sep 17 00:00:00 2001 From: robcaulk Date: Fri, 5 Aug 2022 12:19:29 +0200 Subject: [PATCH] generalize database url path for any db type --- freqtrade/freqai/data_kitchen.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/freqtrade/freqai/data_kitchen.py b/freqtrade/freqai/data_kitchen.py index 1dfae3ef1..3b128b7c7 100644 --- a/freqtrade/freqai/data_kitchen.py +++ b/freqtrade/freqai/data_kitchen.py @@ -87,9 +87,13 @@ class FreqaiDataKitchen: ) if self.live: - db_url = self.config.get('db_url', 'sqlite://') - self.database_path = '' if db_url == 'sqlite://' else str(db_url).split('///')[1] - self.trade_database_df: DataFrame = pd.DataFrame() + db_url = self.config.get('db_url', 'None') + self.database_path = Path(db_url) + self.database_name = self.database_path.parts[-1] + else: + self.database_path = Path('None') + + self.trade_database_df: DataFrame = pd.DataFrame() self.data['extra_returns_per_train'] = self.freqai_config.get('extra_returns_per_train', {}) self.thread_count = self.freqai_config.get("data_kitchen_thread_count", -1) @@ -1038,11 +1042,11 @@ class FreqaiDataKitchen: def get_current_trade_database(self) -> None: - if self.database_path == '': - logger.warning('No trade databse found. Skipping analysis.') + if str(self.database_path) == 'None': + logger.warning('No trade database found. Skipping analysis.') return - data = sqlite3.connect(self.database_path) + data = sqlite3.connect(self.database_name) query = data.execute("SELECT * From trades") cols = [column[0] for column in query.description] df = pd.DataFrame.from_records(data=query.fetchall(), columns=cols)