mns-scheduler 1.2.5.6__py3-none-any.whl → 1.2.5.8__py3-none-any.whl

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/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/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/self_choose/ths_self_choose_service.py

@@ -100,11 +100,17 @@ def add_trade_stocks():
     str_day = now_date.strftime('%Y-%m-%d')
     last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
     query = {"$and": [{"str_day": {"$gte": last_trade_day}}, {"str_day": {"$lte": str_day}}]}
-    trade_stocks_df = mongodb_util.find_query_data(db_name_constant.POSITION_STOCK, query)
-    ths_cookie = get_ths_cookie()
+
+    position_stock_df = mongodb_util.find_query_data(db_name_constant.POSITION_STOCK, query)
+    if data_frame_util.is_not_empty(position_stock_df):
+        stock_list = set(position_stock_df['symbol'])
+    trade_stocks_df = mongodb_util.find_query_data(db_name_constant.BUY_STOCK_NAME, query)
     if data_frame_util.is_not_empty(trade_stocks_df):
-        for stock_one in trade_stocks_df.itertuples():
-            ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
+        stock_list = stock_list.union(set(trade_stocks_df['symbol']))
+    ths_cookie = get_ths_cookie()
+    if len(stock_list) > 0:
+        for symbol in stock_list:
+            ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
 
 
 # 添加连板到自选

{mns_scheduler-1.2.5.6.dist-info → mns_scheduler-1.2.5.8.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.5.6
+Version: 1.2.5.8
 

{mns_scheduler-1.2.5.6.dist-info → mns_scheduler-1.2.5.8.dist-info}/RECORD

@@ -69,8 +69,8 @@ mns_scheduler/k_line/clean/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlI
 mns_scheduler/k_line/clean/k_line_info_clean_impl.py,sha256=2GgRc9Nb9wXMueoZhl9egYzjQP_NPhBCvj-XYcTlG9w,1238
 mns_scheduler/k_line/clean/k_line_info_clean_task.py,sha256=ey6xTXAxxXh8_8cPzsWmUtVmG8Sd7jXFbpRpTrFrLDo,7622
 mns_scheduler/k_line/clean/daily/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py,sha256=lT_KOhph9qLQGBoy7THU7SuPLQLQQlaNzTf2cMKnnNY,18404
-mns_scheduler/k_line/clean/daily/daily_k_line_service.py,sha256=BOzE5smjgJyUPdNvV4CUmN2phHT1VCtusosq7uhrGCw,6654
+mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py,sha256=12-anWppIsmcWBRqSuCjm-JMI5K7Jk_JUTLIT09yalI,20031
+mns_scheduler/k_line/clean/daily/daily_k_line_service.py,sha256=JthnjPjo_h_CnuGw1xsXvFc-bqUL5Zp81BLZb3YhU5A,6904
 mns_scheduler/k_line/clean/week_month/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py,sha256=4qInTtReDd77Jzb7ngme8yXHRd6INSbSCq84lhS3ScI,4862
 mns_scheduler/k_line/clean/week_month/sub_new_week_month_k_line_service.py,sha256=BS5wouEZhz4WfqubDgjO2CcfmYonCFqRl1BOPnVN3r8,5518
@@ -80,7 +80,7 @@ mns_scheduler/k_line/sync/__init__.py,sha256=ffZXFCLFdIwOsbxnw__u1MbQYh9yz7Bs8UM
 mns_scheduler/k_line/sync/bfq_k_line_sync.py,sha256=i2NNdp4uVa-kiqQvOaY6odd8-DmQtlejeMXeVklKOIs,4067
 mns_scheduler/k_line/sync/daily_week_month_line_sync.py,sha256=SHAvMkDW-2TKEC4wWkMdiOQWa4Ktc0Umm59OlceK1dg,5795
 mns_scheduler/k_line/test/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/k_line/test/k_line_info_clean_his_data.py,sha256=6_KKdFSRdkA9LnkkCc72Y1ILKdLY-VuKvMlHBetSSU8,1173
+mns_scheduler/k_line/test/k_line_info_clean_his_data.py,sha256=akzfDKilyvfqZ2pwn_gmpp9iVsFH1lhst85EIUax8As,1234
 mns_scheduler/kpl/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/index/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
@@ -112,7 +112,7 @@ mns_scheduler/risk/test/fix_blask_list.py,sha256=zfUUZl-RrvSCUJPIBdj27cDt3xmz8sx
 mns_scheduler/risk/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mns_scheduler/risk/transactions/transactions_check_api.py,sha256=4NzdWgLmGPlzE7EgnicYmK115ThFN8O5_APlb2ZF2Do,6890
 mns_scheduler/self_choose/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/self_choose/ths_self_choose_service.py,sha256=chx5l-b-gsHk61A9qnWJe5UnBnfoGQwj5dCabg4bfGM,6281
+mns_scheduler/self_choose/ths_self_choose_service.py,sha256=IC2FVHr2-IEG2GVo-uZBiheQlOswK-DqB_rCzDM_U2U,6558
 mns_scheduler/trade/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/auto_ipo_buy_api.py,sha256=jVe5ZiXwzkDy_j_4X4rUamSzJpmzhV16lNKwbeWgpQw,386
 mns_scheduler/trade/auto_sell_service_api.py,sha256=b-4xmW6W6cd6dMuLPD7ZJu3tUtchMcUG-p7wOMm_RRY,4640
@@ -152,7 +152,7 @@ mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=Sy39T-yFwLSIIoSZqQzS-6-W
 mns_scheduler/zt/zt_pool/update_null_zt_reason_api.py,sha256=1uoiR2Uw46kDfjkvNg2US5rd_4OIkYO3872gIJOufUY,2135
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/zz_task/data_sync_task.py,sha256=LZqcTIx4X9jNE_rTF3RxDzzD2X_xe7lTM7GtG_hV_fQ,22685
-mns_scheduler-1.2.5.6.dist-info/METADATA,sha256=Gk1t67NKezkNOFI97_SkzqC7F-R3N_lCHjo6-ELE6D0,64
-mns_scheduler-1.2.5.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mns_scheduler-1.2.5.6.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.2.5.6.dist-info/RECORD,,
+mns_scheduler-1.2.5.8.dist-info/METADATA,sha256=nRCh0bLPj9Ysch1Ct73XVBFZh1_XUIlfmaKwve2dJFM,64
+mns_scheduler-1.2.5.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mns_scheduler-1.2.5.8.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.2.5.8.dist-info/RECORD,,