akshare 1.15.80__tar.gz → 1.15.82__tar.gz

{akshare-1.15.80 → akshare-1.15.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.15.80
+Version: 1.15.82
 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.15.80 → akshare-1.15.82}/akshare/__init__.py

@@ -2990,9 +2990,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.78 fix: fix stock_yzxdr_em interface
 1.15.79 fix: fix stock_new_a_spot_em interface
 1.15.80 fix: fix option_gfex_vol_daily interface
+1.15.81 fix: fix bank_fjcf_table_detail interface
+1.15.82 fix: fix stock_individual_spot_xq interface
 """
 
-__version__ = "1.15.80"
+__version__ = "1.15.82"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.15.80 → akshare-1.15.82}/akshare/bank/bank_cbirc_2020.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/2/18 12:00
+Date: 2025/2/4 23:00
 Desc: 中国银行保险监督管理委员会-首页-政务信息-行政处罚-银保监分局本级-XXXX行政处罚信息公开表
-https://www.cbirc.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931&itemsubPName=%E8%A1%8C%E6%94%BF%E5%A4%84%E7%BD%9A#2
+https://www.nfra.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931&itemsubPName=%E8%A1%8C%E6%94%BF%E5%A4%84%E7%BD%9A#2
 提取 具体页面 html 页面的 json 接口
-https://www.cbirc.gov.cn/cn/static/data/DocInfo/SelectByDocId/data_docId=881446.json
+https://www.nfra.gov.cn/cn/static/data/DocInfo/SelectByDocId/data_docId=881446.json
 2020 新接口
 """
 
@@ -22,7 +22,7 @@ from akshare.bank.cons import cbirc_headers_without_cookie_2020
 def bank_fjcf_total_num(item: str = "分局本级") -> int:
     """
     首页-政务信息-行政处罚-银保监分局本级 总页数
-    https://www.cbirc.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931
+    https://www.nfra.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931
     :param item: choice of {"机关", "本级", "分局本级"}
     :type item: str
     :return: 总页数
@@ -34,7 +34,7 @@ def bank_fjcf_total_num(item: str = "分局本级") -> int:
         "分局本级": "4115",
     }
     cbirc_headers = cbirc_headers_without_cookie_2020.copy()
-    main_url = "https://www.cbirc.gov.cn/cbircweb/DocInfo/SelectDocByItemIdAndChild"
+    main_url = "https://www.nfra.gov.cn/cbircweb/DocInfo/SelectDocByItemIdAndChild"
     params = {
         "itemId": item_id_list[item],
         "pageSize": "18",
@@ -47,7 +47,7 @@ def bank_fjcf_total_num(item: str = "分局本级") -> int:
 def bank_fjcf_total_page(item: str = "分局本级", begin: int = 1) -> int:
     """
     获取首页-政务信息-行政处罚-银保监分局本级的总页数
-    https://www.cbirc.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931
+    https://www.nfra.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931
     :param item: choice of {"机关", "本级", "分局本级"}
     :type item: str
     :param begin: 开始页数
@@ -61,7 +61,7 @@ def bank_fjcf_total_page(item: str = "分局本级", begin: int = 1) -> int:
         "分局本级": "4115",
     }
     cbirc_headers = cbirc_headers_without_cookie_2020.copy()
