mns-common 1.4.1.8__py3-none-any.whl → 1.5.7.2__py3-none-any.whl

mns_common/component/proxies/proxy_common_api.py

@@ -12,7 +12,6 @@ import mns_common.utils.data_frame_util as data_frame_util
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.constant.db_name_constant as db_name_constant
 import datetime
-import requests
 import time
 from loguru import logger
 from functools import lru_cache
@@ -21,71 +20,81 @@ import threading
 
 mongodb_util = MongodbUtil('27017')
 
+IP_POOL = 'ip_pool'
+ONE_IP = 'one_ip'
+query_one = {'ip_type': ONE_IP}
+query_pool = {'ip_type': IP_POOL}
+
 
 def query_liu_guan_proxy_ip():
-    ip_proxy_pool = mongodb_util.find_all_data(db_name_constant.IP_PROXY_POOL)
+    ip_proxy_pool = mongodb_util.find_query_data(db_name_constant.IP_PROXY_POOL, query_one)
     return ip_proxy_pool
 
 
-def remove_proxy_ip():
-    mongodb_util.remove_data({}, db_name_constant.IP_PROXY_POOL)
+def remove_one_proxy_ip():
+    mongodb_util.remove_data(query_one, db_name_constant.IP_PROXY_POOL)
 
 
 def check_valid(ip_proxy_pool):
     effect_time = list(ip_proxy_pool['effect_time'])[0]
-
     now_date = datetime.datetime.now()
-
     str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
-
     if effect_time > str_now_date:
         return True
     else:
-        remove_proxy_ip()
+        remove_one_proxy_ip()
         return False
 
 
 @lru_cache(maxsize=None)
 def get_account_cache():
-    query = {"type": "liu_guan_proxy", }
+    query = {"type": "liu_guan_proxy"}
     return mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
 
 
 def generate_proxy_ip_api(minutes):
-    stock_account_info = get_account_cache()
-    order_id = list(stock_account_info['password'])[0]
-    secret = list(stock_account_info['account'])[0]
-    # 获取10分钟动态ip
-    ip = liu_guan_proxy_api.get_proxy_api(order_id, secret, str(60 * minutes))
-    return ip
+    try_numer = 3
+    while try_numer > 0:
+        try:
+            stock_account_info = get_account_cache()
+            order_id = list(stock_account_info['password'])[0]
+            secret = list(stock_account_info['account'])[0]
+            # 获取10分钟动态ip
+            liu_guan_ip = liu_guan_proxy_api.get_proxy_api(order_id, secret, str(60 * minutes))
+            try_numer = try_numer
+            logger.info("生成新的ip:{}", liu_guan_ip)
+            return liu_guan_ip
+        except BaseException as e:
+            logger.error("获取ip失败:{}", str(e))
+            time.sleep(1)
+            continue
 
 
 def generate_proxy_ip(minutes):
-    ip_proxy_pool = mongodb_util.find_all_data(db_name_constant.IP_PROXY_POOL)
+    ip_proxy_pool = query_liu_guan_proxy_ip()
     if data_frame_util.is_not_empty(ip_proxy_pool):
         return list(ip_proxy_pool['ip'])[0]
     else:
-        remove_proxy_ip()
+        remove_one_proxy_ip()
         now_date = datetime.datetime.now()
         # 加上分钟
         time_to_add = datetime.timedelta(minutes=minutes)
         new_date = now_date + time_to_add
         str_now_date = new_date.strftime('%Y-%m-%d %H:%M:%S')
-        # 获取10分钟动态ip
-        while True:
-            remove_proxy_ip()
-            ip = generate_proxy_ip_api(minutes)
-            if check_proxy(ip):
-                result_dict = {"_id": ip,
-                               'effect_time': str_now_date,
-                               'ip': ip}
-                result_df = pd.DataFrame(result_dict, index=[1])
-
-                mongodb_util.insert_mongo(result_df, db_name_constant.IP_PROXY_POOL)
-                break
-            else:
-                time.sleep(0.5)
-        return ip
+        try:
+            ip_proxy = generate_proxy_ip_api(minutes)
+
+            result_dict = {"_id": ip_proxy,
+                           'ip_type': ONE_IP,
+                           'effect_time': str_now_date,
+                           'ip': ip_proxy}
+            result_df = pd.DataFrame(result_dict, index=[1])
+
+            mongodb_util.insert_mongo(result_df, db_name_constant.IP_PROXY_POOL)
+        except BaseException as e:
+            logger.error("获取ip失败:{}", str(e))
+
+        return ip_proxy
 
 
 def get_proxy_ip(minutes):
