mns-scheduler 1.1.3.5__tar.gz → 1.1.3.6__tar.gz

{mns_scheduler-1.1.3.5 → mns_scheduler-1.1.3.6}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.3.5
+Version: 1.1.3.6

{mns_scheduler-1.1.3.5 → mns_scheduler-1.1.3.6}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -10,7 +10,10 @@ import mns_common.constant.db_name_constant as db_name_constant
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.api.ths.zt.ths_stock_zt_pool_api as ths_stock_zt_pool_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
-
+import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
+from datetime import datetime
+import mns_common.utils.data_frame_util as data_frame_util
+from functools import lru_cache
 mongodb_util = MongodbUtil('27017')
 
 # 固定的选择
@@ -20,6 +23,7 @@ fixed_optional_list = ['USDCNH', 'XAUUSD',
                        '885736', '881124', '886078',
                        '881145', '886073', '881160', '885730',
                        '886076', '883418', '881169', '885530',
+                       '510300', '512100',
                        'CN0Y',
                        '1B0888',
                        '1A0001',
@@ -31,30 +35,43 @@ fixed_optional_list = ['USDCNH', 'XAUUSD',
                        'HS2083',
                        ]
 
-
-def add_fixed_optional():
+@lru_cache()
+def get_ths_cookie():
     query = {"type": "ths_cookie"}
     stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
     ths_cookie = list(stock_account_info['cookie'])[0]
+    return ths_cookie
+
+
+def add_fixed_optional():
+    ths_cookie = get_ths_cookie()
     for symbol in fixed_optional_list:
         ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
 
 
 def delete_all_self_choose_stocks():
-    query = {"type": "ths_cookie"}
-    stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
-    ths_cookie = list(stock_account_info['cookie'])[0]
+    ths_cookie = get_ths_cookie()
     all_self_choose_stock_list = ths_self_choose_api.get_all_self_choose_stock_list(ths_cookie)
     for stock_one in all_self_choose_stock_list.itertuples():
         symbol = stock_one.code
         ths_self_choose_api.del_stock_from_account(symbol, ths_cookie)
 
 
+def add_self_choose_local():
+    now_date = datetime.now()
+    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.BUY_STOCK_NAME, query)
+    ths_cookie = get_ths_cookie()
+    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)
+
+
 # 添加连板到自选
 def add_continue_boards_zt_stocks():
-    query = {"type": "ths_cookie"}
-    stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
-    ths_cookie = list(stock_account_info['cookie'])[0]
+    ths_cookie = get_ths_cookie()
     ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(None)
     ths_stock_zt_pool_df = ths_stock_zt_pool_df.loc[ths_stock_zt_pool_df['connected_boards_numbers'] > 1]
     ths_stock_zt_pool_df = common_service_fun_api.exclude_st_symbol(ths_stock_zt_pool_df)
@@ -66,6 +83,7 @@ def add_continue_boards_zt_stocks():
 # 自选股操作 删除当天自选股 增加新的连板股票  添加固定选择自选
 def self_choose_stock_handle():
     delete_all_self_choose_stocks()
+    add_self_choose_local()
     add_continue_boards_zt_stocks()
     add_fixed_optional()
 

{mns_scheduler-1.1.3.5 → mns_scheduler-1.1.3.6}/mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py

@@ -227,22 +227,22 @@ def save_ths_zt_pool(ths_zt_pool_df, str_day):
 
 
 if __name__ == '__main__':
-    trade_date = '2015-05-28'
-    zt_df = ths_zt_pool(trade_date, None)
-    save_ths_zt_pool(zt_df, trade_date)
-    while True:
-        query = {"$and": [{'_id': {"$gte": '2013-07-04'}}, {'_id': {"$lte": '2015-05-05'}}]}
-
-        trade_date_list = mongodb_util.find_query_data('trade_date_list', query)
-        trade_date_list = trade_date_list.sort_values(by=['trade_date'], ascending=False)
-        for trade_one in trade_date_list.itertuples():
-            try:
-                trade_date = trade_one.trade_date
-                zt_df = ths_zt_pool(trade_date, None)
-
-                # zt_df = mongodb_util.find_query_data(db_name_constant.THS_ZT_POOL, query={"str_day": trade_date})
-                save_ths_zt_pool(zt_df, trade_date)
-                logger.info("同步到日期:{}", trade_date)
-                time.sleep(2)
-            except BaseException as e:
-                logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)
+    # trade_date = '2024-08-01'
+    # zt_df = ths_zt_pool(trade_date, None)
+    # save_ths_zt_pool(zt_df, trade_date)
+
+    query = {"$and": [{'_id': {"$gte": '2013-07-04'}}, {'_id': {"$lte": '2015-04-30'}}]}
+    # query = {"$and": [{'_id': {"$gte": '2024-07-24'}}, {'_id': {"$lte": '2024-08-01'}}]}
+    trade_date_list = mongodb_util.find_query_data('trade_date_list', query)
+    trade_date_list = trade_date_list.sort_values(by=['trade_date'], ascending=False)
+    for trade_one in trade_date_list.itertuples():
+        try:
+            trade_date = trade_one.trade_date
+            zt_df = ths_zt_pool(trade_date, None)
+
+            # zt_df = mongodb_util.find_query_data(db_name_constant.THS_ZT_POOL, query={"str_day": trade_date})
+            save_ths_zt_pool(zt_df, trade_date)
+            logger.info("同步到日期:{}", trade_date)
+            time.sleep(2)
+        except BaseException as e:
+            logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)

{mns_scheduler-1.1.3.5 → mns_scheduler-1.1.3.6}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.3.5
+Version: 1.1.3.6

{mns_scheduler-1.1.3.5 → mns_scheduler-1.1.3.6}/setup.py

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