mns-scheduler 1.3.3.4__tar.gz → 1.3.3.7__tar.gz

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.3.4
+Version: 1.3.3.7

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py

@@ -23,7 +23,7 @@ mongodb_util = MongodbUtil('27017')
 
 def sync_all_em_stock_info():
     logger.info("同步东方财富a,etf,kzz,us,hk,信息开始")
-    proxy_ip = proxy_common_api.generate_proxy_ip(5)
+    proxy_ip = proxy_common_api.generate_proxy_ip_api(5)
     proxies = {"https": proxy_ip}
     try:
         # 这里需要使用详情接口 获取全量数据

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/mns_scheduler/db/script/sync/remote_data_sync_to_local.py

@@ -54,7 +54,7 @@ def remote_data():
 
 
 def sync_open_data():
-    query = {"$and": [{'trade_date': {"$gte": "2022-03-16"}}, {'trade_date': {"$lte": "2025-01-01"}}]}
+    query = {"$and": [{'trade_date': {"$gte": "2025-03-21"}}, {'trade_date': {"$lte": "2025-04-02"}}]}
     trade_date_list_df = remote_mongodb_util.find_query_data('trade_date_list', query)
     trade_date_list_df = trade_date_list_df.sort_values(by=['trade_date'], ascending=False)
     for trade_date_one in trade_date_list_df.itertuples():
@@ -62,14 +62,15 @@ def sync_open_data():
             trade_date = trade_date_one.trade_date
             query_01 = {"str_day": trade_date}
             realtime_quotes_now_open_df = remote_mongodb_util.find_query_data('realtime_quotes_now_open', query_01)
-            # del realtime_quotes_now_open_df['ths_concept_list']
+            if 'ths_concept_list' in realtime_quotes_now_open_df.columns:
+                del realtime_quotes_now_open_df['ths_concept_list']
             local_mongodb_util.insert_mongo(realtime_quotes_now_open_df, 'realtime_quotes_now_open')
-            logger.error("同步到:{}", trade_date)
+            logger.info("同步到:{}", trade_date)
         except BaseException as e:
             logger.error("同步异常:{}", e)
     return trade_date_list_df
 
 
 if __name__ == '__main__':
-    call_auction_data_df = local_mongodb_util.find_all_data('call_auction_data')
-    remote_mongodb_util.insert_mongo(call_auction_data_df, 'call_auction_data_01')
+    sync_open_data()
+    # remote_data()

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/mns_scheduler/db/script/sync/sync_hui_ce_test_data.py

@@ -37,8 +37,7 @@ def sync_k_line(str_day):
 
 if __name__ == '__main__':
 
-    str_day_01 = '2025-02-27'
-    sync_real_time_data(str_day_01, 1, 2000)
+    str_day_01 = '2025-06-25'
     sync_k_line(str_day_01)
     # sync_k_line(str_day_01)
     # sync_k_line('2024-11-13')

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/mns_scheduler/trade/auto_login/trader_auto_service.py

@@ -8,7 +8,7 @@ sys.path.append(project_path)
 import mns_common.component.deal.deal_service_api as deal_service_api
 from mns_common.component.deal.terminal_enum import TerminalEnum
 import time
-
+from loguru import logger
 
 # qmt 自动登录
 def qmt_auto_login():
@@ -21,9 +21,11 @@ def ths_auto_login():
 
 
 def auto_login():
-    qmt_auto_login()
-    time.sleep(5)
+    logger.info("打开ths下单程序")
     ths_auto_login()
+    time.sleep(5)
+    logger.info("打开qmt下单程序")
+    qmt_auto_login()
 
 
 if __name__ == '__main__':

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/mns_scheduler/trade/task/trader_task_service.py

@@ -11,23 +11,28 @@ import mns_scheduler.trade.auto_login.trader_auto_service as trader_auto_service
 import mns_common.utils.data_frame_util as data_frame_util
 from loguru import logger
 
-# 交易任务
-TRADER_SERVER_PATH = 'H:\\mns-trader.bat'
+# 交易服务端
+TRADER_SERVER_PATH = 'H:\\mns_trader_server.bat'
 # 实时行情同步任务 python名称
-TRADER_SERVER_NAME = "mns-trader"
+TRADER_SERVER_NAME = "mns_trader_server"
 
 
 # 打开交易客户端
 def open_trader_terminal():
-    # 打开任务进程
+    # 打开 [交易web服务端]
+    logger.info('打开 [交易web服务端]')
     cmd_util.open_bat_file(TRADER_SERVER_PATH)