@@ -99,18 +108,86 @@ def get_proxy_ip(minutes):
             return generate_proxy_ip(minutes)
 
 
-def check_proxy(proxy_ip):
-    try:
-        # 两秒超时
-        test_df = call_with_timeout(get_em_real_time_data, proxy_ip, timeout=2)
-        if data_frame_util.is_not_empty(test_df):
-            logger.info("可用代理ip:{}", proxy_ip)
-            return True
+#
+# def check_proxy(proxy_ip):
+#     try:
+#         # 两秒超时
+#         test_df = call_with_timeout(get_em_real_time_data, proxy_ip, timeout=2)
+#         if data_frame_util.is_not_empty(test_df):
+#             logger.info("可用代理ip:{}", proxy_ip)
+#             return True
+#         else:
+#             return False
+#     except Exception as e:
+#         logger.error("代理ip不可用:{},{}", proxy_ip, e)
+#         return False
+
+
+# 查询ip池子
+def query_liu_guan_proxy_ip_pool():
+    ip_proxy_pool = mongodb_util.find_query_data(db_name_constant.IP_PROXY_POOL, query_pool)
+    return ip_proxy_pool
+
+
+def remove_proxy_ip_pool():
+    mongodb_util.remove_data(query_pool, db_name_constant.IP_PROXY_POOL)
+
+
+def generate_proxy_ip_pool_api(minutes, ip_num):
+    stock_account_info = get_account_cache()
+    order_id = list(stock_account_info['password'])[0]
+    secret = list(stock_account_info['account'])[0]
+    # 获取10分钟动态ip
+    ip_pool = liu_guan_proxy_api.get_proxy_pool_api(order_id, secret, str(60 * minutes), ip_num)
+    return ip_pool
+
+
+def get_proxy_ip_pool(minutes, seconds, ip_num):
+    ip_proxy_pool = query_liu_guan_proxy_ip_pool()
+    if data_frame_util.is_empty(ip_proxy_pool):
+        return generate_proxy_ip_pool(minutes, seconds, ip_num)
+    else:
+        if check_valid(ip_proxy_pool):
+            ip_pool = list(ip_proxy_pool['ip_pool'])[0]
+            effect_time = list(ip_proxy_pool['effect_time'])[0]
+            result = {'ip_pool': ip_pool,
+                      'effect_time': effect_time}
+            return result
         else:
-            return False
-    except Exception as e:
-        logger.error("代理ip不可用:{},{}", proxy_ip, e)
-        return False
+            # 已经失效 移除ip pool
+            remove_proxy_ip_pool()
+            # 重新生成
+            return generate_proxy_ip_pool(minutes, seconds, ip_num)
+
+
+# seconds 有效秒数,minutes 需要减1
+def generate_proxy_ip_pool(minutes, seconds, ip_num):
+    ip_proxy_pool = query_liu_guan_proxy_ip_pool()
+    if data_frame_util.is_not_empty(ip_proxy_pool):
+        ip_pool = list(ip_proxy_pool['ip_pool'])[0]
+        effect_time = list(ip_proxy_pool['effect_time'])[0]
+
+
+    else:
+        remove_proxy_ip_pool()
+        now_date = datetime.datetime.now()
+        # 加上分钟 少10秒
+        time_to_add = datetime.timedelta(minutes=minutes - 1, seconds=seconds)
+        new_date = now_date + time_to_add
+        effect_time = new_date.strftime('%Y-%m-%d %H:%M:%S')
+        ip_pool = generate_proxy_ip_pool_api(minutes, ip_num)
+        result_dict = {
+            "_id": [IP_POOL],
+            'ip_type': [IP_POOL],
+            'effect_time': [effect_time],
+            'ip_pool': [ip_pool]  # 每个字段都包装成列表
+        }
+        result_df = pd.DataFrame(result_dict)
+
+        mongodb_util.insert_mongo(result_df, db_name_constant.IP_PROXY_POOL)
+    result = {'ip_pool': ip_pool,
+              'effect_time': effect_time}
+    return result
 
 
 def get_em_real_time_data(proxy_ip):
