akshare 1.17.3__py3-none-any.whl → 1.17.5__py3-none-any.whl

akshare/__init__.py

@@ -3110,9 +3110,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.17.1 fix: fix stock_gdfx_holding_detail_em interface
 1.17.2 fix: fix stock_ggcg_em interface
 1.17.3 fix: fix stock_hot_search_baidu interface
+1.17.4 fix: fix stock_news_em interface
+1.17.5 fix: fix stock_us_pink_spot_em interface
 """
 
-__version__ = "1.17.3"
+__version__ = "1.17.5"
 __author__ = "AKFamily"
 
 import sys

akshare/news/news_stock.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/05/23 14:00
+Date: 2025/6/16 20:00
 Desc: 个股新闻数据
-https://so.eastmoney.com/news/s?keyword=%E4%B8%AD%E5%9B%BD%E4%BA%BA%E5%AF%BF&pageindex=1&searchrange=8192&sortfiled=4
+https://so.eastmoney.com/news/s?keyword=603777
 """
 
 import json
@@ -12,23 +12,23 @@ import pandas as pd
 import requests
 
 
-def stock_news_em(symbol: str = "300059") -> pd.DataFrame:
+def stock_news_em(symbol: str = "603777") -> pd.DataFrame:
     """
     东方财富-个股新闻-最近 100 条新闻
-    https://so.eastmoney.com/news/s?keyword=%E4%B8%AD%E5%9B%BD%E4%BA%BA%E5%AF%BF&pageindex=1&searchrange=8192&sortfiled=4
+    https://so.eastmoney.com/news/s?keyword=603777
     :param symbol: 股票代码
     :type symbol: str
     :return: 个股新闻
     :rtype: pandas.DataFrame
     """
-    url = "http://search-api-web.eastmoney.com/search/jsonp"
+    url = "https://search-api-web.eastmoney.com/search/jsonp"
     params = {
         "cb": "jQuery3510875346244069884_1668256937995",
         "param": '{"uid":"",'
-        + f'"keyword":"{symbol}"'
-        + ',"type":["cmsArticleWebOld"],"client":"web","clientType":"web","clientVersion":"curr",'
-        '"param":{"cmsArticleWebOld":{"searchScope":"default","sort":"default","pageIndex":1,'
-        '"pageSize":100,"preTag":"<em>","postTag":"</em>"}}}',
+                 + f'"keyword":"{symbol}"'
+                 + ',"type":["cmsArticleWebOld"],"client":"web","clientType":"web","clientVersion":"curr",'
+                   '"param":{"cmsArticleWebOld":{"searchScope":"default","sort":"default","pageIndex":1,'
+                   '"pageSize":100,"preTag":"<em>","postTag":"</em>"}}}',
     }
     r = requests.get(url, params=params)
     data_text = r.text

akshare/stock/stock_us_pink.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/2/20 17:00
+Date: 2025/6/17 14:00
 Desc: 东方财富网-行情中心-美股市场-粉单市场
 https://quote.eastmoney.com/center/gridlist.html#us_pinksheet
 """
@@ -9,6 +9,8 @@ https://quote.eastmoney.com/center/gridlist.html#us_pinksheet
 import pandas as pd
 import requests
 
+from akshare.utils.tqdm import get_tqdm
+
 
 def stock_us_pink_spot_em() -> pd.DataFrame:
     """