-    # 自动登陆
+    time.sleep(10)
+    logger.info('自动登陆ths和qmt')
+    # 自动登陆ths和qmt
     trader_auto_service.auto_login()
     time.sleep(5)
-    # 需先打开同花顺终端在开始交易服务
+    # 杀死[交易web服务端]，使用同花顺需要先打开xiadan.exe，在重新打开[交易web服务端]
+    logger.info('杀死[交易web服务端]')
     kill_server()
     time.sleep(5)
-    # 打开任务进程
+    logger.info('重新打开 [交易web服务端]')
+    # 重新打开 [交易web服务端]
     cmd_util.open_bat_file(TRADER_SERVER_PATH)
 
 
@@ -45,4 +50,5 @@ def kill_server():
 
 
 if __name__ == '__main__':
+    # kill_server()
     open_trader_terminal()

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/mns_scheduler/zz_task/data_sync_task.py

@@ -61,7 +61,6 @@ import mns_scheduler.zt.zt_pool.update_null_zt_reason_api as update_null_zt_reas
 import mns_scheduler.trade.tfp.stock_tfp_info_sync as stock_tfp_info_sync
 import mns_scheduler.industry.ths.ths_industry_sync_service as ths_industry_sync_service
 import mns_scheduler.k_line.year_quarter.year_quarter_line_sync as year_quarter_line_sync
-import mns_common.component.task.real_time_data_sync_check as real_time_data_sync_check
 
 
 # 同步交易日期任务完成
@@ -357,16 +356,16 @@ def sync_all_interactive_questions():
         stock_irm_cninfo_service.sync_all_interactive_questions(None)
 
 
-# 重开定时任务同步
-def real_time_sync_task_open():
-    logger.info("开启实时行情同步任务")
-    real_time_data_sync_check.real_time_sync_task_open()
+# # 重开定时任务同步
+# def real_time_sync_task_open():
+#     logger.info("开启实时行情同步任务")
+#     real_time_data_sync_check.real_time_sync_task_open()
 
-
-# 关闭实时行情任务
-def real_time_sync_task_close():
-    logger.info("关闭实时行情同步任务")
-    real_time_data_sync_check.real_time_sync_task_close()
+#
+# # 关闭实时行情任务
+# def real_time_sync_task_close():
+#     logger.info("关闭实时行情同步任务")
+#     real_time_data_sync_check.real_time_sync_task_close()
 
 
 # 打开交易客户端
@@ -456,6 +455,9 @@ blockingScheduler.add_job(update_one_symbol_all_concepts, 'cron', hour='07,08,18
 # 打开交易客户端
 blockingScheduler.add_job(trader_client_auto_login, 'cron', hour='08,09', minute='04')
 
+# 获取当前持仓
+blockingScheduler.add_job(sync_position, 'cron', hour='0,08,09', minute='14')
+
 # 同步公司基本信息
 blockingScheduler.add_job(update_company_base_info, 'cron', hour='08,18', minute='05')
 
@@ -477,26 +479,12 @@ blockingScheduler.add_job(self_choose_stock_task, 'cron', hour='08,17,21', minut
 # 开盘前同步同花顺新概念指数
 blockingScheduler.add_job(sync_new_concept_index, 'cron', hour='09,22', minute='01,10,20,28,41,58')
 
-# 获取同花顺持仓
-blockingScheduler.add_job(sync_position, 'cron', hour='0,08,09', minute='14')
-
 # 更新同花顺概念信息
 blockingScheduler.add_job(concept_info_clean, 'cron', hour='9,12,20', minute='24')
 
 # 更新开盘啦指数关系
 blockingScheduler.add_job(update_best_choose_plate_relation, 'cron', hour='09,18', minute='25')
 
-# 打开实时行情任务同步
-
-blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='09', minute='15')
-blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='09', minute='29')
-blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='12', minute='59')
-# 关闭实时行情任务
-
-blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='09', minute='28')
-blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='11', minute='31')
-blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='15', minute='01')
-
 # 自动打新 打新中签高时间段 10:30-11:30
 blockingScheduler.add_job(auto_ipo_buy, 'cron', hour='10', minute='40,50')
 

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.3.4
+Version: 1.3.3.7

{mns-scheduler-1.3.3.4 → mns-scheduler-1.3.3.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns-scheduler',
-    version='1.3.3.4',
+    version='1.3.3.7',
     packages=find_packages(),
     install_requires=[],  # 如果有依赖项，可以在这里列出
 )