@@ -118,7 +195,7 @@ def get_em_real_time_data(proxy_ip):
         "http": proxy_ip,
         "https": proxy_ip
     }
-    return east_money_stock_a_api.get_stock_page_data(1, proxies, 20)
+    return east_money_stock_a_api.get_stock_page_data(1, proxies, 20, 10)
 
 
 # 定义一个带超时的函数调用
@@ -152,5 +229,24 @@ def call_with_timeout(func, *args, timeout=2, **kwargs):
     return result
 
 
+@lru_cache(maxsize=None)
+def query_province_and_city_info():
+    return mongodb_util.find_all_data(db_name_constant.IP_PROXY_CITY_PROVINCE)
+
+
+def import_province_and_city():
+    # 设置文件夹路径
+    folder_path = r'E:\province-and-city.xlsx'
+    df = pd.read_excel(folder_path)
+    df['_id'] = df['cid']
+
+    mongodb_util.save_mongo(df, db_name_constant.IP_PROXY_CITY_PROVINCE)
+    return df
+
+
 if __name__ == "__main__":
-    generate_proxy_ip(1)
+    stock_account_info_test = get_account_cache()
+    order_id_test = list(stock_account_info_test['password'])[0]
+    secret_test = list(stock_account_info_test['account'])[0]
+    # 获取10分钟动态ip
+    ip = liu_guan_proxy_api.get_proxy_api(order_id_test, secret_test, str(60 * 1))

mns_common/component/us/us_stock_etf_info_api.py

