mns-common 1.3.9.9__py3-none-any.whl → 1.4.0.1__py3-none-any.whl

mns_common/api/akshare/stock_bid_ask_api.py

@@ -57,25 +57,25 @@ def stock_bid_ask_em(symbol: str = "000001") -> dict:
     temp_df = pd.DataFrame(tick_dict, index=[1])
     temp_df.reset_index(inplace=True)
     temp_df.loc[temp_df['wei_bi'] == '-', 'wei_bi'] = 0
-    temp_df.loc[temp_df['sell_5'] == '-', 'sell_5_vol'] = 0
+    temp_df.loc[temp_df['sell_5_vol'] == '-', 'sell_5_vol'] = 0
     temp_df.loc[temp_df['sell_5'] == '-', 'sell_5'] = 0
-    temp_df.loc[temp_df['sell_4'] == '-', 'sell_4_vol'] = 0
+    temp_df.loc[temp_df['sell_4_vol'] == '-', 'sell_4_vol'] = 0
     temp_df.loc[temp_df['sell_4'] == '-', 'sell_4'] = 0
-    temp_df.loc[temp_df['sell_3'] == '-', 'sell_3_vol'] = 0
+    temp_df.loc[temp_df['sell_3_vol'] == '-', 'sell_3_vol'] = 0
     temp_df.loc[temp_df['sell_3'] == '-', 'sell_3'] = 0
-    temp_df.loc[temp_df['sell_2'] == '-', 'sell_2_vol'] = 0
+    temp_df.loc[temp_df['sell_2_vol'] == '-', 'sell_2_vol'] = 0
     temp_df.loc[temp_df['sell_2'] == '-', 'sell_2'] = 0
-    temp_df.loc[temp_df['sell_1'] == '-', 'sell_1_vol'] = 0
+    temp_df.loc[temp_df['sell_1_vol'] == '-', 'sell_1_vol'] = 0
     temp_df.loc[temp_df['sell_1'] == '-', 'sell_1'] = 0
-    temp_df.loc[temp_df['buy_1'] == '-', 'buy_1_vol'] = 0
+    temp_df.loc[temp_df['buy_1_vol'] == '-', 'buy_1_vol'] = 0
     temp_df.loc[temp_df['buy_1'] == '-', 'buy_1'] = 0
-    temp_df.loc[temp_df['buy_2'] == '-', 'buy_2_vol'] = 0
+    temp_df.loc[temp_df['buy_2_vol'] == '-', 'buy_2_vol'] = 0
     temp_df.loc[temp_df['buy_2'] == '-', 'buy_2'] = 0
-    temp_df.loc[temp_df['buy_3'] == '-', 'buy_3_vol'] = 0
+    temp_df.loc[temp_df['buy_3_vol'] == '-', 'buy_3_vol'] = 0
     temp_df.loc[temp_df['buy_3'] == '-', 'buy_3'] = 0
-    temp_df.loc[temp_df['buy_4'] == '-', 'buy_4_vol'] = 0
+    temp_df.loc[temp_df['buy_4_vol'] == '-', 'buy_4_vol'] = 0
     temp_df.loc[temp_df['buy_4'] == '-', 'buy_4'] = 0
-    temp_df.loc[temp_df['buy_5'] == '-', 'buy_5_vol'] = 0
+    temp_df.loc[temp_df['buy_5_vol'] == '-', 'buy_5_vol'] = 0
     temp_df.loc[temp_df['buy_5'] == '-', 'buy_5'] = 0
     temp_df['symbol'] = symbol
     return temp_df
@@ -83,5 +83,5 @@ def stock_bid_ask_em(symbol: str = "000001") -> dict:
 
 if __name__ == '__main__':
     while True:
-        df = stock_bid_ask_em('0.832110')
+        df = stock_bid_ask_em('0.000001')
         print(df)

mns_common/api/em/real_time/east_money_stock_a_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)
-
+from mns_common.db.MongodbUtil import MongodbUtil
 import requests
 import json
 import pandas as pd
@@ -14,15 +14,20 @@ import datetime
 from loguru import logger
 import mns_common.utils.data_frame_util as data_frame_util
 
