From 5a51fecbdee26fe6e238cf424a559dcd5ecd3b97 Mon Sep 17 00:00:00 2001
From: jingboyitiji <jingboyitiji@admin.com>
Date: Fri, 28 Mar 2025 11:18:39 +0800
Subject: [PATCH] =?UTF-8?q?eta=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main_juxiting.py | 25 +++++++++++++------------
main_juxiting_yuedu.py | 25 +++++++++++++------------
main_juxiting_zhoudu.py | 25 +++++++++++++------------
main_yuanyou.py | 25 +++++++++++++------------
main_yuanyou_yuedu.py | 25 +++++++++++++------------
main_yuanyou_zhoudu.py | 26 ++++++++++++++------------
6 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/main_juxiting.py b/main_juxiting.py
index a6371e9..2e50c57 100644
--- a/main_juxiting.py
+++ b/main_juxiting.py
@@ -117,20 +117,21 @@ def predict_main():
None
"""
end_time = global_config['end_time']
+ signature = BinanceAPI(APPID, SECRET)
+ etadata = EtaReader(signature=signature,
+ classifylisturl=global_config['classifylisturl'],
+ classifyidlisturl=global_config['classifyidlisturl'],
+ edbcodedataurl=global_config['edbcodedataurl'],
+ edbcodelist=global_config['edbcodelist'],
+ edbdatapushurl=global_config['edbdatapushurl'],
+ edbdeleteurl=global_config['edbdeleteurl'],
+ edbbusinessurl=global_config['edbbusinessurl'],
+ classifyId=global_config['ClassifyId'],
+ )
# 获取数据
if is_eta:
logger.info('从eta获取数据...')
- signature = BinanceAPI(APPID, SECRET)
- etadata = EtaReader(signature=signature,
- classifylisturl=global_config['classifylisturl'],
- classifyidlisturl=global_config['classifyidlisturl'],
- edbcodedataurl=global_config['edbcodedataurl'],
- edbcodelist=global_config['edbcodelist'],
- edbdatapushurl=global_config['edbdatapushurl'],
- edbdeleteurl=global_config['edbdeleteurl'],
- edbbusinessurl=global_config['edbbusinessurl'],
- classifyId=global_config['ClassifyId'],
- )
+
df_zhibiaoshuju, df_zhibiaoliebiao = etadata.get_eta_api_pp_data(
data_set=data_set, dataset=dataset) # 原始数据，未处理
@@ -330,7 +331,7 @@ def predict_main():
test_size=global_config['test_size'],
settings=global_config['settings'],
now=now,
- etadata=global_config['etadata'],
+ etadata=etadata,
modelsindex=global_config['modelsindex'],
data=data,
is_eta=global_config['is_eta'],
diff --git a/main_juxiting_yuedu.py b/main_juxiting_yuedu.py
index cd7ff96..18fa96e 100644
--- a/main_juxiting_yuedu.py
+++ b/main_juxiting_yuedu.py
@@ -117,20 +117,21 @@ def predict_main():
None
"""
end_time = global_config['end_time']
+ signature = BinanceAPI(APPID, SECRET)
+ etadata = EtaReader(signature=signature,
+ classifylisturl=global_config['classifylisturl'],
+ classifyidlisturl=global_config['classifyidlisturl'],
+ edbcodedataurl=global_config['edbcodedataurl'],
+ edbcodelist=global_config['edbcodelist'],
+ edbdatapushurl=global_config['edbdatapushurl'],
+ edbdeleteurl=global_config['edbdeleteurl'],
+ edbbusinessurl=global_config['edbbusinessurl'],
+ classifyId=global_config['ClassifyId'],
+ )
# 获取数据
if is_eta:
logger.info('从eta获取数据...')
- signature = BinanceAPI(APPID, SECRET)
- etadata = EtaReader(signature=signature,
- classifylisturl=global_config['classifylisturl'],
- classifyidlisturl=global_config['classifyidlisturl'],
- edbcodedataurl=global_config['edbcodedataurl'],
- edbcodelist=global_config['edbcodelist'],
- edbdatapushurl=global_config['edbdatapushurl'],
- edbdeleteurl=global_config['edbdeleteurl'],
- edbbusinessurl=global_config['edbbusinessurl'],
- classifyId=global_config['ClassifyId'],
- )
+
df_zhibiaoshuju, df_zhibiaoliebiao = etadata.get_eta_api_pp_data(
data_set=data_set, dataset=dataset) # 原始数据，未处理
@@ -330,7 +331,7 @@ def predict_main():
test_size=global_config['test_size'],
settings=global_config['settings'],
now=now,
- etadata=global_config['etadata'],
+ etadata=etadata,
modelsindex=global_config['modelsindex'],
data=data,
is_eta=global_config['is_eta'],
diff --git a/main_juxiting_zhoudu.py b/main_juxiting_zhoudu.py
index 92844e9..8fbe322 100644
--- a/main_juxiting_zhoudu.py
+++ b/main_juxiting_zhoudu.py
@@ -117,20 +117,21 @@ def predict_main():
None
"""
end_time = global_config['end_time']
+ signature = BinanceAPI(APPID, SECRET)
+ etadata = EtaReader(signature=signature,
+ classifylisturl=global_config['classifylisturl'],
+ classifyidlisturl=global_config['classifyidlisturl'],
+ edbcodedataurl=global_config['edbcodedataurl'],
+ edbcodelist=global_config['edbcodelist'],
+ edbdatapushurl=global_config['edbdatapushurl'],
+ edbdeleteurl=global_config['edbdeleteurl'],
+ edbbusinessurl=global_config['edbbusinessurl'],
+ classifyId=global_config['ClassifyId'],
+ )
# 获取数据
if is_eta:
logger.info('从eta获取数据...')
- signature = BinanceAPI(APPID, SECRET)
- etadata = EtaReader(signature=signature,
- classifylisturl=global_config['classifylisturl'],
- classifyidlisturl=global_config['classifyidlisturl'],
- edbcodedataurl=global_config['edbcodedataurl'],
- edbcodelist=global_config['edbcodelist'],
- edbdatapushurl=global_config['edbdatapushurl'],
- edbdeleteurl=global_config['edbdeleteurl'],
- edbbusinessurl=global_config['edbbusinessurl'],
- classifyId=global_config['ClassifyId'],
- )
+
df_zhibiaoshuju, df_zhibiaoliebiao = etadata.get_eta_api_pp_data(
data_set=data_set, dataset=dataset) # 原始数据，未处理
@@ -330,7 +331,7 @@ def predict_main():
test_size=global_config['test_size'],
settings=global_config['settings'],
now=now,
- etadata=global_config['etadata'],
+ etadata=etadata,
modelsindex=global_config['modelsindex'],
data=data,
is_eta=global_config['is_eta'],
diff --git a/main_yuanyou.py b/main_yuanyou.py
index e158092..2f9e4ef 100644
--- a/main_yuanyou.py
+++ b/main_yuanyou.py
@@ -120,20 +120,21 @@ def predict_main():
None
"""
end_time = global_config['end_time']
+ signature = BinanceAPI(APPID, SECRET)
+ etadata = EtaReader(signature=signature,
+ classifylisturl=global_config['classifylisturl'],
+ classifyidlisturl=global_config['classifyidlisturl'],
+ edbcodedataurl=global_config['edbcodedataurl'],
+ edbcodelist=global_config['edbcodelist'],
+ edbdatapushurl=global_config['edbdatapushurl'],
+ edbdeleteurl=global_config['edbdeleteurl'],
+ edbbusinessurl=global_config['edbbusinessurl'],
+ classifyId=global_config['ClassifyId'],
+ )
# 获取数据
if is_eta:
logger.info('从eta获取数据...')
- signature = BinanceAPI(APPID, SECRET)
- etadata = EtaReader(signature=signature,
- classifylisturl=global_config['classifylisturl'],
- classifyidlisturl=global_config['classifyidlisturl'],
- edbcodedataurl=global_config['edbcodedataurl'],
- edbcodelist=global_config['edbcodelist'],
- edbdatapushurl=global_config['edbdatapushurl'],
- edbdeleteurl=global_config['edbdeleteurl'],
- edbbusinessurl=global_config['edbbusinessurl'],
- classifyId=global_config['ClassifyId'],
- )
+
df_zhibiaoshuju, df_zhibiaoliebiao = etadata.get_eta_api_yuanyou_data(
data_set=data_set, dataset=dataset) # 原始数据，未处理
@@ -333,7 +334,7 @@ def predict_main():
test_size=global_config['test_size'],
settings=global_config['settings'],
now=now,
- etadata=global_config['etadata'],
+ etadata=etadata,
modelsindex=global_config['modelsindex'],
data=data,
is_eta=global_config['is_eta'],
diff --git a/main_yuanyou_yuedu.py b/main_yuanyou_yuedu.py
index ba468a8..9b57366 100644
--- a/main_yuanyou_yuedu.py
+++ b/main_yuanyou_yuedu.py
@@ -189,20 +189,21 @@ def predict_main():
None
"""
end_time = global_config['end_time']
+ signature = BinanceAPI(APPID, SECRET)
+ etadata = EtaReader(signature=signature,
+ classifylisturl=global_config['classifylisturl'],
+ classifyidlisturl=global_config['classifyidlisturl'],
+ edbcodedataurl=global_config['edbcodedataurl'],
+ edbcodelist=global_config['edbcodelist'],
+ edbdatapushurl=global_config['edbdatapushurl'],
+ edbdeleteurl=global_config['edbdeleteurl'],
+ edbbusinessurl=global_config['edbbusinessurl'],
+ classifyId=global_config['ClassifyId'],
+ )
# 获取数据
if is_eta:
logger.info('从eta获取数据...')
- signature = BinanceAPI(APPID, SECRET)
- etadata = EtaReader(signature=signature,
- classifylisturl=global_config['classifylisturl'],
- classifyidlisturl=global_config['classifyidlisturl'],
- edbcodedataurl=global_config['edbcodedataurl'],
- edbcodelist=global_config['edbcodelist'],
- edbdatapushurl=global_config['edbdatapushurl'],
- edbdeleteurl=global_config['edbdeleteurl'],
- edbbusinessurl=global_config['edbbusinessurl'],
- classifyId=global_config['ClassifyId'],
- )
+
df_zhibiaoshuju, df_zhibiaoliebiao = etadata.get_eta_api_yuanyou_data(
data_set=data_set, dataset=dataset) # 原始数据，未处理
@@ -402,7 +403,7 @@ def predict_main():
test_size=global_config['test_size'],
settings=global_config['settings'],
now=now,
- etadata=global_config['etadata'],
+ etadata=etadata,
modelsindex=global_config['modelsindex'],
data=data,
is_eta=global_config['is_eta'],
diff --git a/main_yuanyou_zhoudu.py b/main_yuanyou_zhoudu.py
index a131597..6d38deb 100644
--- a/main_yuanyou_zhoudu.py
+++ b/main_yuanyou_zhoudu.py
@@ -173,20 +173,22 @@ def predict_main():
None
"""
end_time = global_config['end_time']
+
+ signature = BinanceAPI(APPID, SECRET)
+ etadata = EtaReader(signature=signature,
+ classifylisturl=global_config['classifylisturl'],
+ classifyidlisturl=global_config['classifyidlisturl'],
+ edbcodedataurl=global_config['edbcodedataurl'],
+ edbcodelist=global_config['edbcodelist'],
+ edbdatapushurl=global_config['edbdatapushurl'],
+ edbdeleteurl=global_config['edbdeleteurl'],
+ edbbusinessurl=global_config['edbbusinessurl'],
+ classifyId=global_config['ClassifyId'],
+ )
# 获取数据
if is_eta:
logger.info('从eta获取数据...')
- signature = BinanceAPI(APPID, SECRET)
- etadata = EtaReader(signature=signature,
- classifylisturl=global_config['classifylisturl'],
- classifyidlisturl=global_config['classifyidlisturl'],
- edbcodedataurl=global_config['edbcodedataurl'],
- edbcodelist=global_config['edbcodelist'],
- edbdatapushurl=global_config['edbdatapushurl'],
- edbdeleteurl=global_config['edbdeleteurl'],
- edbbusinessurl=global_config['edbbusinessurl'],
- classifyId=global_config['ClassifyId'],
- )
+
df_zhibiaoshuju, df_zhibiaoliebiao = etadata.get_eta_api_yuanyou_data(
data_set=data_set, dataset=dataset) # 原始数据，未处理
@@ -386,7 +388,7 @@ def predict_main():
test_size=global_config['test_size'],
settings=global_config['settings'],
now=now,
- etadata=global_config['etadata'],
+ etadata=etadata,
modelsindex=global_config['modelsindex'],
data=data,
is_eta=global_config['is_eta'],