@@ -0,0 +1,125 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 21
+project_path = file_path[0:end]
+sys.path.append(project_path)
+from loguru import logger
+import csv
+import requests
+import pandas as pd
+import mns_common.component.em.em_stock_info_api as em_stock_info_api
+from functools import lru_cache
+import mns_common.utils.data_frame_util as data_frame_util
+
+
+@lru_cache()
+def get_us_stock_info():
+    # 东财美股列表
+    em_us_stock_info_df = em_stock_info_api.get_us_stock_info()
+    em_us_stock_info_df['symbol'] = em_us_stock_info_df['symbol'].str.replace('_', '-')
+    em_us_stock_info_df = em_us_stock_info_df.loc[em_us_stock_info_df['total_mv'] != 0]
+
+    if data_frame_util.is_not_empty(em_us_stock_info_df):
+        em_us_stock_info_df.fillna({'list_date': 10000101}, inplace=True)
+        em_us_stock_info_df = em_us_stock_info_df[['symbol', 'name', 'list_date']]
+
+    # alpha 股票名单
+    alpha_us_stock_info = get_us_alpha_stock_list()
+    alpha_us_stock_info = alpha_us_stock_info.loc[alpha_us_stock_info['assetType'] == 'Stock']
+    if data_frame_util.is_not_empty(alpha_us_stock_info):
+        alpha_us_stock_info.fillna({'list_date': '1000-01-01'}, inplace=True)
+        alpha_us_stock_info = alpha_us_stock_info[['symbol', 'name', 'list_date']]
+
+        alpha_us_stock_info['list_date'] = alpha_us_stock_info['list_date'].astype(str).str.replace('-', '').astype(int)
+
+    us_stock_result_df = pd.concat([alpha_us_stock_info, em_us_stock_info_df])
+    us_stock_result_df.drop_duplicates(subset=['symbol'], inplace=True)
+
+    return us_stock_result_df
+
+
+@lru_cache()
+def get_us_etf_info():
+    us_etf_info_df = em_stock_info_api.get_us_etf_info()
+    if data_frame_util.is_not_empty(us_etf_info_df):
+        us_etf_info_df.fillna({'list_date': 10000101}, inplace=True)
+        us_etf_info_df = us_etf_info_df[['symbol', 'name', 'list_date']]
+
+    # alpha ETF名单
+    alpha_us_etf_info = get_us_alpha_stock_list()
+    alpha_us_etf_info = alpha_us_etf_info.loc[alpha_us_etf_info['assetType'] == 'ETF']
+    if data_frame_util.is_not_empty(alpha_us_etf_info):
+        alpha_us_etf_info.fillna({'list_date': '1000-01-01'}, inplace=True)
+        alpha_us_etf_info = alpha_us_etf_info[['symbol', 'name', 'list_date']]
+
+        alpha_us_etf_info['list_date'] = alpha_us_etf_info['list_date'].astype(str).str.replace('-', '').astype(int)
+    us_etf_result_df = pd.concat([us_etf_info_df, alpha_us_etf_info])
+    us_etf_result_df.drop_duplicates(subset=['symbol'], inplace=True)
+
+    return us_etf_result_df
+
+
+# 退市 https://www.alphavantage.co/query?function=LISTING_STATUS&date=2012-07-10&state=delisted&apikey=QODR3TBYB2U4M9YR
+@lru_cache()
+def get_us_alpha_stock_list():
+    try:
+        # replace the "demo" apikey below with your own key from https://www.alphavantage.co/support/#api-key
+        CSV_URL = 'https://www.alphavantage.co/query?function=LISTING_STATUS&apikey=demo'
+        with requests.Session() as s:
+            download = s.get(CSV_URL)
+            decoded_content = download.content.decode('utf-8')
+            cr = csv.reader(decoded_content.splitlines(), delimiter=',')
+            my_list = list(cr)
+            # 提取列名（第1行）
+            columns = my_list[0]
+            # 提取数据（第2行及以后）
+            values = my_list[1:]
+
+            # 转换为 DataFrame
+            df = pd.DataFrame(values, columns=columns)
+            df = df.rename(columns={'ipoDate': 'list_date'})
+            if data_frame_util.is_not_empty(df):
+                df.to_csv(r'D:\mns\mns-common\mns_common\component\us\listing_status.csv', index=False, encoding='gbk')
+            return df
+    except BaseException as e:
+        logger.error("下载出现异常:{},", e)
+        df = pd.read_csv(r'D:\mns\mns-common\mns_common\component\us\listing_status.csv', encoding='utf-8')
+        df = df.rename(columns={'ipoDate': 'list_date'})
+        return df
+
+
+def get_us_alpha_stock_de_list():
+    try:
+        # replace the "demo" apikey below with your own key from https://www.alphavantage.co/support/#api-key
+        CSV_URL = 'https://www.alphavantage.co/query?function=LISTING_STATUS&date=2025-08-02&state=delisted&apikey=QODR3TBYB2U4M9YR'
+        with requests.Session() as s:
+            download = s.get(CSV_URL)
+            decoded_content = download.content.decode('utf-8')
+            cr = csv.reader(decoded_content.splitlines(), delimiter=',')
+            my_list = list(cr)
+            # 提取列名（第1行）
+            columns = my_list[0]
+            # 提取数据（第2行及以后）
+            values = my_list[1:]
+
+            # 转换为 DataFrame
+            df = pd.DataFrame(values, columns=columns)
+            df = df.rename(columns={'ipoDate': 'list_date'})
+            if data_frame_util.is_not_empty(df):
+                df.to_csv(r'D:\mns\mns-common\mns_common\component\us\de_list_status.csv', index=False, encoding='gbk')
+            return df
+    except BaseException as e:
+        logger.error("下载出现异常:{},", e)
+        df = pd.read_csv(r'D:\mns\mns-common\mns_common\component\us\de_list_status.csv', encoding='utf-8')
+        df = df.rename(columns={'ipoDate': 'list_date'})
+        return df
+
+
+if __name__ == '__main__':
+    # get_us_alpha_stock_de_list()
+    df_test = get_us_stock_info()
+    df_test.drop_duplicates(subset=['symbol'], inplace=True)
+    print(df_test)
+    get_us_alpha_stock_de_list()

mns_common/constant/db_name_constant.py

@@ -24,6 +24,9 @@ EM_US_STOCK_INFO = 'em_us_stock_info'
 # ip代理池
 IP_PROXY_POOL = 'ip_proxy_pool'
 
+# ip代理城市信息
+IP_PROXY_CITY_PROVINCE = 'ip_proxy_city_province'
+
 # 大单同步表
 BIG_DEAL_NAME = "ths_big_deal_fund"
 # 大单选择表
@@ -54,14 +57,10 @@ THS_STOCK_CONCEPT_DETAIL_APP = "ths_stock_concept_detail_app"
 
 # 今日排除买入股票
 TODAY_EXCLUDE_STOCK = "today_exclude_stocks"
+
 # 今日买入股票
 BUY_STOCK_NAME = 'trade_stocks'
 
