mns-scheduler 1.2.5.7__tar.gz → 1.2.5.8__tar.gz

{mns_scheduler-1.2.5.7 → mns_scheduler-1.2.5.8}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.5.7
+Version: 1.2.5.8

{mns_scheduler-1.2.5.7 → mns_scheduler-1.2.5.8}/mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py

@@ -85,6 +85,12 @@ def init_day_line_data(k_line_info, stock_qfq_daily):
     k_line_info.loc[:, 'avg_thirty_last'] = 0
     k_line_info.loc[:, 'avg_sixty_last'] = 0
 
+    k_line_info.loc[:, 'slop_five_last'] = 0
+    k_line_info.loc[:, 'slop_ten_last'] = 0
+    k_line_info.loc[:, 'slop_twenty_last'] = 0
+    k_line_info.loc[:, 'slop_thirty_last'] = 0
+    k_line_info.loc[:, 'slop_sixty_last'] = 0
+
     k_line_info.loc[:, 'std_amount_ten'] = 0
     k_line_info.loc[:, 'mean_amount_ten'] = 0
     k_line_info.loc[:, 'std_amount_thirty'] = 0
@@ -219,6 +225,9 @@ def calculate_exchange_and_k_line_avg_param(stock_qfq_daily):
         100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_sixty']) / stock_qfq_daily['avg_sixty'],
         2)
 
+    # 计算均线斜率
+    stock_qfq_daily = calculate_slope(stock_qfq_daily, windows=['five', 'ten', 'twenty', 'thirty', 'sixty'])
+
     stock_qfq_daily = stock_qfq_daily[[
         "symbol",
         "name",
@@ -255,6 +264,11 @@ def calculate_exchange_and_k_line_avg_param(stock_qfq_daily):
         "avg_twenty",
         'avg_thirty',
         'avg_sixty',
+        "slope_five",
+        "slope_ten",
+        "slope_twenty",
+        'slope_thirty',
+        'slope_sixty',
         "classification",
         "_id",
         "date"
@@ -265,6 +279,32 @@ def calculate_exchange_and_k_line_avg_param(stock_qfq_daily):
     return stock_qfq_daily
 
 
+def fix_avg_slope_name(k_line_info, stock_qfq_daily):
+    stock_qfq_daily_one = stock_qfq_daily.iloc[0:1]
+    k_line_info['slope_five_last'] = stock_qfq_daily_one['slope_five']
+    k_line_info['slope_ten_last'] = stock_qfq_daily_one['slope_ten']
+    k_line_info['slope_twenty_last'] = stock_qfq_daily_one['slope_twenty']
+    k_line_info['slope_thirty_last'] = stock_qfq_daily_one['slope_thirty']
+    k_line_info['slope_sixty_last'] = stock_qfq_daily_one['slope_sixty']
+    return k_line_info
+
+
+# 计算均线
+def calculate_moving_averages(data, windows=['five', 'ten', 'twenty', 'thirty', 'sixty']):
+    for window in windows:
+        data[f'avg_{window}', window] = data['close'].rolling(window=window).mean()
+    return data
+
+
+# 计算均线斜率
+def calculate_slope(data, windows=['five', 'ten', 'twenty', 'thirty', 'sixty']):
+    for window in windows:
+        data[f'slope_{window}'] = data[f'avg_{window}'].diff() / data[f'avg_{window}'].shift(1)
+        data[f'slope_{window}'] = data[f'slope_{window}'] * 100
+        data[f'slope_{window}'] = round(data[f'slope_{window}'], 2)
+    return data
+
+
 # 设置当天k线形态 下一个交易日判断当前交易日k线形态
 def set_k_line_patterns(stock_qfq_daily_one):
     open = list(stock_qfq_daily_one['open'])[0]
@@ -305,7 +345,7 @@ def set_history_list(stock_qfq_daily_one, stock_qfq_daily):
         'low'
     ]]
     # 删除index 转str
-    stock_qfq_daily_one.loc[:, 'history_data'] = stock_qfq_daily.to_string(index=False)
+    # stock_qfq_daily_one.loc[:, 'history_data'] = stock_qfq_daily.to_string(index=False)
 
     daily_num = stock_qfq_daily.shape[0]
     std_amount_ten = 0
@@ -386,7 +426,7 @@ def k_line_field_fix_name(k_line_info, stock_qfq_daily_one):
     k_line_info['std_amount_sixty'] = stock_qfq_daily_one['std_amount_sixty']
     k_line_info['mean_amount_sixty'] = stock_qfq_daily_one['mean_amount_sixty']
     k_line_info['k_line_pattern'] = stock_qfq_daily_one['k_line_pattern']
-    k_line_info['history_data'] = stock_qfq_daily_one['history_data']
+    # k_line_info['history_data'] = stock_qfq_daily_one['history_data']
 
     return k_line_info
 

{mns_scheduler-1.2.5.7 → mns_scheduler-1.2.5.8}/mns_scheduler/k_line/clean/daily/daily_k_line_service.py

@@ -71,6 +71,9 @@ def handle_day_line_sub_new(k_line_info, str_day, symbol, deal_days):
     # 排除最近有三板以上的股票 todo
     # 计算最近热门大涨的股票
     recent_hot_stocks_clean_service.calculate_recent_hot_stocks(stock_qfq_daily, symbol, str_day)
+    # 修改 avg name
+    k_line_info = daily_k_line_clean_common_service.fix_avg_slope_name(k_line_info, stock_qfq_daily)
+
     return k_line_info
 
 
@@ -107,7 +110,8 @@ def handle_day_line_normal(k_line_info, str_day, symbol, deal_days):
     # 排除最近有三板以上的股票 todo
     # 计算最近热门大涨的股票
     recent_hot_stocks_clean_service.calculate_recent_hot_stocks(stock_qfq_daily, symbol, str_day)
-
+    # 修改 avg name
+    k_line_info = daily_k_line_clean_common_service.fix_avg_slope_name(k_line_info, stock_qfq_daily)
     return k_line_info
 
 # if __name__ == '__main__':

{mns_scheduler-1.2.5.7 → mns_scheduler-1.2.5.8}/mns_scheduler/k_line/test/k_line_info_clean_his_data.py

@@ -26,5 +26,7 @@ def clean_history_data():
 
 if __name__ == '__main__':
     # 001389  001359
-    k_line_info_clean_task.sync_k_line_info('2025-01-22', ['301099'])
+    k_line_info_clean_task.sync_k_line_info('2025-02-14', None)
+    k_line_info_clean_task.sync_k_line_info('2025-02-17', None)
+
     # clean_history_data()

{mns_scheduler-1.2.5.7 → mns_scheduler-1.2.5.8}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.5.7
+Version: 1.2.5.8

{mns_scheduler-1.2.5.7 → mns_scheduler-1.2.5.8}/setup.py

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