mns-scheduler 1.3.3.0__py3-none-any.whl → 1.3.3.2__py3-none-any.whl

mns_scheduler/k_line/common/k_line_common_api.py

@@ -18,6 +18,7 @@ import mns_common.api.msg.push_msg_api as push_msg_api
 import numpy as np
 import mns_common.utils.data_frame_util as data_frame_util
 from loguru import logger
+import threading
 
 # source_type = 'xue_qiu'
 source_type = 'xue_qiu'
@@ -29,14 +30,57 @@ def custom_alert(current: int, threshold: int):
     push_msg_api.push_msg_to_wechat('获取k线数据异常', "当前次数:" + str(current) + "阈值:" + str(threshold))
 
 
+# 定义一个带超时的函数调用
+def call_with_timeout(func, *args, timeout=10, **kwargs):
+    # 用于存储函数执行结果
+    result = None
+    exception = None
+
+    # 定义一个线程目标函数
+    def target():
+        nonlocal result, exception
+        try:
+            result = func(*args, **kwargs)
+        except Exception as e:
+            exception = e
+
+    # 创建线程并启动
+    thread = threading.Thread(target=target)
+    thread.start()
+
+    # 等待线程完成，最多等待 timeout 秒
+    thread.join(timeout)
+
+    # 如果线程仍然存活，说明函数超时了
+    if thread.is_alive():
+        raise TimeoutError(f"Function exceeded timeout of {timeout} seconds")
+
+    # 如果函数抛出了异常，重新抛出
+    if exception is not None:
+        raise exception
+    return result
+
+
 def get_k_line_common_adapter(symbol, period, hq, end_date):
     global error_no
     df = pd.DataFrame()
     try:
         if source_type == 'em':
-            df = get_em_k_line_api(symbol, period, hq, end_date)
+
+            df = call_with_timeout(get_em_k_line_api,
+                                   symbol,
+                                   period,
+                                   hq,
+                                   end_date,
+                                   timeout=10)
         elif source_type == 'xue_qiu':
-            df = get_xueqiu_k_line_api(symbol, period, hq, end_date)
+            df = call_with_timeout(get_xueqiu_k_line_api,
+                                   symbol,
+                                   period,
+                                   hq,
+                                   end_date,
+                                   timeout=10)
+
         if data_frame_util.is_empty(df):
             error_no = error_no + 1
     except BaseException as e:

mns_scheduler/zz_task/data_sync_task.py

@@ -184,7 +184,11 @@ def generate_new_day_k_line_info():
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     # 生成下一个交易日日期k线数据 number=2 获取下一个交易日 日期
-    next_trade_day = trade_date_common_service_api.get_further_trade_date(str_day, 2)
+    if trade_date_common_service_api.is_trade_day(str_day):
+        dis_number = 2
+    else:
+        dis_number = 1
+    next_trade_day = trade_date_common_service_api.get_further_trade_date(str_day, dis_number)
     k_line_info_clean_service.sync_k_line_info_task(next_trade_day)
     logger.info('计算当日k线信息完成:{}', str_day)
 
@@ -562,8 +566,7 @@ blockingScheduler.add_job(sync_all_kpl_plate_info, 'interval', minutes=5, max_in
 # blockingScheduler.add_job(sync_company_announce, 'cron', hour='07,18,23', minute='33')
 
 print('定时任务启动成功')
-blockingScheduler.start()
-#
-# if __name__ == '__main__':
+# blockingScheduler.start()
 #
-#     sync_daily_data_info()
+if __name__ == '__main__':
+    generate_new_day_k_line_info()

{mns_scheduler-1.3.3.0.dist-info → mns_scheduler-1.3.3.2.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.3.0
+Version: 1.3.3.2
 

{mns_scheduler-1.3.3.0.dist-info → mns_scheduler-1.3.3.2.dist-info}/RECORD

@@ -79,7 +79,7 @@ mns_scheduler/k_line/clean/week_month/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3
 mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py,sha256=n2osY8dozHClIlSOE7NR6S_oK_8GV-z72Az13D3fhCQ,10160
 mns_scheduler/k_line/clean/week_month/sub_new_week_month_k_line_service.py,sha256=0rc2Rz_EoqoqpVvgPe4daCe09JtHBlJsQr1bMIlBQ2o,5526
 mns_scheduler/k_line/common/__init__.py,sha256=itoGlqKhsx7EVXQoD1vchDKQ5GPB16vDjofTSuQtrXg,161
-mns_scheduler/k_line/common/k_line_common_api.py,sha256=J8TUT2FYayZfHGvavmuS0KEwjQUoKaKa63Oy0VgV0Zc,5813
+mns_scheduler/k_line/common/k_line_common_api.py,sha256=9ep7-NyI_x2a1onTlmPg-R4VNx3yZ-IBQuhu1HgcBbM,7120
 mns_scheduler/k_line/hot_stocks/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/k_line/hot_stocks/recent_hot_stocks_clean_service.py,sha256=8woZzGVORYX9KZr6xtfiYYgApDKissnzYM6hS2k6XBA,2628
 mns_scheduler/k_line/month_week_daily/__init__.py,sha256=ffZXFCLFdIwOsbxnw__u1MbQYh9yz7Bs8UMP6VF0X2M,161
@@ -155,8 +155,8 @@ mns_scheduler/zt/zt_pool/em_zt_pool_sync_api.py,sha256=LOEUyTA5g7N6FWxUpHWimWTeX
 mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=9Sv1G88poLG3_8aLPkfr8bdwD_AzbSrwvHTGPErOtQU,7501
 mns_scheduler/zt/zt_pool/update_null_zt_reason_api.py,sha256=caW-MuF0RFLavJZafeLDYQ29-GxwGsmr5YVrN4lost8,2135
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=18MI6OyWS97LvD_fj717St3gfJC4NNrA1lyKn_OteHc,23150
-mns_scheduler-1.3.3.0.dist-info/METADATA,sha256=AHf5D8KBtq3mGvcxGJAhZfjxonQcjAqfWyOJM4_L6G0,64
-mns_scheduler-1.3.3.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_scheduler-1.3.3.0.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.3.3.0.dist-info/RECORD,,
+mns_scheduler/zz_task/data_sync_task.py,sha256=a5N2w2nW88ce_4mvtirqI22ure_kQYqMecExm-EUT3w,23282
+mns_scheduler-1.3.3.2.dist-info/METADATA,sha256=LGOD9tcHJ6CTKNn1y7JZCb_OhEf2zBtChVS4o6LNr6M,64
+mns_scheduler-1.3.3.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_scheduler-1.3.3.2.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.3.3.2.dist-info/RECORD,,