-#  公司信息表
-COMPANY_INFO = 'company_info'
-#  公司信息历史表
-COMPANY_INFO_HIS = 'company_info_his'
-
 # TODAY_NEW_CONCEPT_LIST
 TODAY_NEW_CONCEPT_LIST = 'today_new_concept_list'
 
@@ -74,11 +73,14 @@ KPL_BEST_CHOOSE_DAILY = 'kpl_best_choose_daily'
 # 当前持仓股票
 POSITION_STOCK = 'position_stock'
 
+# 订单委托表
+STOCK_TRADE_ORDERS = 'stock_trade_orders'
+
 # 个股黑名单
 SELF_BLACK_STOCK = 'self_black_stock'
-# 自选板块
+# 长期自选板块
 SELF_CHOOSE_PLATE = 'self_choose_plate'
-# 自选个股
+# 长期自选个股
 SELF_CHOOSE_STOCK = 'self_choose_stock'
 
 # 今日自选个股
@@ -116,7 +118,10 @@ STOCK_INTERACTIVE_QUESTION = 'stock_interactive_question'
 
 # 上交所 互动ID映射代码
 
-SSE_INFO_UID = 'sse_info_uid'
+SH_INFO_UID = 'sh_info_uid'
+
+# 深交所 互动ID映射代码
+SZ_INFO_UID = 'sz_info_uid'
 
 # kcx 高涨幅>9.5 当天开盘数据
 KCX_HIGH_CHG_OPEN_DATA = 'realtime_quotes_now_zt_new_kc_open'
@@ -135,9 +140,6 @@ KZZ_DEBT_INFO = 'kzz_debt_info'
 # 交易配置信息
 TRADE_CONFIG_INFO = 'trade_config_info'
 
-# 公司备注信息
-COMPANY_REMARK_INFO = 'company_remark_info'
-
 #  打板待选
 DA_BAN_SELF_CHOOSE = 'da_ban_self_choose'
 #  打板排除
@@ -146,11 +148,28 @@ DA_BAN_SELF_EXCLUDE = 'da_ban_self_exclude'
 #  港股公司行业列表
 HK_COMPANY_INDUSTRY = 'hk_company_industry'
 
+# 公司基本信息
+COMPANY_BASE_INFO = 'company_base_info'
+
 #  公司控股信息 子孙公司 联营公司
 COMPANY_HOLDING_INFO = 'company_holding_info'
+#  公司业务组成
+COMPANY_BUSINESS_INFO = 'company_business_info'
+
 #  公司公告信息
 COMPANY_ANNOUNCE_INFO = 'company_announce_info'
 
+#  公司行业信息
+COMPANY_INDUSTRY_INFO = 'company_industry_info'
+
+# 公司信息临时表
+COMPANY_INFO_TEMP = 'company_info_temp'
+
+#  公司信息表
+COMPANY_INFO = 'company_info'
+#  公司信息历史表
+COMPANY_INFO_HIS = 'company_info_his'
+
 #  行业和概念自己的备注
 INDUSTRY_CONCEPT_REMARK = 'industry_concept_remark'
 
@@ -163,9 +182,6 @@ FU_PAN_NOTE = 'fu_pan_note'
 # 公司停复牌
 STOCK_TFP_INFO = 'stock_tfp_info'
 
-# 公司停复牌
-STOCK_TFP_INFO = 'stock_tfp_info'
-
 # 隔夜打板
 OVER_NIGHT_DA_BAN = 'over_night_da_ban'
 
@@ -184,12 +200,20 @@ THS_STOCK_INDUSTRY_DETAIL = 'ths_stock_industry_detail'
 # 年k线前复权
 STOCK_QFQ_YEAR = 'stock_qfq_year'
 
-# 主线集合
-MAIN_LINE_LIST = 'main_line_list'
+# 涨停原因 详情
+ZT_REASON_ANALYSIS = 'zt_reason_analysis'
 # 主线详情
 MAIN_LINE_DETAIL = 'main_line_detail'
 
+# 主线龙头
+MAIN_LINE_LEADER = 'main_line_leader'
+
+# 自选主线列表
+MAIN_LINE_LIST = 'main_line_list'
+
 # 整体选择表
 STRATEGY_TOTAL_CHOOSE_PARAM = 'strategy_total_choose_param'
 # k 线参数表
 STRATEGY_K_LINE_PARAM = 'strategy_k_line_param'