+mongodb_util = MongodbUtil('27017')
+fields = ("f352,f2,f3,f5,f6,f8,f10,f11,f22,f12,f14,f15,f16,f17,"
+          "f18,f20,f21,f26,f33,f34,f35,f62,f66,f69,f72,f100,f184,f211,f212"),
+fs = "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048"
+
 # 最大返回条数
 max_number = 5800
 # 最小返回条数
 min_number = 5600
 # 分页条数
-page_number = 100
+PAGE_SIZE = 100
 
 
-def get_stock_page_data(pn, fields, fs, proxies):
+def get_stock_page_data(pn, proxies, page_size):
     """
     获取单页股票数据
     """
@@ -36,7 +41,7 @@ def get_stock_page_data(pn, fields, fs, proxies):
     params = {
         "cb": "jQuery1124046660442520420653_" + str(current_timestamp_ms),
         "pn": str(pn),
-        "pz": "10000",  # 每页最大200条
+        "pz": str(page_size),  # 每页最大200条
         "po": "0",
         "np": "3",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
@@ -79,18 +84,18 @@ def get_stock_page_data(pn, fields, fs, proxies):
         return pd.DataFrame()
 
 
-def all_stock_ticker_data_new(fields, fs, proxies) -> pd.DataFrame:
+def all_stock_ticker_data_new(proxies) -> pd.DataFrame:
     """
     使用多线程获取所有股票数据
     """
 
-    per_page = page_number
+    per_page = PAGE_SIZE
     total_pages = (max_number + per_page - 1) // per_page  # 向上取整
 
     # 创建线程池
     with ThreadPoolExecutor(max_workers=10) as executor:
         # 提交任务，获取每页数据
-        futures = [executor.submit(get_stock_page_data, pn, fields, fs, proxies)
+        futures = [executor.submit(get_stock_page_data, pn, proxies, PAGE_SIZE)
                    for pn in range(1, total_pages + 1)]
 
         # 收集结果
@@ -108,21 +113,10 @@ def all_stock_ticker_data_new(fields, fs, proxies) -> pd.DataFrame:
 
 
 def get_real_time_quotes_all_stocks(proxies):
-    fields = ("f352,f2,f3,f5,f6,f8,f10,f11,f22,f12,f14,f15,f16,f17,"
-              "f18,f20,f21,f26,f33,f34,f35,f62,f66,f69,f72,f100,f184,f211,f212"),
-    fs = "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048"
-    # 获取第一页数据
-    page_one_df = get_stock_page_data(1, fields, fs, proxies)
-    # 数据接口正常返回5600以上的数量
-    if page_one_df.shape[0] > min_number:
-        page_one_df = rename_real_time_quotes_df(page_one_df)
-        page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
-        return page_one_df
-    else:
-        page_df = all_stock_ticker_data_new(fields, fs, proxies)
-        page_df = rename_real_time_quotes_df(page_df)
-        page_df.drop_duplicates('symbol', keep='last', inplace=True)
-        return page_df
+    page_df = all_stock_ticker_data_new(proxies)
+    page_df = rename_real_time_quotes_df(page_df)
+    page_df.drop_duplicates('symbol', keep='last', inplace=True)
+    return page_df
 
 
 # 获取所有股票实时行情数据    f33,委比
@@ -298,5 +292,12 @@ def get_sum_north_south_net_buy_amt():
 # 示例调用
 if __name__ == "__main__":
     while True:
-        df = get_real_time_quotes_all_stocks(None)
-        logger.info("涨停数据,{}", 1)
+        ip_proxy_pool = mongodb_util.find_all_data('ip_proxy_pool')
+        if data_frame_util.is_not_empty(ip_proxy_pool):
+            proxy_ip = list(ip_proxy_pool['ip'])[0]
+            proxy = {
+                "https": proxy_ip}
+            df = get_real_time_quotes_all_stocks(proxy)
+            logger.info("涨停数据,{}", 1)
+        else:
+            logger.error("ip为空")

mns_common/api/em/real_time/east_money_stock_a_v2_api.py

@@ -288,9 +288,9 @@ def rename_real_time_quotes_df(temp_df):
 
 # 示例调用
 if __name__ == "__main__":
-
+    number = 1
     while True:
         df = get_all_real_time_quotes(None)
-        print(df)
         zt_df = df.loc[df['wei_bi'] == 100]
-        logger.info("涨停数据,{}", zt_df)
+        logger.info("同步次数,{}", number)
+        number = number + 1

mns_common/api/kpl/symbol/symbol_his_quotes_api.py

@@ -115,7 +115,7 @@ if __name__ == '__main__':
     # 2021-10-25,45,0925,0955 2023-09-15,11,0925,1005
 
     # get_stock_quotes_his('2023-09-20', 11, '0925', '1005')
-    df = sync_stock_his_quotes('2024-04-18', '0935', '0940')
+    df = sync_stock_his_quotes('2025-04-18', '0935', '0940')
     get_stock_count('2023-09-14', 0, '0925', '1500')
 
     his_test('2021-10-20')

mns_common/component/proxies/proxy_common_api.py

@@ -16,6 +16,8 @@ import requests
 import time
 from loguru import logger
 from functools import lru_cache
+import mns_common.api.em.real_time.east_money_stock_a_api as east_money_stock_a_api
+import threading
 
 mongodb_util = MongodbUtil('27017')
 
@@ -69,21 +71,20 @@ def generate_proxy_ip(minutes):
         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, timeout=2):
+            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)
-        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)
-
         return ip
 
 