@@ -19,22 +21,32 @@ def stock_us_pink_spot_em() -> pd.DataFrame:
     """
     url = "https://23.push2.eastmoney.com/api/qt/clist/get"
     params = {
+        "np": "1",
+        "fltt": "1",
+        "invt": "1",
+        "fs": "m:153",
+        "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,f25,"
+                  "f26,f22,f33,f11,f62,f128,f136,f115,f152",
+        "fid": "f3",
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "dect": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:153",
-        "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,f25,"
-        "f26,f22,f33,f11,f62,f128,f136,f115,f152",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df.columns = [
+    import math
+    total_page = math.ceil(data_json['data']["total"] / 100)
+    tqdm = get_tqdm()
+    big_df = pd.DataFrame()
+    for page in tqdm(range(1, total_page + 1), leave=False):
+        params.update({"pn": page})
+        r = requests.get(url, params=params)
+        data_json = r.json()
+        temp_df = pd.DataFrame(data_json["data"]["diff"])
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
+    big_df.columns = [
         "_",
         "最新价",
         "涨跌幅",
@@ -69,11 +81,11 @@ def stock_us_pink_spot_em() -> pd.DataFrame:
         "_",
         "_",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = range(1, len(temp_df) + 1)
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
-    temp_df["代码"] = temp_df["编码"].astype(str) + "." + temp_df["简称"]
-    temp_df = temp_df[
+    big_df.reset_index(inplace=True)
+    big_df["index"] = range(1, len(big_df) + 1)
+    big_df.rename(columns={"index": "序号"}, inplace=True)
+    big_df["代码"] = big_df["编码"].astype(str) + "." + big_df["简称"]
+    big_df = big_df[
         [
             "序号",
             "名称",
@@ -89,16 +101,16 @@ def stock_us_pink_spot_em() -> pd.DataFrame:
             "代码",
         ]
     ]
-    temp_df["最新价"] = pd.to_numeric(temp_df["最新价"], errors="coerce")
-    temp_df["涨跌额"] = pd.to_numeric(temp_df["涨跌额"], errors="coerce")
-    temp_df["涨跌幅"] = pd.to_numeric(temp_df["涨跌幅"], errors="coerce")
-    temp_df["开盘价"] = pd.to_numeric(temp_df["开盘价"], errors="coerce")
-    temp_df["最高价"] = pd.to_numeric(temp_df["最高价"], errors="coerce")
-    temp_df["最低价"] = pd.to_numeric(temp_df["最低价"], errors="coerce")
-    temp_df["昨收价"] = pd.to_numeric(temp_df["昨收价"], errors="coerce")
-    temp_df["总市值"] = pd.to_numeric(temp_df["总市值"], errors="coerce")
-    temp_df["市盈率"] = pd.to_numeric(temp_df["市盈率"], errors="coerce")
-    return temp_df
+    big_df["最新价"] = pd.to_numeric(big_df["最新价"], errors="coerce")
+    big_df["涨跌额"] = pd.to_numeric(big_df["涨跌额"], errors="coerce")
+    big_df["涨跌幅"] = pd.to_numeric(big_df["涨跌幅"], errors="coerce")
+    big_df["开盘价"] = pd.to_numeric(big_df["开盘价"], errors="coerce")
+    big_df["最高价"] = pd.to_numeric(big_df["最高价"], errors="coerce")
+    big_df["最低价"] = pd.to_numeric(big_df["最低价"], errors="coerce")
+    big_df["昨收价"] = pd.to_numeric(big_df["昨收价"], errors="coerce")
+    big_df["总市值"] = pd.to_numeric(big_df["总市值"], errors="coerce")
+    big_df["市盈率"] = pd.to_numeric(big_df["市盈率"], errors="coerce")
+    return big_df
 
 
 if __name__ == "__main__":

{akshare-1.17.3.dist-info → akshare-1.17.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.17.3
+Version: 1.17.5
 Summary: AKShare is an elegant and simple financial data interface library for Python, built for human beings!
 Home-page: https://github.com/akfamily/akshare
 Author: AKFamily

{akshare-1.17.3.dist-info → akshare-1.17.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=0M2Dz7KVKoBTGVCawF_t2WU3tAh1AEB9ZHRUTZySwFM,194519
+akshare/__init__.py,sha256=3j-3vUz9pWscK31P9S6UJUj68G4POhBLsJuzWx1cAM8,194607
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -190,7 +190,7 @@ akshare/movie/video_yien.py,sha256=2JsyKTwiP4RTuDNzQR6d9V9fzMnByH2ATJFzdtPyXSQ,3
 akshare/news/__init__.py,sha256=B7G1wejQ9jRov6hXKLh9xy4F-UcfPps3AgVLDZnKM4w,82
 akshare/news/news_baidu.py,sha256=ZmC1Sq1sxb8Ottmzth-zjf_39Ri08oAzLB35dRNM7Xk,8276
 akshare/news/news_cctv.py,sha256=MRODE1qilypQijyCZedgC1Ctju_3ySdJlhT2nuJcuwc,7389
-akshare/news/news_stock.py,sha256=0M1BDmSJ8T6qykgv5YLN7qruNQkm7bU4KbbcaA-Mv7Y,2866
+akshare/news/news_stock.py,sha256=5OErvZ40VngGQ1ORaLjDlvqXvwh7RMewcmq-zmKWMME,2764
 akshare/nlp/__init__.py,sha256=F-1D7ifZQ4RiE2zsQuPc4Aj_C7RhqxGPvObcRNcLPGs,79
 akshare/nlp/nlp_interface.py,sha256=PyZjT3PkuTbloop-JwLwZ2kNi22zdO-r_pRUWQ5SmgM,1856
 akshare/option/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
@@ -278,7 +278,7 @@ akshare/stock/stock_stop.py,sha256=WRFvnldImkwNI8b8Y3kAdS6Ua69DUG5s5nlKHZav7R0,1
 akshare/stock/stock_summary.py,sha256=6J4a3q4H2xKNdeiWNmjfyqyzJzb6QirmvowUuUvbqD4,11745
 akshare/stock/stock_us_famous.py,sha256=03qlwpDQT3EJSSDuGuzemP3TU2QwLZBOXotaOgDe1dQ,3628
 akshare/stock/stock_us_js.py,sha256=VleGUb7K-NjmW3jMPRc2jwHXM0CMq4IzVM9kUpwURDQ,2503
-akshare/stock/stock_us_pink.py,sha256=b48o56E6Ur1Z_50gPvaZo8ZyegePwVJs8z8KMSqHg0U,3035
+akshare/stock/stock_us_pink.py,sha256=tt30S6yvqaHO4AiWiqnpfRf1dwa0w_K78sTF26htnzs,3446
 akshare/stock/stock_us_sina.py,sha256=D4fhJgpmvnlVoeSV2wQQ7H6lig8h6vaJp71o88dZhDg,8200
 akshare/stock/stock_weibo_nlp.py,sha256=-k7gzAusb8_D4l0rc6bOzQ3x4b2dFBXJ2hgOntwEGc8,3266
 akshare/stock/stock_xq.py,sha256=DMF1U8xkdR31L7BQ3bScxeh4x6XaHNV0pAQBSLdSEc0,4901
@@ -392,10 +392,10 @@ akshare/utils/func.py,sha256=4cwmXFztU86yJNONJ40KJLvsIEQHBbct4iMm3zT2v30,2315
 akshare/utils/multi_decrypt.py,sha256=aWoL2iEPeuXHJg8-n7OtMKixLnIhfzepACgxfrfmQB4,1657
 akshare/utils/token_process.py,sha256=nGtgnZGRprXJkhLXH8mcUH4TgIFwzsTOb0EaEPa0Euo,667
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
-akshare-1.17.3.dist-info/licenses/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.17.5.dist-info/licenses/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
 tests/__init__.py,sha256=gNzhlO0UPjFq6Ieb38kaVIODXv4cTDByrdohAZnDYt4,82
 tests/test_func.py,sha256=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.17.3.dist-info/METADATA,sha256=A-ixsyIldqdipU4YSFykxllLnVi8GSu2vfRro0hgBeQ,11901
-akshare-1.17.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-akshare-1.17.3.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.17.3.dist-info/RECORD,,
+akshare-1.17.5.dist-info/METADATA,sha256=enaQvq9Qs2pAiPxnKq1qkmFTAONXmm0lDTfEQd1b7lY,11901
+akshare-1.17.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+akshare-1.17.5.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.17.5.dist-info/RECORD,,