+# 评分参数
+STRATEGY_SCORE_PARAM = 'strategy_score_param'

mns_common/constant/extra_income_db_name.py

@@ -7,9 +7,16 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 
 # db_name
-
+######################################[数据库]##############################################################
 EXTRA_INCOME = 'extraIncome'
 
+# us_stock 美股信息数据表
+US_STOCK = 'us_stock'
+# a股数据表
+A_STOCK = 'a_stock'
+# hk股票数据
+HK_STOCK = 'hk_stock'
+######################################[集合表]##############################################################
 # 东方财富a股信息
 EM_A_STOCK_INFO = 'em_a_stock_info'
 
@@ -22,11 +29,8 @@ EM_KZZ_INFO = 'em_kzz_info'
 # 东方财富HK股信息
 EM_HK_STOCK_INFO = 'em_hk_stock_info'
 
-# 东方财富US股信息
-EM_US_STOCK_INFO = 'em_us_stock_info'
-
-# 东方财富US ETF信息
-EM_US_ETF_INFO = 'em_us_etf_info'
+# 东方财富港股通信息
+EM_HK_GGT_STOCK_INFO = 'em_hk_ggt_stock_info'
 
 # 创业板分钟集合数据
 ONE_MINUTE_K_LINE_BFQ_C = 'one_minute_k_line_bfq_c'
@@ -65,16 +69,35 @@ ONE_MINUTE_SYNC_FAIL = 'one_minute_sync_fail'
 
 # us stock daily_k_line
 
-US_STOCK_DAILY_QFQ_K_LINE = 'us_stock_daily_qfq_k_line'
 
-# us stock 1分钟集合数据
-US_STOCK_MINUTE_K_LINE_BFQ = 'us_stock_one_minute_k_line_bfq'
+# 雪球利润表
+XUE_QIU_LRB_INCOME = 'xue_qiu_lrb_income'
 
-# us etf 1分钟集合数据
-US_ETF_MINUTE_K_LINE_BFQ = 'us_etf_one_minute_k_line_bfq'
+# 雪球资产负债表
+XUE_QIU_ASSET_DEBT = 'xue_qiu_asset_debt'
 
-# us 主要etf 1分钟集合数据
-US_MAIN_ETF_MINUTE_K_LINE_BFQ = 'us_main_etf_one_minute_k_line_bfq'
+# 雪球资产现金流量表
+XUE_QIU_CASH_FLOW = 'xue_qiu_cash_flow'
+
+# todo A股日k线
+# A 可转债前复权日k线
+A_KZZ_QFQ_DAILY = 'a_kzz_qfq_daily'
+
+# A ETF前复权日k线
+A_ETF_QFQ_DAILY = 'a_etf_qfq_daily'
+
+# A 股票前复权日k线
+A_STOCK_QFQ_DAILY = 'a_stock_qfq_daily'
+
+# A 指数前复权日k线
+A_INDEX_QFQ_DAILY = 'a_index_qfq_daily'
+
+# todo 港股
+# HK ETF前复权日k线
+HK_ETF_QFQ_DAILY = 'hk_etf_qfq_daily'
+
+# HK 股票前复权日k线
+HK_STOCK_QFQ_DAILY = 'hk_stock_qfq_daily'
 
 # hk stock daily_k_line
 HK_STOCK_DAILY_QFQ_K_LINE = 'hk_stock_daily_qfq_k_line'
@@ -84,11 +107,48 @@ HK_STOCK_MINUTE_K_LINE_BFQ = 'hk_stock_one_minute_k_line_bfq'
 # hk etf 1分钟集合数据
 HK_ETF_MINUTE_K_LINE_BFQ = 'hk_etf_one_minute_k_line_bfq'
 
-# 雪球利润表
-XUE_QIU_LRB_INCOME = 'xue_qiu_lrb_income'
+# todo US 美股
+# 东方财富US股信息
+US_STOCK_INFO_EM = 'us_stock_info_em'
 
