mns-scheduler 1.1.1.1__tar.gz → 1.1.1.3__tar.gz

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.1.1
+Version: 1.1.1.3

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -89,12 +89,27 @@ def save_ths_concept_detail(new_concept_symbol_df,
                    "total_mv_sp": 1}
     company_info = mongodb_util.find_query_data_choose_field('company_info',
                                                              query_company_info, query_field)
+    if 'industry' in company_info.columns:
+        del company_info['industry']
+    if 'company_type' in company_info.columns:
+        del company_info['company_type']
+    if 'flow_mv_sp' in company_info.columns:
+        del company_info['flow_mv_sp']
+    if 'total_mv_sp' in company_info.columns:
+        del company_info['total_mv_sp']
 
     company_info = company_info.set_index(['_id'], drop=True)
     new_concept_symbol_df = new_concept_symbol_df.set_index(['symbol'], drop=False)
 
     new_concept_symbol_df = pd.merge(new_concept_symbol_df, company_info, how='outer',
                                      left_index=True, right_index=True)
+
+    if 'index' not in company_info.columns:
+        new_concept_symbol_df['index'] = 0
+
+    if 'change' not in company_info.columns:
+        new_concept_symbol_df['change'] = 0
+
     new_concept_symbol_df['concept_name'] = new_concept_symbol_df['concept_name'].replace(" ", "")
     query = {'concept_code': concept_code}
 

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py

@@ -41,7 +41,7 @@ if __name__ == '__main__':
     now_date = datetime.datetime.now()
     begin_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
     print('同步开始:' + begin_date)
-    update_concept_all_symbol_detail()
+    update_concept_all_detail_info()
     now_date = datetime.datetime.now()
     end_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
     print('同步结束:' + end_date)

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/db/col_move_service.py

@@ -112,5 +112,4 @@ if __name__ == '__main__':
     # sync_col_move('2024-05-28')
     # sync_col_move('2024-05-30')
     # sync_col_move('2024-05-31')
-    sync_col_move('2024-06-11')
-    sync_col_move('2024-06-12')
+    sync_col_move('2024-06-21')

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/k_line/sync/daily_week_month_line_sync.py

@@ -106,6 +106,7 @@ 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('weekly', 'qfq', 'stock_qfq_weekly', None, None)
     # sync_all_daily_data('monthly', 'qfq', 'stock_qfq_monthly', None, None)
 

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/real_time/realtime_quotes_now_create_db_index.py

@@ -7,8 +7,10 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 from loguru import logger
 from mns_common.db.MongodbUtil import MongodbUtil
+
 mongodb_util = MongodbUtil('27017')
 
+
 def create_db_index(str_day):
     query_trade_day = {'_id': str_day}
     is_trade_day = mongodb_util.exist_data_query('trade_date_list', query_trade_day)
@@ -19,8 +21,8 @@ def create_db_index(str_day):
             mongodb_util.create_index('realtime_quotes_now_' + str_day, [("symbol", 1), ("number", 1)])
             mongodb_util.create_index('realtime_quotes_now_' + str_day, [("str_now_date", 1)])
             logger.info("创建索引成功:{}", str_day)
-        except BaseException:
-            logger.warning("创建索引异常:{}", )
+        except BaseException as e:
+            logger.warning("创建索引异常:{}", e)
 
 
 if __name__ == '__main__':

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/trade/auto_ipo_buy_api.py

@@ -6,12 +6,12 @@ end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
-import mns_common.component.trade.trade_service_api as trade_service_api
+import mns_common.component.deal.deal_service_api as deal_service_api
 
 
 ## 自动一键打新
 def auto_ipo_buy():
-    trade_service_api.auto_ipo_buy()
+    deal_service_api.auto_ipo_buy('easy_trader')
 
 
 if __name__ == '__main__':

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/trade/auto_sell_service_api.py

@@ -11,11 +11,13 @@ import mns_common.constant.db_name_constant as db_name_constant
 import datetime
 import mns_common.component.cache.cache_service as cache_service
 from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.component.trade.trade_service_api as trade_service_api
+import mns_common.component.deal.deal_service_api as deal_service_api
 from loguru import logger
 from mns_common.utils.async_fun import async_fun
+import mns_common.component.price.trade_price_service_api as trade_price_service_api
 
 mongodb_util = MongodbUtil('27017')
+from mns_common.constant.price_enum import PriceEnum
 
 AUTO_SELL_KEY = "AUTO_SELL_KEY"
 