@@ -98,95 +99,58 @@ def get_proxy_ip(minutes):
             return generate_proxy_ip(minutes)
 
 
-def check_baidu_proxy(proxy_ip, timeout=2):
-    """
-    检测代理IP是否能访问百度
-    :param proxy_ip: 代理IP地址
-    :param proxy_port: 代理端口
-    :param timeout: 超时时间(秒)
-    :return: (是否可用, 响应时间, 检测结果信息)
-    """
-    # 构造代理地址
-
-    # 设置代理参数
-    proxies = {
-        "http": proxy_ip,
-        "https": proxy_ip
-    }
-
-    # 模拟浏览器请求头
-    headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
-        "Accept-Language": "zh-CN,zh;q=0.9",
-        "Connection": "keep-alive"
-    }
-
+def check_proxy(proxy_ip):
     try:
-        # 记录开始时间
-        start_time = time.time()
-
-        # 发送请求到百度
-        response = requests.get(
-            url="https://www.baidu.com",
-            proxies=proxies,
-            headers=headers,
-            timeout=timeout,
-            allow_redirects=True  # 允许重定向
-        )
-
-        # 计算响应时间
-        response_time = round((time.time() - start_time) * 1000)  # 毫秒
-        # 检查响应状态和内容
-        if response.status_code == 200:
-            # 验证是否返回百度页面
-            if "百度一下" in response.text and "baidu.com" in response.text:
-                logger.info("代理ip可用:{},响应时间:{}", proxy_ip, response_time)
-                return True
-            else:
-                logger.error("代理ip不可用:{},响应时间:{}", proxy_ip, response_time)
-                return False
+        # 两秒超时
+        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:
-            logger.error("代理ip不可用:{},响应时间:{},HTTP状态码异常:{}", proxy_ip, response_time, response.status_code)
             return False
-    except requests.exceptions.ConnectTimeout:
-        logger.error("代理ip不可用:{},连接超时", proxy_ip, response_time)
-        return False
-    except requests.exceptions.ProxyError:
-        logger.error("代理ip不可用:{},代理拒绝连接", proxy_ip, response_time)
-        return False
-    except requests.exceptions.SSLError:
-        logger.error("代理ip不可用:{},SSL证书错误", proxy_ip, response_time)
-        return False
-    except requests.exceptions.RequestException as e:
-        logger.error("代理ip不可用:{},网络错误:{}", proxy_ip, str(e))
+    except Exception as e:
+        logger.error("代理ip不可用:{},{}", proxy_ip, e)
         return False
 
 
-def check_proxy(proxy_ip, timeout=2):
+def get_em_real_time_data(proxy_ip):
     proxies = {
         "http": proxy_ip,
         "https": proxy_ip
     }