-# 雪球资产负债表
-XUE_QIU_ASSET_DEBT = 'xue_qiu_asset_debt'
+# 东方财富US ETF信息
+US_ETF_INFO_EM = 'us_etf_info_em'
+
+# alpha_vantage US股票信息
+US_STOCK_INFO_ALPHA_VANTAGE = 'us_stock_info_alpha_vantage'
+
+# alpha_vantage US ETF信息
+US_STOCK_INFO_ALPHA_VANTAGE = 'us_etf_info_alpha_vantage'
+# 美股公司信息 清洗表
+US_STOCK_LIST = 'us_stock_list'
+# 美ETF信息 清洗表
+US_ETF_LIST = 'us_etf_list'
+# 美股所属行业信息
+US_STOCK_INDUSTRY_LIST = 'us_stock_industry_list'
+# 美股所属概念信息
+US_STOCK_CONCEPT_LIST = 'us_stock_concept_list'
+
+# todo 日k线集合
+# US ETF前复权日k线
+US_ETF_QFQ_DAILY = 'us_etf_qfq_daily'
+# US ETF不复权日k线
+US_ETF_BFQ_DAILY = 'us_etf_bfq_daily'
+# US ETF后复权日k线
+US_ETF_HFQ_DAILY = 'us_etf_hfq_daily'
+
+# us stock 日k线前复权
+US_STOCK_DAILY_QFQ_K_LINE = 'us_stock_daily_qfq_k_line'
+# us stock 日k线不复权
+US_STOCK_DAILY_BFQ_K_LINE = 'us_stock_daily_bfq_k_line'
+# us stock 日k线后复权
+US_STOCK_DAILY_HFQ_K_LINE = 'us_stock_daily_hfq_k_line'
 
-# 雪球资产现金流量表
-XUE_QIU_CASH_FLOW = 'xue_qiu_cash_flow'
+# todo 一分钟集合
+# us stock 1分钟集合数据
+US_STOCK_MINUTE_K_LINE_BFQ = 'us_stock_one_minute_k_line_bfq'
+
+# us etf 1分钟集合数据
+US_ETF_MINUTE_K_LINE_BFQ = 'us_etf_one_minute_k_line_bfq'
+
+# us 主要etf 1分钟集合数据
+US_MAIN_ETF_MINUTE_K_LINE_BFQ = 'us_main_etf_one_minute_k_line_bfq'

mns_common/constant/strategy_classify.py

@@ -35,8 +35,14 @@ class StrategyClassify(Enum):
     # 上市交易 1-5天的股票
     NEW_STOCK = ('new_stock', 'new_stock')
 
-    # 集合竞价 高外盘买入
-    HIGH_OUT_DISK_BUY = ('high_out_disk_buy', 'high_out_disk_buy')
+    # 集合竞价 高外盘买入 科创
+    HIGH_OUT_DISK_BUY_KC = ('high_out_disk_buy_kc', 'high_out_disk_buy_kc')
+
+    # 集合竞价 高外盘买入 沪深
+    HIGH_OUT_DISK_BUY_SH = ('high_out_disk_buy_sh', 'high_out_disk_buy_sh')
+
+    # 集合竞价 高外盘买入 北交所
+    HIGH_OUT_DISK_BUY_BJS = ('high_out_disk_buy_bjs', 'high_out_disk_buy_bjs')
 
     # 所有策略
     ALL = ('all', '所有')
@@ -46,6 +52,11 @@ class StrategyClassify(Enum):
         self.strategy_code = strategy_code
 
 
+# 获取策略分类
+def get_strategy_classify(strategy_code, data_choose_df):
+    return data_choose_df.loc[data_choose_df['strategy_code'] == strategy_code]
+
+
 class StrategyTimePeriod(Enum):
     # 第一阶段
     FIRST_PERIOD = ('first_period', 'first_period')
@@ -55,3 +66,7 @@ class StrategyTimePeriod(Enum):
     THIRD_PERIOD = ('third_period', 'third_period')
     # 集合竞价阶段
     CALL_AUCTION_PERIOD = ('call_auction_period', 'call_auction_period')
+
+    def __init__(self, time_code, time_name):
+        self.time_name = time_name
+        self.time_code = time_code

mns_common/db/MongodbUtil.py

@@ -11,7 +11,10 @@ from mns_common.utils.async_fun import async_fun
 from loguru import logger
 import mns_common.utils.ip_util as ip_util
 
+import warnings
 
+# 忽略所有警告
+warnings.filterwarnings("ignore")
 
 class MongodbUtil:
     def __init__(self, port):