mns-scheduler 1.2.6.1__tar.gz → 1.2.6.2__tar.gz

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.6.1
+Version: 1.2.6.2

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py

@@ -85,11 +85,11 @@ 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[:, 'slope_five_last'] = 0
+    k_line_info.loc[:, 'slope_ten_last'] = 0
+    k_line_info.loc[:, 'slope_twenty_last'] = 0
+    k_line_info.loc[:, 'slope_thirty_last'] = 0
+    k_line_info.loc[:, 'slope_sixty_last'] = 0
 
     k_line_info.loc[:, 'std_amount_ten'] = 0
     k_line_info.loc[:, 'mean_amount_ten'] = 0
@@ -224,9 +224,13 @@ def calculate_exchange_and_k_line_avg_param(stock_qfq_daily):
     stock_qfq_daily['close_difference_sixty'] = round(
         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'])
+    if (('slope_' + 'five' not in stock_qfq_daily.columns)
+            or ('slope_' + 'ten' not in stock_qfq_daily.columns) \
+            or ('slope_' + 'twenty' not in stock_qfq_daily.columns) \
+            or ('slope_' + 'thirty' not in stock_qfq_daily.columns) \
+            or ('slope_' + 'sixty' not in stock_qfq_daily.columns)):
+        # 计算均线斜率
+        stock_qfq_daily = calculate_slope(stock_qfq_daily, windows=['five', 'ten', 'twenty', 'thirty', 'sixty'])
 
     stock_qfq_daily = stock_qfq_daily[[
         "symbol",
@@ -299,6 +303,8 @@ def calculate_moving_averages(data, windows=['five', 'ten', 'twenty', 'thirty',
 # 计算均线斜率
 def calculate_slope(data, windows=['five', 'ten', 'twenty', 'thirty', 'sixty']):
     for window in windows:
+        if 'slope_' + window in data.columns:
+            continue
         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)

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/mns_scheduler/k_line/clean/daily/daily_k_line_service.py

@@ -114,6 +114,7 @@ def handle_day_line_normal(k_line_info, str_day, symbol, deal_days):
     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__':
 #     query1 = {"symbol": '301596', 'date': {"$lte": date_handle_util.no_slash_date('2024-05-31')}}
 #     stock_qfq_daily_301596 = mongodb_util.descend_query(query1, 'stock_qfq_daily', 'date', 15)

mns_scheduler-1.2.6.2/mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py

@@ -0,0 +1,179 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+from mns_common.db.MongodbUtil import MongodbUtil
+import mns_common.utils.date_handle_util as date_handle_util
+from mns_common.component.classify.symbol_classify_param import stock_type_classify_param
+import mns_common.utils.data_frame_util as data_frame_util
+
+mongodb_util = MongodbUtil('27017')
+
+
+# 处理月线 周线 todo 暂时简单计算周线之和
+def handle_month_week_line(k_line_info, str_day, symbol, deal_days):
+    sub_stock_new_max_deal_days = stock_type_classify_param['sub_new_stock_max_deal_days']
+    if deal_days > sub_stock_new_max_deal_days:
+        k_line_info['last_year_chg'] = 0
+        k_line_info['now_year_chg'] = 0
+        k_line_info = handle_month_line(k_line_info, str_day, symbol)
+        k_line_info = handle_week_line(k_line_info, str_day, symbol)
+
+    else:
+        k_line_info['week01'] = 0
+        k_line_info['week02'] = 0
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+        k_line_info['sum_week'] = 0
+        k_line_info['week_num'] = 0
+        k_line_info['week_last_day'] = '19890729'
+
+        k_line_info['sum_month'] = 0
+        k_line_info['month_num'] = 0
+        k_line_info['month01'] = 0
+        k_line_info['month02'] = 0
+        k_line_info['month01_date'] = '19890729'
+        k_line_info['month02_date'] = '19890729'
+
+        k_line_info['last_year_chg'] = 0
+        k_line_info['now_year_chg'] = 0
+
+    return k_line_info
+
+
+# 处理月线
+def handle_month_line(k_line_info, str_day, symbol):
+    now_year = int(str_day[0:4])
+    last_year = str(now_year - 1)
+
+    now_month_begin_day = str_day[0:7] + '-01'
+
+    now_month = str_day[5:7]
+    # 前两个月
+    before_two_month = int(now_month) - 2
+
+    before_two_month_begin_day = str(now_year) + str(before_two_month) + '01'
+
+    last_year_begin_day = last_year + '-01-01'
+    now_year_begin_day = str(now_year) + '-01-01'
+
+    query = {"symbol": symbol,
+             'date': {"$gte": date_handle_util.no_slash_date(last_year_begin_day)}}
+    stock_hfq_monthly_all = mongodb_util.find_query_data('stock_qfq_monthly', query)
+    if data_frame_util.is_empty(stock_hfq_monthly_all):
+        k_line_info['sum_month'] = 0
+
+    else:
+        stock_hfq_monthly_all = stock_hfq_monthly_all.sort_values(by=['date'], ascending=False)
+        stock_hfq_monthly_all = stock_hfq_monthly_all.loc[
+            stock_hfq_monthly_all['date'] <= date_handle_util.no_slash_date(now_month_begin_day)]
+
+        stock_hfq_monthly_last_year = stock_hfq_monthly_all.loc[
+            stock_hfq_monthly_all['date'] < date_handle_util.no_slash_date(now_year_begin_day)]
+
+        stock_hfq_monthly_now_year = stock_hfq_monthly_all.loc[
+            stock_hfq_monthly_all['date'] > date_handle_util.no_slash_date(now_year_begin_day)]
+
+        # 最近两个月k线
+        before_two_month_stock_hfq_monthly = stock_hfq_monthly_now_year.loc[
+            stock_hfq_monthly_now_year['date'] > before_two_month_begin_day]
+        month_num = before_two_month_stock_hfq_monthly.shape[0]
+        k_line_info['month_num'] = month_num
+
+        if month_num == 0:
+            k_line_info['sum_month'] = 0
+            k_line_info['month01'] = 0
+            k_line_info['month02'] = 0
+            k_line_info['month01_date'] = '19890729'
+            k_line_info['month02_date'] = '19890729'
+        elif month_num == 1:
+            k_line_info['month01'] = before_two_month_stock_hfq_monthly.iloc[0].chg
+            k_line_info['month02'] = 0
+            k_line_info['month01_date'] = before_two_month_stock_hfq_monthly.iloc[0].date
+            k_line_info['month02_date'] = '19890729'
+            k_line_info['sum_month'] = before_two_month_stock_hfq_monthly.iloc[0].chg
+        elif month_num == 2:
+            k_line_info['month01'] = before_two_month_stock_hfq_monthly.iloc[0].chg
+            k_line_info['month02'] = before_two_month_stock_hfq_monthly.iloc[1].chg
+            k_line_info['month01_date'] = before_two_month_stock_hfq_monthly.iloc[0].date
+            k_line_info['month02_date'] = before_two_month_stock_hfq_monthly.iloc[1].date
+            close_price = before_two_month_stock_hfq_monthly.iloc[0].close
+            open_price = before_two_month_stock_hfq_monthly.iloc[1].last_price
+            sum_chg = round((close_price - open_price) * 100 / open_price, 2)
+            k_line_info['sum_month'] = sum_chg
+
+        last_year_month_number = stock_hfq_monthly_last_year.shape[0]
+        if last_year_month_number == 0:
+            k_line_info['last_year_chg'] = 0
+        elif last_year_month_number == 1:
+            k_line_info['last_year_chg'] = stock_hfq_monthly_last_year.iloc[0].chg
+        else:
+            close_price = stock_hfq_monthly_last_year.iloc[0].close
+            open_price = stock_hfq_monthly_last_year.iloc[last_year_month_number - 1].last_price
+            last_year_chg = round((close_price - open_price) * 100 / open_price, 2)
+            k_line_info['last_year_chg'] = last_year_chg
+
+        now_year_month_number = stock_hfq_monthly_now_year.shape[0]
+        if now_year_month_number == 0:
+            k_line_info['now_year_chg'] = 0
+        elif now_year_month_number == 1:
+            k_line_info['now_year_chg'] = stock_hfq_monthly_now_year.iloc[0].chg
+        else:
+            close_price = stock_hfq_monthly_now_year.iloc[0].close
+            open_price = stock_hfq_monthly_now_year.iloc[now_year_month_number - 1].last_price
+            last_year_chg = round((close_price - open_price) * 100 / open_price, 2)
+            k_line_info['now_year_chg'] = last_year_chg
+
+    return k_line_info
+
+
+# 处理周线
+def handle_week_line(k_line_info, str_day, symbol):
+    month_begin_day = str_day[0:7] + '-01'
+    query = {"symbol": symbol,
+             '$and': [{'date': {"$gte": date_handle_util.no_slash_date(month_begin_day)}},
+                      {'date': {"$lt": date_handle_util.no_slash_date(str_day)}}]}
+    stock_hfq_weekly = mongodb_util.find_query_data('stock_qfq_weekly', query)
+    week_num = stock_hfq_weekly.shape[0]
+    if week_num > 0:
+        stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
+        k_line_info['sum_week'] = round(sum(stock_hfq_weekly['chg']), 2)
+    else:
+        k_line_info['sum_week'] = 0
+    k_line_info['week_num'] = week_num
+    if week_num == 1:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = 0
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+    elif week_num == 2:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+    elif week_num == 3:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
+        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
+        k_line_info['week04'] = 0
+    elif week_num >= 4:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
+        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
+        k_line_info['week04'] = stock_hfq_weekly.iloc[3].chg
+    elif week_num == 0:
+        k_line_info['week01'] = 0
+        k_line_info['week02'] = 0
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+        k_line_info['week_last_day'] = month_begin_day
+        k_line_info['sum_week'] = 0
+        return k_line_info
+    stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
+    stock_hfq_weekly_last = stock_hfq_weekly.iloc[0:1]
+    k_line_info['week_last_day'] = list(stock_hfq_weekly_last['date'])[0]
+
+    return k_line_info

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/mns_scheduler/k_line/sync/daily_week_month_line_sync.py

@@ -105,8 +105,9 @@ def create_db_index(db_name):
 
 
 if __name__ == '__main__':
-    sync_all_daily_data('daily', 'qfq', 'stock_qfq_daily', None, None)
-    sync_all_daily_data('daily', 'qfq', 'stock_qfq_weekly', None, None)
+    sync_all_daily_data('monthly', 'qfq', 'stock_qfq_monthly', None, None)
+    # sync_all_daily_data('daily', 'qfq', 'stock_qfq_daily', None, None)
+    # sync_all_daily_data('daily', 'qfq', 'stock_qfq_weekly', None, None)
     # sync_all_daily_data('weekly', 'qfq', 'stock_qfq_weekly', None, None)
     # sync_all_daily_data('monthly', 'qfq', 'stock_qfq_monthly', None, None)
 

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/mns_scheduler/k_line/test/k_line_info_clean_his_data.py

@@ -13,7 +13,7 @@ mongodb_util = MongodbUtil('27017')
 
 
 def clean_history_data():
-    query = {"$and": [{"trade_date": {"$gte": '2023-11-06'}}, {"trade_date": {"$lte": '2025-01-23'}}]}
+    query = {"$and": [{"trade_date": {"$gte": '2023-11-06'}}, {"trade_date": {"$lte": '2024-12-19'}}]}
     trade_date_list_df = 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_data_one in trade_date_list_df.itertuples():
@@ -25,6 +25,9 @@ def clean_history_data():
 
 
 if __name__ == '__main__':
+    k_line_info_clean_task.sync_k_line_info('2025-02-14', None)
+    k_line_info_clean_task.sync_k_line_info('2024-12-19', ['600992'])
+
     clean_history_data()
     # 001389  001359
     k_line_info_clean_task.sync_k_line_info('2025-02-14', None)

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -104,6 +104,8 @@ def add_trade_stocks():
     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'])
+    else:
+        stock_list = set([])
     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):
         stock_list = stock_list.union(set(trade_stocks_df['symbol']))

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.6.1
+Version: 1.2.6.2

{mns_scheduler-1.2.6.1 → mns_scheduler-1.2.6.2}/setup.py

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

mns_scheduler-1.2.6.1/mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py

@@ -1,117 +0,0 @@
-import sys
-import os
-
-file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
-project_path = file_path[0:end]
-sys.path.append(project_path)
-from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.utils.date_handle_util as date_handle_util
-from mns_common.component.classify.symbol_classify_param import stock_type_classify_param
-
-mongodb_util = MongodbUtil('27017')
-
-
-# 处理月线 周线 todo 暂时简单计算周线之和
-def handle_month_week_line(k_line_info, str_day, symbol, deal_days):
-    sub_stock_new_max_deal_days = stock_type_classify_param['sub_new_stock_max_deal_days']
-    if deal_days > sub_stock_new_max_deal_days:
-        k_line_info = handle_month_line(k_line_info, str_day, symbol)
-        k_line_info = handle_week_line(k_line_info, str_day, symbol)
-    else:
-        k_line_info['week01'] = 0
-        k_line_info['week02'] = 0
-        k_line_info['week03'] = 0
-        k_line_info['week04'] = 0
-        k_line_info['sum_week'] = 0
-        k_line_info['week_num'] = 0
-        k_line_info['week_last_day'] = '19890729'
-
-        k_line_info['sum_month'] = 0
-        k_line_info['month_num'] = 0
-        k_line_info['month01'] = 0
-        k_line_info['month02'] = 0
-        k_line_info['month01_date'] = '19890729'
-        k_line_info['month02_date'] = '19890729'
-    return k_line_info
-
-
-# 处理月线
-def handle_month_line(k_line_info, str_day, symbol):
-    month_begin_day = str_day[0:7] + '-01'
-    query = {"symbol": symbol,
-             'date': {"$lt": date_handle_util.no_slash_date(month_begin_day)}}
-    stock_hfq_monthly = mongodb_util.descend_query(query, 'stock_qfq_monthly', 'date', 2)
-    month_num = stock_hfq_monthly.shape[0]
-    k_line_info['month_num'] = month_num
-    if month_num > 0:
-        k_line_info['sum_month'] = round(sum(stock_hfq_monthly['chg']), 2)
-    else:
-        k_line_info['sum_month'] = 0
-
-    if month_num == 0:
-        k_line_info['month01'] = 0
-        k_line_info['month02'] = 0
-        k_line_info['month01_date'] = '19890729'
-        k_line_info['month02_date'] = '19890729'
-    elif month_num == 1:
-        k_line_info['month01'] = stock_hfq_monthly.iloc[0].chg
-        k_line_info['month02'] = 0
-        k_line_info['month01_date'] = stock_hfq_monthly.iloc[0].date
-        k_line_info['month02_date'] = '19890729'
-    elif month_num == 2:
-        k_line_info['month01'] = stock_hfq_monthly.iloc[0].chg
-        k_line_info['month02'] = stock_hfq_monthly.iloc[1].chg
-        k_line_info['month01_date'] = stock_hfq_monthly.iloc[0].date
-        k_line_info['month02_date'] = stock_hfq_monthly.iloc[1].date
-
-    return k_line_info
-
-
-# 处理周线
-def handle_week_line(k_line_info, str_day, symbol):
-    month_begin_day = str_day[0:7] + '-01'
-    query = {"symbol": symbol,
-             '$and': [{'date': {"$gte": date_handle_util.no_slash_date(month_begin_day)}},
-                      {'date': {"$lt": date_handle_util.no_slash_date(str_day)}}]}
-    stock_hfq_weekly = mongodb_util.find_query_data('stock_qfq_weekly', query)
-    week_num = stock_hfq_weekly.shape[0]
-    if week_num > 0:
-        stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
-        k_line_info['sum_week'] = round(sum(stock_hfq_weekly['chg']), 2)
-    else:
-        k_line_info['sum_week'] = 0
-    k_line_info['week_num'] = week_num
-    if week_num == 1:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = 0
-        k_line_info['week03'] = 0
-        k_line_info['week04'] = 0
-    elif week_num == 2:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
-        k_line_info['week03'] = 0
-        k_line_info['week04'] = 0
-    elif week_num == 3:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
-        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
-        k_line_info['week04'] = 0
-    elif week_num >= 4:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
-        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
-        k_line_info['week04'] = stock_hfq_weekly.iloc[3].chg
-    elif week_num == 0:
-        k_line_info['week01'] = 0
-        k_line_info['week02'] = 0
-        k_line_info['week03'] = 0
-        k_line_info['week04'] = 0
-        k_line_info['week_last_day'] = month_begin_day
-        k_line_info['sum_week'] = 0
-        return k_line_info
-    stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
-    stock_hfq_weekly_last = stock_hfq_weekly.iloc[0:1]
-    k_line_info['week_last_day'] = list(stock_hfq_weekly_last['date'])[0]
-
-    return k_line_info