From 7ef76ebcb24e016eee30bec5e2b056b168d3d00b Mon Sep 17 00:00:00 2001 From: CTai Date: Mon, 7 Mar 2022 18:15:59 +0800 Subject: [PATCH 1/3] [949] - Remove argument internal in BaseRun::download_data. --- scripts/data_collector/base.py | 1 - scripts/data_collector/crypto/collector.py | 3 +-- scripts/data_collector/fund/collector.py | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/data_collector/base.py b/scripts/data_collector/base.py index 04d3ba35c1..e018c0ef64 100644 --- a/scripts/data_collector/base.py +++ b/scripts/data_collector/base.py @@ -357,7 +357,6 @@ def download_data( delay=0, start=None, end=None, - interval="1d", check_data_length: int = None, limit_nums=None, ): diff --git a/scripts/data_collector/crypto/collector.py b/scripts/data_collector/crypto/collector.py index d74fd90e92..267845bc9c 100644 --- a/scripts/data_collector/crypto/collector.py +++ b/scripts/data_collector/crypto/collector.py @@ -226,7 +226,6 @@ def download_data( delay=0, start=None, end=None, - interval="1d", check_data_length: int = None, limit_nums=None, ): @@ -255,7 +254,7 @@ def download_data( $ python collector.py download_data --source_dir ~/.qlib/crypto_data/source/1d --start 2015-01-01 --end 2021-11-30 --delay 1 --interval 1d """ - super(Run, self).download_data(max_collector_count, delay, start, end, interval, check_data_length, limit_nums) + super(Run, self).download_data(max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums) def normalize_data(self, date_field_name: str = "date", symbol_field_name: str = "symbol"): """normalize data diff --git a/scripts/data_collector/fund/collector.py b/scripts/data_collector/fund/collector.py index 18942893b7..c1f89b7cb7 100644 --- a/scripts/data_collector/fund/collector.py +++ b/scripts/data_collector/fund/collector.py @@ -253,7 +253,6 @@ def download_data( delay=0, start=None, end=None, - interval="1d", check_data_length: int = None, limit_nums=None, ): @@ -282,7 +281,7 @@ def download_data( $ python collector.py download_data --source_dir ~/.qlib/fund_data/source/cn_data --region CN --start 2020-11-01 --end 2020-11-10 --delay 0.1 --interval 1d """ - super(Run, self).download_data(max_collector_count, delay, start, end, interval, check_data_length, limit_nums) + super(Run, self).download_data(max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums) def normalize_data(self, date_field_name: str = "date", symbol_field_name: str = "symbol"): """normalize data From 777bd1fea4001ad51093adfe18fb67d6f910d717 Mon Sep 17 00:00:00 2001 From: CTai Date: Mon, 7 Mar 2022 18:28:43 +0800 Subject: [PATCH 2/3] Fix black. --- scripts/data_collector/crypto/collector.py | 4 +++- scripts/data_collector/fund/collector.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/data_collector/crypto/collector.py b/scripts/data_collector/crypto/collector.py index 267845bc9c..8a66b372c7 100644 --- a/scripts/data_collector/crypto/collector.py +++ b/scripts/data_collector/crypto/collector.py @@ -254,7 +254,9 @@ def download_data( $ python collector.py download_data --source_dir ~/.qlib/crypto_data/source/1d --start 2015-01-01 --end 2021-11-30 --delay 1 --interval 1d """ - super(Run, self).download_data(max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums) + super(Run, self).download_data( + max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums + ) def normalize_data(self, date_field_name: str = "date", symbol_field_name: str = "symbol"): """normalize data diff --git a/scripts/data_collector/fund/collector.py b/scripts/data_collector/fund/collector.py index c1f89b7cb7..36b2491e1a 100644 --- a/scripts/data_collector/fund/collector.py +++ b/scripts/data_collector/fund/collector.py @@ -281,7 +281,9 @@ def download_data( $ python collector.py download_data --source_dir ~/.qlib/fund_data/source/cn_data --region CN --start 2020-11-01 --end 2020-11-10 --delay 0.1 --interval 1d """ - super(Run, self).download_data(max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums) + super(Run, self).download_data( + max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums + ) def normalize_data(self, date_field_name: str = "date", symbol_field_name: str = "symbol"): """normalize data From 72b0f031457bc03b76a3861a34ebd402c9b14667 Mon Sep 17 00:00:00 2001 From: CTai Date: Mon, 7 Mar 2022 18:31:58 +0800 Subject: [PATCH 3/3] Fix bug. --- scripts/data_collector/base.py | 2 +- scripts/data_collector/crypto/collector.py | 4 +--- scripts/data_collector/fund/collector.py | 4 +--- scripts/data_collector/yahoo/collector.py | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/scripts/data_collector/base.py b/scripts/data_collector/base.py index e018c0ef64..18d8955f7c 100644 --- a/scripts/data_collector/base.py +++ b/scripts/data_collector/base.py @@ -395,7 +395,7 @@ def download_data( delay=delay, start=start, end=end, - interval=interval, + interval=self.interval, check_data_length=check_data_length, limit_nums=limit_nums, ).collector_data() diff --git a/scripts/data_collector/crypto/collector.py b/scripts/data_collector/crypto/collector.py index 8a66b372c7..0790aa6405 100644 --- a/scripts/data_collector/crypto/collector.py +++ b/scripts/data_collector/crypto/collector.py @@ -254,9 +254,7 @@ def download_data( $ python collector.py download_data --source_dir ~/.qlib/crypto_data/source/1d --start 2015-01-01 --end 2021-11-30 --delay 1 --interval 1d """ - super(Run, self).download_data( - max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums - ) + super(Run, self).download_data(max_collector_count, delay, start, end, check_data_length, limit_nums) def normalize_data(self, date_field_name: str = "date", symbol_field_name: str = "symbol"): """normalize data diff --git a/scripts/data_collector/fund/collector.py b/scripts/data_collector/fund/collector.py index 36b2491e1a..9d6c82c815 100644 --- a/scripts/data_collector/fund/collector.py +++ b/scripts/data_collector/fund/collector.py @@ -281,9 +281,7 @@ def download_data( $ python collector.py download_data --source_dir ~/.qlib/fund_data/source/cn_data --region CN --start 2020-11-01 --end 2020-11-10 --delay 0.1 --interval 1d """ - super(Run, self).download_data( - max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums - ) + super(Run, self).download_data(max_collector_count, delay, start, end, check_data_length, limit_nums) def normalize_data(self, date_field_name: str = "date", symbol_field_name: str = "symbol"): """normalize data diff --git a/scripts/data_collector/yahoo/collector.py b/scripts/data_collector/yahoo/collector.py index 55141c94e3..35cd7b6e96 100644 --- a/scripts/data_collector/yahoo/collector.py +++ b/scripts/data_collector/yahoo/collector.py @@ -900,9 +900,7 @@ def download_data( # get 1m data $ python collector.py download_data --source_dir ~/.qlib/stock_data/source --region CN --start 2020-11-01 --end 2020-11-10 --delay 0.1 --interval 1m """ - super(Run, self).download_data( - max_collector_count, delay, start, end, self.interval, check_data_length, limit_nums - ) + super(Run, self).download_data(max_collector_count, delay, start, end, check_data_length, limit_nums) def normalize_data( self,