akshare 1.16.72__py3-none-any.whl → 1.16.74__py3-none-any.whl

akshare/__init__.py

@@ -3081,9 +3081,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.70 fix: fix stock_zh_ah_spot_em interface
 1.16.71 add: add stock_zh_a_gbjg_em interface
 1.16.72 add: add bond_sh_buy_back_em interface
+1.16.73 fix: fix stock_board_industry_hist_em interface
+1.16.74 fix: fix stock_individual_spot_xq interface
 """
 
-__version__ = "1.16.72"
+__version__ = "1.16.74"
 __author__ = "AKFamily"
 
 import sys

akshare/stock/stock_board_industry_em.py

@@ -281,19 +281,20 @@ def stock_board_industry_hist_em(
     :return: 历史行情
     :rtype: pandas.DataFrame
     """
+    if re.match(pattern=r"^BK\d+", string=symbol):
+        em_code = symbol
+    else:
+        industry_listing = __stock_board_industry_name_em()
+        em_code = industry_listing.query("板块名称 == @symbol")["板块代码"].values[0]
     period_map = {
         "日k": "101",
         "周k": "102",
         "月k": "103",
     }
-    stock_board_concept_em_map = __stock_board_industry_name_em()
-    stock_board_code = stock_board_concept_em_map[
-        stock_board_concept_em_map["板块名称"] == symbol
-    ]["板块代码"].values[0]
     adjust_map = {"": "0", "qfq": "1", "hfq": "2"}
     url = "http://7.push2his.eastmoney.com/api/qt/stock/kline/get"
     params = {
-        "secid": f"90.{stock_board_code}",
+        "secid": f"90.{em_code}",
         "fields1": "f1,f2,f3,f4,f5,f6",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61",
         "klt": period_map[period],
@@ -360,10 +361,11 @@ def stock_board_industry_hist_min_em(
     :return: 分时历史行情
     :rtype: pandas.DataFrame
     """
-    stock_board_concept_em_map = __stock_board_industry_name_em()
-    stock_board_code = stock_board_concept_em_map[
-        stock_board_concept_em_map["板块名称"] == symbol
-    ]["板块代码"].values[0]
+    if re.match(pattern=r"^BK\d+", string=symbol):
+        em_code = symbol
+    else:
+        industry_listing = __stock_board_industry_name_em()
+        em_code = industry_listing.query("板块名称 == @symbol")["板块代码"].values[0]
     if period == "1":
         url = "https://push2his.eastmoney.com/api/qt/stock/trends2/get"
         params = {
@@ -371,7 +373,7 @@ def stock_board_industry_hist_min_em(
             "fields2": "f51,f52,f53,f54,f55,f56,f57,f58",
             "iscr": "0",
             "ndays": "1",
-            "secid": f"90.{stock_board_code}",
+            "secid": f"90.{em_code}",
         }
         r = requests.get(url, params=params)
         data_json = r.json()
@@ -398,9 +400,9 @@ def stock_board_industry_hist_min_em(
         temp_df["最新价"] = pd.to_numeric(temp_df["最新价"], errors="coerce")
         return temp_df
     else:
-        url = "http://7.push2his.eastmoney.com/api/qt/stock/kline/get"
+        url = "https://7.push2his.eastmoney.com/api/qt/stock/kline/get"
         params = {
-            "secid": f"90.{stock_board_code}",
+            "secid": f"90.{em_code}",
             "fields1": "f1,f2,f3,f4,f5,f6",
             "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61",
             "klt": period,

akshare/stock/stock_xq.py

@@ -105,21 +105,24 @@ def stock_individual_spot_xq(
         *map(
             lambda x: column_name_map[x] if x in column_name_map.keys() else x,
             temp_df.columns,
-        )  # 由于传入的symbol可能是个股，可能是指数，也可能是基金，所以这里取列的最大公约数，没有数据的列内容为None
+        )  # 由于传入的 symbol 可能是个股，可能是指数，也可能是基金，所以这里取列的最大公约数，没有数据的列内容为 None
     ]
     temp_df = temp_df[
         list(
             filter(
                 lambda x: re.search(pattern="[\u4e00-\u9fa5]", string=x),
                 temp_df.columns,
-            )  # 过滤temp_df，留下包含汉字的列
+            )  # 过滤 temp_df，留下包含汉字的列
         )
     ]
     temp_df = temp_df.T.reset_index()
     temp_df.columns = ["item", "value"]
     temp_df.loc[temp_df["item"] == "时间", "value"] = temp_df.loc[
         temp_df["item"] == "时间", "value"
-    ].apply(lambda x: _convert_timestamp(int(x)))
+    ].apply(lambda x: _convert_timestamp(int(x)) if x and not pd.isna(x) else None)
+    temp_df.loc[temp_df["item"] == "发行日期", "value"] = temp_df.loc[
+        temp_df["item"] == "发行日期", "value"
+    ].apply(lambda x: _convert_timestamp(int(x)) if x and not pd.isna(x) else None)
     return temp_df
 
 
@@ -127,7 +130,7 @@ if __name__ == "__main__":
     stock_individual_spot_xq_df = stock_individual_spot_xq(symbol="BJ430139")
     print(stock_individual_spot_xq_df)
 
-    stock_individual_spot_xq_df = stock_individual_spot_xq(symbol="SH000001")
+    stock_individual_spot_xq_df = stock_individual_spot_xq(symbol="SH600000")
     print(stock_individual_spot_xq_df)
 
     stock_individual_spot_xq_df = stock_individual_spot_xq(symbol="SPY")

{akshare-1.16.72.dist-info → akshare-1.16.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.16.72
+Version: 1.16.74
 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
@@ -77,7 +77,7 @@ Dynamic: summary
 
 ## Overview
 
-[AKShare](https://github.com/akfamily/akshare) requires Python(64 bit) 3.8 or higher and
+[AKShare](https://github.com/akfamily/akshare) requires Python(64 bit) 3.9 or higher and
 aims to simplify the process of fetching financial data.
 
 **Write less, get more!**

{akshare-1.16.72.dist-info → akshare-1.16.74.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=kt2BaKIHmNVpmZnahmD8c09mSJwt3FLIcNl2oRBmUrI,192994
+akshare/__init__.py,sha256=GETa9Iz3oavYSlOF3VyySSiywwYFniUgskIs7_cdLlc,193102
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -238,7 +238,7 @@ akshare/stock/cons.py,sha256=pAMixwmjYARzCVWIxN7RjhjnJMpvLR2OD6mZ-zI7jlM,42990
 akshare/stock/stock_allotment_cninfo.py,sha256=OVjVdWp2XVRNbJvVgtgVVoBmPBJgBB4RyIIgA_9QHM8,6066
 akshare/stock/stock_ask_bid_em.py,sha256=bo7VNkp1PmK4Z-GPZuVn_I-IAdzeW8cs3W_75KodxCg,3368
 akshare/stock/stock_board_concept_em.py,sha256=7dIwfF73XrRe1XOj9Q4pvb-X_KXR7CxPQqPziD5nqEU,17725
-akshare/stock/stock_board_industry_em.py,sha256=TgwarIh8jr4nCcm-Nap0KEIaw09-19HZTHBQNspuo8o,18362
+akshare/stock/stock_board_industry_em.py,sha256=9QfIxNb5EN5xOYEVXcKr1sQVrpt9muSnc7JhTP1Chco,18396
 akshare/stock/stock_cg_equity_mortgage.py,sha256=Pui5aWKKPwGuKjF_GNpejDzsMGNPrxiaJviLz3x2e9I,3426
 akshare/stock/stock_cg_guarantee.py,sha256=ts7qcQhhyN1PHB7Q4XlMn38HhfVvubOvky9RZfmUP94,3844
 akshare/stock/stock_cg_lawsuit.py,sha256=6Y92pPw0JgyrInteqHuU07G1jwmdX2wjaDtrJN8y6Hg,4129
@@ -281,7 +281,7 @@ akshare/stock/stock_us_js.py,sha256=VleGUb7K-NjmW3jMPRc2jwHXM0CMq4IzVM9kUpwURDQ,
 akshare/stock/stock_us_pink.py,sha256=b48o56E6Ur1Z_50gPvaZo8ZyegePwVJs8z8KMSqHg0U,3035
 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=pwJ_MmTDPTrTfOYy4WGIzXVSIOnTm1xjbIHvrR0jgvs,4639
+akshare/stock/stock_xq.py,sha256=KgUxqDVtQJNrRPgBfDDTJdmeSrPKZXRDz_CcJY3iwFE,4887
 akshare/stock/stock_zh_a_sina.py,sha256=-LbBNkqs2i_AAJ77PylfgXRK26pjResCHfM35_n-7G8,18907
 akshare/stock/stock_zh_a_special.py,sha256=E2BU73FLyOC-3LcXiLEVQosZ6Vvu6sIgo-Ee66kzzTM,10079
 akshare/stock/stock_zh_a_tick_tx.py,sha256=-HOilipACz-FEZWlkSXy9lH8A-BpNzuLDcXr_Rv6dYQ,2230
@@ -394,10 +394,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.16.72.dist-info/licenses/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.16.74.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.16.72.dist-info/METADATA,sha256=W7hDdCzuMn-2gYrlttwycMop9p29BpE4qHcNGc6CVbo,12591
-akshare-1.16.72.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-akshare-1.16.72.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.16.72.dist-info/RECORD,,
+akshare-1.16.74.dist-info/METADATA,sha256=xEl6hfjjSaQQ_VxHt6De4SqyPBAY3i621unA4EqGu_U,12591
+akshare-1.16.74.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+akshare-1.16.74.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.16.74.dist-info/RECORD,,