-    try:
-        # 测试请求（httpbin.org 返回请求的IP）
-        response = requests.get(
-            "http://httpbin.org/ip",
-            proxies=proxies,
-            timeout=timeout  # 超时时间
-        )
-        if response.status_code == 200:
-            return True
-        else:
-            logger.error("代理ip不可用:{}", proxy_ip)
-            return False
-    except Exception as e:
-        logger.error("代理ip不可用:{},{}", proxy_ip, e)
-        return False
+    return east_money_stock_a_api.get_stock_page_data(1, proxies, 20)
+
+
+# 定义一个带超时的函数调用
+def call_with_timeout(func, *args, timeout=2, **kwargs):
+    # 用于存储函数执行结果
+    result = None
+    exception = None
+
+    # 定义一个线程目标函数
+    def target():
+        nonlocal result, exception
+        try:
+            result = func(*args, **kwargs)
+        except Exception as e:
+            exception = e
+
+    # 创建线程并启动
+    thread = threading.Thread(target=target)
+    thread.start()
+
+    # 等待线程完成，最多等待 timeout 秒
+    thread.join(timeout)
+
+    # 如果线程仍然存活，说明函数超时了
+    if thread.is_alive():
+        raise TimeoutError(f"Function exceeded timeout of {timeout} seconds")
+
+    # 如果函数抛出了异常，重新抛出
+    if exception is not None:
+        raise exception
+    return result
 
 
 if __name__ == "__main__":
-    target_ip = "112.28.228.67:35528"  # Google DNS
-    if check_proxy(target_ip, 2):
-        print(f"{target_ip} 可以访问")
-    else:
-        print(f"{target_ip} 无法访问")
+    generate_proxy_ip(1)

