mns-scheduler 1.3.3.0__tar.gz → 1.3.3.1__tar.gz

{mns-scheduler-1.3.3.0 → mns-scheduler-1.3.3.1}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.3.0
+Version: 1.3.3.1

{mns-scheduler-1.3.3.0 → mns-scheduler-1.3.3.1}/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-1.3.3.0 → mns-scheduler-1.3.3.1}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.3.0
+Version: 1.3.3.1

{mns-scheduler-1.3.3.0 → mns-scheduler-1.3.3.1}/setup.py

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