@@ -51,11 +53,11 @@ def sell_stock_detail(realtime_quotes_now_position, position_stock_df, str_day,
         try:
 
             symbol = stock_one.symbol
-            sell_price = trade_service_api.get_last_sell_price(symbol)
+            sell_price = trade_price_service_api.get_trade_price(symbol, PriceEnum.SEll_PRICE_LIMIT.price_code)
             position_stock_df_one = position_stock_df.loc[position_stock_df['symbol'] == symbol]
             available_position = list(position_stock_df_one['available_position'])[0]
             if sell_signal(stock_one, now_date, position_stock_df_one):
-                sell_result = trade_service_api.order_sell(symbol, sell_price, available_position)
+                sell_result = deal_service_api.trade_sell(symbol, sell_price, available_position)
                 if "message" in sell_result:
                     result_msg = sell_result['message']
                     if result_msg == 'success':
@@ -110,7 +112,7 @@ def update_position_status(symbol, sell_entrust_no, str_day):
 import mns_common.api.em.east_money_stock_api as east_money_stock_api
 
 if __name__ == '__main__':
-    sell_price_01 = trade_service_api.get_last_sell_price('002336')
+    sell_price_01 = trade_price_service_api.get_trade_price('002336',PriceEnum.SEll_PRICE_LIMIT.price_code)
     while True:
         real_time_quotes_now = east_money_stock_api.get_real_time_quotes_all_stocks()
         auto_sell_stock(real_time_quotes_now)

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/trade/sync_position_api.py

@@ -5,7 +5,7 @@ file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
-import mns_common.component.trade.trade_service_api as trade_service_api
+import mns_common.component.deal.deal_service_api as deal_service_api
 import pandas as pd
 import mns_common.utils.data_frame_util as data_frame_util
 import mns_common.constant.db_name_constant as db_name_constant
@@ -23,7 +23,7 @@ def sync_position():
     query_exist = {'str_day': str_day}
     if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
         return None
-    position_list = trade_service_api.get_position()
+    position_list = deal_service_api.get_position('easy_trader')
     position_df = pd.DataFrame(position_list)
     position_df = position_df.rename(columns={"明细": "detail",
                                               "序号": "index",

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/zt/zt_pool/em_zt_pool_sync_api.py

@@ -132,7 +132,7 @@ def save_zt_info(str_day):
 
 
 if __name__ == '__main__':
-    save_zt_info('2024-06-07')
+    save_zt_info('2024-06-21')
 # from datetime import datetime
 #
 # if __name__ == '__main__':

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py

@@ -172,7 +172,7 @@ def get_bfq_daily_line(ths_zt_pool_df, str_day):
     return bfq_k_line_df
 
 
-def save_ths_zt_pool(ths_zt_pool_df):
+def save_ths_zt_pool(ths_zt_pool_df, str_day):
     ths_zt_pool_df = ths_zt_pool_df[[
         "symbol",
         "name",
@@ -213,19 +213,33 @@ def save_ths_zt_pool(ths_zt_pool_df):
     ]]
     ths_zt_pool_df['_id'] = ths_zt_pool_df['symbol'] + '_' + ths_zt_pool_df['str_day']
     ths_zt_pool_df = ths_zt_pool_df.sort_values(by=['connected_boards_numbers'], ascending=False)
+
+    # 将日期数值转换为日期时间格式
+    ths_zt_pool_df['list_date_01'] = pd.to_datetime(ths_zt_pool_df['list_date'], format='%Y%m%d')
+    str_day_date = date_handle_util.str_to_date(str_day, '%Y-%m-%d')
+    # 计算日期差值 距离现在上市时间
+    ths_zt_pool_df['diff_days'] = ths_zt_pool_df.apply(
+        lambda row: (str_day_date - row['list_date_01']).days, axis=1)
+    del ths_zt_pool_df['list_date_01']
+
     mongodb_util.save_mongo(ths_zt_pool_df, db_name_constant.THS_ZT_POOL)
 
 
 if __name__ == '__main__':
-    while True:
-        query = {'_id': {"$lte": '2019-10-29'}}
-        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)
-                save_ths_zt_pool(zt_df)
-                logger.info("同步到日期:{}", trade_date)
-            except BaseException as e:
-                logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)
+    trade_date = '2024-06-21'
+    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": '2019-07-04'}}]}
+    #
+    #     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)
+    #         except BaseException as e:
+    #             logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.1.1
+Version: 1.1.1.3

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.3}/setup.py

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