{mns_common-1.3.9.9.dist-info → mns_common-1.4.0.1.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.3.9.9
+Version: 1.4.0.1
 

{mns_common-1.3.9.9.dist-info → mns_common-1.4.0.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ mns_common/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/akshare/__init__.py,sha256=xu36nA6MJTauswUWPfKIKH0E-lpOAHTw2TL5QI_6TeY,165
 mns_common/api/akshare/k_line_api.py,sha256=q2rlBTdyc-8D75Bj6Zf5wvMBgSSJxDeKBxnio7Z91Bk,3762
-mns_common/api/akshare/stock_bid_ask_api.py,sha256=6V42fVfAau3kFD1p4V4O71afU7u5bUqi770mU6bu-m0,3984
+mns_common/api/akshare/stock_bid_ask_api.py,sha256=oHGhCFpCWQB6MNWOUWX0CIO31FQkF55oRQQx1sFO14k,4024
 mns_common/api/akshare/stock_dt_pool.py,sha256=sKedOTzqsBZprJHJEr2sRYa8xbeSK7tRenqBE3wOdUc,2245
 mns_common/api/akshare/stock_zb_pool.py,sha256=ylcVgZTzsD3qz9WaItLtoqTf4t-Ex49MDtZUk0xaB5Q,2126
 mns_common/api/akshare/stock_zt_pool_api.py,sha256=_4PG_Wd88S4zweKNwZprwxaMMHBF4OQSB77DGW1l9UQ,1929
@@ -15,8 +15,8 @@ mns_common/api/em/gd/east_money_stock_gdfx_free_top_10_api.py,sha256=hitzJuMwy5I
 mns_common/api/em/real_time/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/em/real_time/east_money_debt_api.py,sha256=jMvMZtlrDfExl_4jZ1hepHX8rUoeVLoLSOIhRBjkUGk,14753
 mns_common/api/em/real_time/east_money_etf_api.py,sha256=tCyH4fNx-KfVRFuNGkgM8d_xkvR0oAfr8T3e7_XrjTM,14414
-mns_common/api/em/real_time/east_money_stock_a_api.py,sha256=twwrpwk6bvLuYeZRdF6QUG8w8J1EWHIgEJF1yvj1CDw,12722
-mns_common/api/em/real_time/east_money_stock_a_v2_api.py,sha256=PXArsNK7IDQB1PoMMs97J6H5EtBgnZPEdUGhqk1VV4A,14505
+mns_common/api/em/real_time/east_money_stock_a_api.py,sha256=Sn5Pnvi2rTXmKx4-Gz--XASJlAZ8ylniP4NQfXsKENE,12697
+mns_common/api/em/real_time/east_money_stock_a_v2_api.py,sha256=mL4uuL6sVsC2Vnl09826AUnzxePGAUhlZ7I5BBFw8Ks,14530
 mns_common/api/em/real_time/east_money_stock_hk_api.py,sha256=KFIYUZ3N4ULrataeCIXwZPo775O7joKgMF466uwVDdY,15154
 mns_common/api/em/real_time/east_money_stock_us_api.py,sha256=RiTrdZDuDgTOtiMSD1Ba9aQAx4vghM66pEp_LicH3Ps,11632
 mns_common/api/hk/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
@@ -39,7 +39,7 @@ mns_common/api/kpl/selection/kpl_selection_plate_api.py,sha256=M3bnczpEKhMyF5wNS
 mns_common/api/kpl/symbol/__init__.py,sha256=8b2PuXJM5fLoq71cWPXp695czQuaRtyR6OVHajGjDPc,161
 mns_common/api/kpl/symbol/kpl_real_time_quotes_api.py,sha256=djxGi8IeQNtfFKMWyuOpuKSAmHTvWLrrJQJOrpdEJfw,4877
 mns_common/api/kpl/symbol/kpl_symbol_common_field_constant.py,sha256=EijxWFjOb18wO8WAp6w3EyKIvYKppWwVkml8esle29g,3495
-mns_common/api/kpl/symbol/symbol_his_quotes_api.py,sha256=r3n7U2F7MZUDZFQgnx-JI4sb8MiRTIwVeh21iehbFwE,4210
+mns_common/api/kpl/symbol/symbol_his_quotes_api.py,sha256=5F9L8V2UI_YUYe2dO6FbVKq43fAjjFooXII0mjnxefM,4210
 mns_common/api/msg/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/msg/push_msg_api.py,sha256=z8jDqFWygfxnCFFfQp4K-llgg27nRLv7Mx72lOddBH0,1390
 mns_common/api/proxies/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
@@ -113,7 +113,7 @@ mns_common/component/k_line/patterns/pattern_Enum.py,sha256=bl8cH1H3BWdj_deVO124
 mns_common/component/price/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/component/price/trade_price_service_api.py,sha256=0loBjbOt__o-ngc2Q4n5lF8_0x2WINRpL-cH1341Uaw,4396
 mns_common/component/proxies/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_common/component/proxies/proxy_common_api.py,sha256=wNyqGFo1KnInY5E4bk83CQoXP0K3vQDDs5rPRTM-O7U,6221
+mns_common/component/proxies/proxy_common_api.py,sha256=N2VaiEQ15KycjSNmCHAguR1xiASZzJu1y24NhFCr7BA,4663
 mns_common/component/qmt/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/component/qmt/qmt_buy_service.py,sha256=tLTgrSxCcxuMhADRBBrW4ZWR_3MdbMZvvMdH5hbwyJU,7190
 mns_common/component/real_time/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
@@ -152,7 +152,7 @@ mns_common/utils/date_handle_util.py,sha256=XS-MyA8_7k35LOCFAYOHgVcVkMft_Kc4Wa9U
 mns_common/utils/db_util.py,sha256=hSmfNAN4vEeEaUva6_cicZEhb2jSnib-Gvk2reke1vc,2590
 mns_common/utils/file_util.py,sha256=egWu6PenGPRp_ixrNTHKarT4dAnOT6FETR82EHUZJnQ,1042
 mns_common/utils/ip_util.py,sha256=UTcYfz_uytB__6nlBf7T-izuI7hi4XdB6ET0sJgEel4,969
-mns_common-1.3.9.9.dist-info/METADATA,sha256=4kf1Xk0G1IQfxzQd2nWHhhOgjlyYLQnl0EwPzlpH0Nc,61
-mns_common-1.3.9.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_common-1.3.9.9.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.3.9.9.dist-info/RECORD,,
+mns_common-1.4.0.1.dist-info/METADATA,sha256=fA7f2r7ufHEM5SrWEhoHSr7Kmkh032OxY3b8Me7vbl0,61
+mns_common-1.4.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_common-1.4.0.1.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.4.0.1.dist-info/RECORD,,