-    main_url = "https://www.cbirc.gov.cn/cbircweb/DocInfo/SelectDocByItemIdAndChild"
+    main_url = "https://www.nfra.gov.cn/cbircweb/DocInfo/SelectDocByItemIdAndChild"
     params = {
         "itemId": item_id_list[item],
         "pageSize": "18",
@@ -93,7 +93,7 @@ def bank_fjcf_page_url(
         "分局本级": "4115",
     }
     cbirc_headers = cbirc_headers_without_cookie_2020.copy()
-    main_url = "https://www.cbirc.gov.cn/cbircweb/DocInfo/SelectDocByItemIdAndChild"
+    main_url = "https://www.nfra.gov.cn/cbircweb/DocInfo/SelectDocByItemIdAndChild"
     temp_df = pd.DataFrame()
     for i_page in tqdm(range(begin, page + begin), leave=False):
         params = {
@@ -125,7 +125,7 @@ def bank_fjcf_table_detail(
     id_list = bank_fjcf_page_url(page=page, item=item, begin=begin)["docId"]
     big_df = pd.DataFrame()
     for item in id_list:
-        url = f"https://www.cbirc.gov.cn/cn/static/data/DocInfo/SelectByDocId/data_docId={item}.json"
+        url = f"https://www.nfra.gov.cn/cn/static/data/DocInfo/SelectByDocId/data_docId={item}.json"
         res = requests.get(url)
         try:
             table_list = pd.read_html(StringIO(res.json()["data"]["docClob"]))[0]
@@ -148,7 +148,7 @@ def bank_fjcf_table_detail(
                 table_list.insert(2, pd.NA)
             else:
                 print(
-                    f"{item} 异常，请通过 https://www.cbirc.gov.cn/cn/view/pages/ItemDetail.html?docId={item} 查看"
+                    f"{item} 异常，请通过 https://www.nfra.gov.cn/cn/view/pages/ItemDetail.html?docId={item} 查看"
                 )
                 continue
 
@@ -170,7 +170,7 @@ def bank_fjcf_table_detail(
     big_df.columns = [
         "行政处罚决定书文号",
         "姓名",
-        "单位",  # 20200108新增
+        "单位",  # 20200108 新增
         "单位名称",
         "主要负责人姓名",
         "主要违法违规事实（案由）",

{akshare-1.15.80 → akshare-1.15.82}/akshare/bank/cons.py

@@ -4,17 +4,18 @@
 Date: 2023/4/3 21:06
 Desc: 银保监会配置文件
 """
+
 cbirc_headers_without_cookie_2020 = {
     "Accept": "*/*",
     "Accept-Encoding": "gzip, deflate",
     "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
     "Cache-Control": "no-cache",
     "Connection": "keep-alive",
-    "Host": "www.cbirc.gov.cn",
+    "Host": "www.nfra.gov.cn",
     "Pragma": "no-cache",
-    "Referer": "http://www.cbirc.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931&itemsubPName=%E8%A1%8C%E6%94%BF%E5%A4%84%E7%BD%9A",
+    "Referer": "http://www.nfra.gov.cn/cn/view/pages/ItemList.html?itemPId=923&itemId=4115&itemUrl=ItemListRightList.html&itemName=%E9%93%B6%E4%BF%9D%E7%9B%91%E5%88%86%E5%B1%80%E6%9C%AC%E7%BA%A7&itemsubPId=931&itemsubPName=%E8%A1%8C%E6%94%BF%E5%A4%84%E7%BD%9A",
     "X-Requested-With": "XMLHttpRequest",
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.97 Safari/537.36"
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.97 Safari/537.36",
 }
 
 cbirc_headers_without_cookie_2019 = {
@@ -23,9 +24,9 @@ cbirc_headers_without_cookie_2019 = {
     "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
     "Cache-Control": "no-cache",
     "Connection": "keep-alive",
-    "Host": "www.cbirc.gov.cn",
+    "Host": "www.nfra.gov.cn",
     "Pragma": "no-cache",
-    "Referer": "http://www.cbirc.gov.cn/cn/list/9103/910305/ybjjcf/1.html",
+    "Referer": "http://www.nfra.gov.cn/cn/list/9103/910305/ybjjcf/1.html",
     "Upgrade-Insecure-Requests": "1",
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.97 Safari/537.36"
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.97 Safari/537.36",
 }

{akshare-1.15.80 → akshare-1.15.82}/akshare/stock/stock_summary.py

@@ -56,7 +56,7 @@ def stock_szse_area_summary(date: str = "202203") -> pd.DataFrame:
     :return: 地区交易排序
     :rtype: pandas.DataFrame
     """
-    url = "http://www.szse.cn/api/report/ShowReport"
+    url = "https://www.szse.cn/api/report/ShowReport"
     params = {
         "SHOWTYPE": "xlsx",
         "CATALOGID": "1803_sczm",
@@ -78,8 +78,8 @@ def stock_szse_area_summary(date: str = "202203") -> pd.DataFrame:
         "债券交易额",
     ]
     temp_df["总交易额"] = temp_df["总交易额"].str.replace(",", "")
-    temp_df["总交易额"] = pd.to_numeric(temp_df["总交易额"])
-    temp_df["占市场"] = pd.to_numeric(temp_df["占市场"])
+    temp_df["总交易额"] = pd.to_numeric(temp_df["总交易额"], errors="coerce")
+    temp_df["占市场"] = pd.to_numeric(temp_df["占市场"], errors="coerce")
     temp_df["股票交易额"] = temp_df["股票交易额"].str.replace(",", "")
     temp_df["股票交易额"] = pd.to_numeric(temp_df["股票交易额"], errors="coerce")
     temp_df["基金交易额"] = temp_df["基金交易额"].str.replace(",", "")
@@ -633,7 +633,7 @@ if __name__ == "__main__":
     stock_szse_summary_df = stock_szse_summary(date="20240901")
     print(stock_szse_summary_df)
 
-    stock_szse_area_summary_df = stock_szse_area_summary(date="202203")
+    stock_szse_area_summary_df = stock_szse_area_summary(date="202412")
     print(stock_szse_area_summary_df)
 
     stock_szse_sector_summary_df = stock_szse_sector_summary(

{akshare-1.15.80 → akshare-1.15.82}/akshare/stock/stock_xq.py

@@ -44,7 +44,7 @@ def stock_individual_spot_xq(
     :rtype: pandas.DataFrame
     """
     session = requests.Session()
-    xq_a_token = token or "cccb558956c11f5aaf8b9a30bcf1f214117e8d67"
+    xq_a_token = token or "b1d767edc014ddf478005982ba9e053910dad8dc"
     headers = {
         "cookie": f"xq_a_token={xq_a_token};",
         "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 "

{akshare-1.15.80 → akshare-1.15.82}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.15.80
+Version: 1.15.82
 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