mns-scheduler 1.3.1.0__py3-none-any.whl → 1.3.1.2__py3-none-any.whl

mns_scheduler/extraIncome/us/one_minute/stock/down_load/down_load_stock_his_2024_01.py

@@ -69,6 +69,8 @@ def sync_us_stock_one_minute(now_year, now_month):
             time.sleep(1)
             fail_dict = {
                 '_id': symbol + '_' + now_month,
+                'type': "stock",
+                'path': path,
                 'symbol': symbol,
                 'now_year': now_year,
                 'now_month': now_month

mns_scheduler/extraIncome/us/one_minute/stock/down_load/down_load_stock_his_2024_02.py

@@ -68,6 +68,8 @@ def sync_us_stock_one_minute(now_year, now_month):
             time.sleep(1)
             fail_dict = {
                 '_id': symbol + '_' + now_month,
+                'type': "stock",
+                'path': path,
                 'symbol': symbol,
                 'now_year': now_year,
                 'now_month': now_month
@@ -124,7 +126,7 @@ def net_work_check(now_date):
 
 
 def sync_by_year(begin_year):
-    begin_month = 12
+    begin_month = 11
     while begin_month > 6:
         if begin_month < 10:
             str_month = '0' + str(begin_month)

mns_scheduler/extraIncome/us/one_minute/stock/down_load/etf/down_load_ETF_his_2024.py

@@ -22,12 +22,14 @@ mongodb_util_27017 = MongodbUtil('27017')
 mongodbUtilV2_27019 = MongodbUtilV2('27019', extra_income_db_name.EXTRA_INCOME)
 from datetime import datetime
 
+no_choose_symbol = ['FNGA', 'MSTU', 'SPYU']
+
 
 def sync_us_stock_one_minute(now_year, now_month):
     real_time_quotes_all_us = em_stock_info_api.get_us_stock_info()
     real_time_quotes_all_us_stocks = real_time_quotes_all_us.loc[real_time_quotes_all_us['flow_mv'] == 0]
     real_time_quotes_all_us_stocks = real_time_quotes_all_us_stocks.sort_values(by=['amount'], ascending=False)
-
+    real_time_quotes_all_us_stocks = real_time_quotes_all_us_stocks.loc[~real_time_quotes_all_us_stocks['symbol'].isin(no_choose_symbol)]
     real_time_quotes_all_us_stocks = real_time_quotes_all_us_stocks.loc[
         real_time_quotes_all_us_stocks['amount'] >= 50000000]
 

mns_scheduler/extraIncome/us/one_minute/stock/down_load/etf/handle_down_load_fail_ETF.py

@@ -0,0 +1,67 @@
+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 loguru import logger
+import mns_common.utils.data_frame_util as data_frame_util
+from mns_common.db.MongodbUtil import MongodbUtil
+from mns_common.db.v2.MongodbUtilV2 import MongodbUtilV2
+import mns_common.constant.extra_income_db_name as extra_income_db_name
+import mns_scheduler.extraIncome.us.one_minute.api.alpha_vantage_api as alpha_vantage_api
+
+mongodb_util_27017 = MongodbUtil('27017')
+mongodbUtilV2_27019 = MongodbUtilV2('27019', extra_income_db_name.EXTRA_INCOME)
+
+
+def handle_fail_data():
+    query = {"type": "ETF", }
+    fail_df = mongodb_util_27017.find_query_data('us_stock_one_minute_down_load_fail', query)
+
+    for stock_one in fail_df.itertuples():
+        try:
+
+            now_year = stock_one.now_year
+            now_month = stock_one.now_month
+            symbol = stock_one.symbol
+            id_key = symbol + '_' + now_month
+            path = r'F:\us_etf\one_minute\{}'.format(now_year)
+            if not os.path.exists(path):
+                os.makedirs(path)
+
+            path = path + '\{}'.format(now_month)
+            if not os.path.exists(path):
+                os.makedirs(path)
+
+            df = alpha_vantage_api.sync_one_minute_data(symbol, now_month)
+            df = df.fillna(0)
+            df['time'] = df['time'].dt.strftime('%Y-%m-%d %H:%M:%S')
+            df['str_day'] = df['time'].str.slice(0, 10)
+            df['minute'] = df['time'].str.slice(11, 19)
+            df['_id'] = symbol + "_" + df['time']
+            df['symbol'] = symbol
+            df_export_df = df.copy()
+            export_original_data(df_export_df, symbol, path)
+            logger.info("同步股票分钟票数据完成:{}", stock_one.symbol)
+            query = {"_id": id_key}
+            mongodb_util_27017.remove_data(query, 'us_stock_one_minute_down_load_fail')
+        except BaseException as e:
+            logger.error("同步股票分钟数据出现异常:,{},{},{}", e, symbol, now_month)
+
+
+def export_original_data(df, symbol, path):
+    file_name = path + '\{}.csv'.format(symbol)
+    if data_frame_util.is_not_empty(df):
+        df = df.dropna(subset=['_id'])
+        del df['str_day']
+        del df['minute']
+        del df['_id']
+        del df['symbol']
+    df.to_csv(file_name, index=False, encoding='utf-8')
+
+
+if __name__ == '__main__':
+    handle_fail_data()

mns_scheduler/self_choose/ths_self_choose_service.py

@@ -121,14 +121,20 @@ def add_continue_boards_zt_stocks():
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     if trade_date_common_service_api.is_trade_day(str_day):
-        ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(None)
+        query = {'str_day': str_day}
+        stock_zt_pool_df = mongodb_util.find_query_data(db_name_constant.STOCK_ZT_POOL, query)
+        if data_frame_util.is_empty(stock_zt_pool_df):
+            str_day = trade_date_common_service_api.get_before_trade_date(str_day, 2)
+            query = {'str_day': str_day}
+            stock_zt_pool_df = mongodb_util.find_query_data(db_name_constant.STOCK_ZT_POOL, query)
     else:
         str_day = trade_date_common_service_api.get_last_trade_day(str_day)
-        ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(str_day)
-    ths_stock_zt_pool_df = ths_stock_zt_pool_df.loc[ths_stock_zt_pool_df['connected_boards_numbers'] >= 3]
-    ths_stock_zt_pool_df = common_service_fun_api.exclude_st_symbol(ths_stock_zt_pool_df)
-    ths_stock_zt_pool_df = ths_stock_zt_pool_df.sort_values(by=['connected_boards_numbers'], ascending=False)
-    for stock_one in ths_stock_zt_pool_df.itertuples():
+        query = {'str_day': str_day}
+        stock_zt_pool_df = mongodb_util.find_query_data(db_name_constant.STOCK_ZT_POOL, query)
+    stock_zt_pool_df = stock_zt_pool_df.loc[stock_zt_pool_df['connected_boards_numbers'] >= 3]
+    stock_zt_pool_df = common_service_fun_api.exclude_st_symbol(stock_zt_pool_df)
+    stock_zt_pool_df = stock_zt_pool_df.sort_values(by=['connected_boards_numbers'], ascending=False)
+    for stock_one in stock_zt_pool_df.itertuples():
         ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
 
 
@@ -146,4 +152,5 @@ def self_choose_stock_handle():
 
 
 if __name__ == '__main__':
+    add_continue_boards_zt_stocks()
     self_choose_stock_handle()

{mns_scheduler-1.3.1.0.dist-info → mns_scheduler-1.3.1.2.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.1.0
+Version: 1.3.1.2
 

{mns_scheduler-1.3.1.0.dist-info → mns_scheduler-1.3.1.2.dist-info}/RECORD

@@ -83,10 +83,11 @@ mns_scheduler/extraIncome/us/one_minute/etf/__init__.py,sha256=wEg73KlZo-dU0yKGw
 mns_scheduler/extraIncome/us/one_minute/stock/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/extraIncome/us/one_minute/stock/us_stock_one_minute_task.py,sha256=WVRg94PPKWWUEtfXf2zoyOKAAM3WjCy5BTayF9-jvGE,1334
 mns_scheduler/extraIncome/us/one_minute/stock/down_load/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/extraIncome/us/one_minute/stock/down_load/down_load_stock_his_2024_01.py,sha256=iiazoE9vs9x80vcIqRb44I3p2-gheZSDgntQRr1oNYE,5387
-mns_scheduler/extraIncome/us/one_minute/stock/down_load/down_load_stock_his_2024_02.py,sha256=arK3snmYfdAAkJpTw-jMeKSvZnc2hQI4Kra0OpMZXyY,5648
+mns_scheduler/extraIncome/us/one_minute/stock/down_load/down_load_stock_his_2024_01.py,sha256=GWHgYej8ZFTXmtLWcJoKY6XCeZmG7L3VwD_EGPdhwqM,5452
+mns_scheduler/extraIncome/us/one_minute/stock/down_load/down_load_stock_his_2024_02.py,sha256=rQ-qzYETfDecl9sN5N8LrNf_gUDtn_O8w2WOFfwd5zw,5713
 mns_scheduler/extraIncome/us/one_minute/stock/down_load/etf/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/extraIncome/us/one_minute/stock/down_load/etf/down_load_ETF_his_2024.py,sha256=UVen6djs5X5DJ3MVoZz7_wXf1_j7Udh6YnVwZ_MiY1Y,5632
+mns_scheduler/extraIncome/us/one_minute/stock/down_load/etf/down_load_ETF_his_2024.py,sha256=iyrzHW5jEKeBYKi8AOIOTWSX00L97nKrlBc5Yp-6lww,5816
+mns_scheduler/extraIncome/us/one_minute/stock/down_load/etf/handle_down_load_fail_ETF.py,sha256=xlW6V1cTSDyHbjHopBvWYrnZLgbby8B3I71cBZml00s,2530
 mns_scheduler/extraIncome/us/one_minute/stock/his/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/extraIncome/us/one_minute/stock/his/us_stock_one_minute_his.py,sha256=tfWHw1jgNSSX-mbs1hKhGI0WEyliR00xAD4pX_nrn0w,7559
 mns_scheduler/extraIncome/us/one_minute/stock/his/us_stock_one_minute_his_2024.py,sha256=zkD1WaGa1Wdggi2AHcwYPoEH0DeEIkptRrWneP0FHek,7947
@@ -157,7 +158,7 @@ mns_scheduler/risk/test/fix_blask_list.py,sha256=QKpEOP3-HcUKoCfcu2OeiqUlXGTzLQY
 mns_scheduler/risk/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mns_scheduler/risk/transactions/transactions_check_api.py,sha256=1Tbs8GNoAmdGPqwYOEFiyFjR4ghhvZ5fz4hl5kKjyfk,7379
 mns_scheduler/self_choose/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/self_choose/ths_self_choose_service.py,sha256=QCZ8LMwCV4awOM1wk1yPwzsVJmH1cwjV9o-OjI9n-XQ,6599
+mns_scheduler/self_choose/ths_self_choose_service.py,sha256=2fkABUphuxPZciCmMepRIm6hQ9xyiRBLzBC3y2bIR-s,7006
 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=EbVVf6khUm4-gF0yxPVzMg5XfvIhiGdkmeXDY9mcNeE,4623
@@ -197,7 +198,7 @@ mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=u0IvwPuI2hnjTOrwwe8EhBAM
 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=-5KrZrdci_qKbqacSRMyYF2UKhJ2UVH-m9L87pFnu24,24332
-mns_scheduler-1.3.1.0.dist-info/METADATA,sha256=Zuizxlug0u9QpHW7_UV_K1BMiparPUOl6_SLV-Xforg,64
-mns_scheduler-1.3.1.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_scheduler-1.3.1.0.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.3.1.0.dist-info/RECORD,,
+mns_scheduler-1.3.1.2.dist-info/METADATA,sha256=1sLHQibIkJ56OQKcnAsAu8hqjiOqhl-Rkd3jFcROlnw,64
+mns_scheduler-1.3.1.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_scheduler-1.3.1.2.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.3.1.2.dist-info/RECORD,,