akshare 1.16.92__py3-none-any.whl → 1.16.94__py3-none-any.whl

akshare/__init__.py

@@ -3100,9 +3100,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.90 fix: fix stock_hk_company_profile_em interface
 1.16.91 fix: fix stock_sse_deal_daily interface
 1.16.92 fix: fix bond_cb_jsl interface
+1.16.93 fix: fix stock_hsgt_individual_em interface
+1.16.94 fix: fix futures_fees_info interface
 """
 
-__version__ = "1.16.92"
+__version__ = "1.16.94"
 __author__ = "AKFamily"
 
 import sys

akshare/futures/futures_comm_ctp.py

@@ -23,7 +23,7 @@ def futures_fees_info() -> pd.DataFrame:
     """
     url = "http://openctp.cn/fees.html"
     r = requests.get(url)
-    r.encoding = "gb2312"
+    r.encoding = "utf-8"
     soup = BeautifulSoup(r.text, features="lxml")
     datetime_str = soup.find("p").string.strip("Generated at ").strip(".")
     datetime_raw = datetime.strptime(datetime_str, "%Y-%m-%d %H:%M:%S")

akshare/stock_feature/stock_hsgt_em.py

@@ -1327,12 +1327,12 @@ def stock_hsgt_board_rank_em(
     return temp_df
 
 
-def stock_hsgt_individual_em(stock: str = "002008") -> pd.DataFrame:
+def __stock_hsgt_individual_zh_hk_em(symbol: str = "00700") -> pd.DataFrame:
     """
     东方财富-数据中心-沪深港通-沪深港通持股-具体股票
-    https://data.eastmoney.com/hsgtcg/StockHdStatistics/002008.html
-    :param stock: 股票代码
-    :type stock: str
+    https://data.eastmoney.com/hsgt/StockHdDetail/00700.html
+    :param symbol: 股票代码
+    :type symbol: str
     :return: 具体股票-沪深港通持股
     :rtype: pandas.DataFrame
     """
@@ -1342,15 +1342,28 @@ def stock_hsgt_individual_em(stock: str = "002008") -> pd.DataFrame:
         "sortTypes": "-1",
         "pageSize": "500",
         "pageNumber": "1",
-        "reportName": "RPT_MUTUAL_HOLDSTOCKNORTH_STA",
+        "reportName": "RPT_MUTUAL_STOCK_HOLDRANKS",
         "columns": "ALL",
         "source": "WEB",
         "client": "WEB",
-        "filter": f"""(SECURITY_CODE="{stock}")(TRADE_DATE>='2020-07-25')""",
+        "filter": f"""(SECUCODE="{symbol}.HK")(MUTUAL_TYPE="002")""",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
+    total_page = data_json["result"]["pages"]
     temp_df = pd.DataFrame(data_json["result"]["data"])
+    for page in range(1, total_page + 1):
+        params.update({"pageNumber": str(page)})
+        r = requests.get(url, params=params)
+        data_json = r.json()
+        if page == 1:
+            temp_df = pd.DataFrame(data_json["result"]["data"])
+        else:
+            temp_df = pd.concat(
+                objs=[temp_df, pd.DataFrame(data_json["result"]["data"])],
+                ignore_index=True,
+            )
+
     temp_df.rename(
         columns={
             "SECURITY_INNER_CODE": "-",
@@ -1403,9 +1416,118 @@ def stock_hsgt_individual_em(stock: str = "002008") -> pd.DataFrame:
     temp_df["持股市值变化-10日"] = pd.to_numeric(
         temp_df["持股市值变化-10日"], errors="coerce"
     )
+    temp_df.sort_values("持股日期", ignore_index=True, inplace=True)
+    return temp_df
+
+
+def __stock_hsgt_individual_zh_a_em(symbol: str = "002008") -> pd.DataFrame:
+    """
+    东方财富-数据中心-沪深港通-沪深港通持股-具体股票
+    https://data.eastmoney.com/hsgt/StockHdStatistics/002008.html
+    :param symbol: 股票代码
+    :type symbol: str
+    :return: 具体股票-沪深港通持股
+    :rtype: pandas.DataFrame
+    """
+    url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
+    params = {
+        "sortColumns": "TRADE_DATE",
+        "sortTypes": "-1",
+        "pageSize": "500",
+        "pageNumber": "1",
+        "reportName": "RPT_MUTUAL_HOLDSTOCKNDATE_STA",
+        "columns": "ALL",
+        "source": "WEB",
+        "client": "WEB",
+        "filter": f"""(SECURITY_CODE="{symbol}")(INTERVAL_TYPE="1")""",
+    }
+    r = requests.get(url, params=params)
+    data_json = r.json()
+    total_page = data_json["result"]["pages"]
+    temp_df = pd.DataFrame(data_json["result"]["data"])
+    for page in range(1, total_page + 1):
+        params.update({"pageNumber": str(page)})
+        r = requests.get(url, params=params)
+        data_json = r.json()
+        if page == 1:
+            temp_df = pd.DataFrame(data_json["result"]["data"])
+        else:
+            temp_df = pd.concat(
+                objs=[temp_df, pd.DataFrame(data_json["result"]["data"])],
+                ignore_index=True,
+            )
+
+    temp_df.rename(
+        columns={
+            "SECURITY_INNER_CODE": "-",
+            "SECUCODE": "-",
+            "TRADE_DATE": "持股日期",
+            "SECURITY_CODE": "-",
+            "SECURITY_NAME": "-",
+            "MUTUAL_TYPE": "-",
+            "CHANGE_RATE": "当日涨跌幅",
+            "CLOSE_PRICE": "当日收盘价",
+            "HOLD_SHARES": "持股数量",
+            "HOLD_MARKET_CAP": "持股市值",
+            "A_SHARES_RATIO": "-",
+            "HOLD_SHARES_RATIO": "持股数量占A股百分比",
+            "FREE_SHARES_RATIO": "-",
+            "TOTAL_SHARES_RATIO": "-",
+            "HMC_CHANGE": "今日持股市值变化",
+            "ADD_SHARES_REPAIR": "今日增持股数",
+            "PREDICT_AMC": "今日增持资金",
+        },
+        inplace=True,
+    )
+    temp_df = temp_df[
+        [
+            "持股日期",
+            "当日收盘价",
+            "当日涨跌幅",
+            "持股数量",
+            "持股市值",
+            "持股数量占A股百分比",
+            "今日增持股数",
+            "今日增持资金",
+            "今日持股市值变化",
+        ]
+    ]
+    temp_df["持股日期"] = pd.to_datetime(temp_df["持股日期"], errors="coerce").dt.date
+    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["持股数量占A股百分比"] = pd.to_numeric(
+        temp_df["持股数量占A股百分比"], 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.sort_values("持股日期", ignore_index=True, inplace=True)
     return temp_df
 
 
+def stock_hsgt_individual_em(symbol: str = "002008") -> pd.DataFrame:
+    """
+    东方财富-数据中心-沪深港通-沪深港通持股-具体股票
+    https://data.eastmoney.com/hsgt/StockHdDetail/002008.html
+    :param symbol: 股票代码
+    :type symbol: str
+    :return: 具体股票-沪深港通持股
+    :rtype: pandas.DataFrame
+    """
+    if len(symbol) == 6:
+        return __stock_hsgt_individual_zh_a_em(symbol=symbol)
+    else:
+        return __stock_hsgt_individual_zh_hk_em(symbol=symbol)
+
+
 def stock_hsgt_individual_detail_em(
     symbol: str = "002008",
     start_date: str = "20220130",
@@ -1591,7 +1713,7 @@ if __name__ == "__main__":
     )
     print(stock_hsgt_board_rank_em_df)
 
-    stock_hsgt_individual_em_df = stock_hsgt_individual_em(stock="002008")
+    stock_hsgt_individual_em_df = stock_hsgt_individual_em(symbol="00700")
     print(stock_hsgt_individual_em_df)
 
     stock_hsgt_individual_detail_em_df = stock_hsgt_individual_detail_em(

{akshare-1.16.92.dist-info → akshare-1.16.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.16.92
+Version: 1.16.94
 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.16.92.dist-info → akshare-1.16.94.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=pgqQdoKXjY_ze35wg9svtl_n7R9M3Ac6GvR12YKJUdw,193932
+akshare/__init__.py,sha256=yqQRNhtd-YzcitCzBRLeF6ikmyi84MLohrAJlcoZQtw,194029
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -111,7 +111,7 @@ akshare/futures/cons.py,sha256=SO11mUW9n0K3wVDwkUmqJepD4XL-1-MEBbsfdqrNnlA,17540
 akshare/futures/cot.py,sha256=GptYlcw4lyHOhW8M5hW55sNMk_fz3swjikhaSJqAmYo,58624
 akshare/futures/futures_basis.py,sha256=pmXNXdWnfvJCRs6xKJ0Ed9R2v92-NK2Sp3AjlwecErc,15691
 akshare/futures/futures_comex_em.py,sha256=NPwOCD6lZUDL4wlGxvbmmJIFkQlW427ERO0vTux13WU,3172
-akshare/futures/futures_comm_ctp.py,sha256=V8TEKO0R0i6LfE8DDFqrMA3JGwNlpmaQCvvMugKZ1I8,1004
+akshare/futures/futures_comm_ctp.py,sha256=IyVRCUvhLTFzmcUVvlIaYZ1e38ll7AF8ExhgtXKuzrI,1003
 akshare/futures/futures_comm_qihuo.py,sha256=uQfabZ63qME8sTaxUbIUVQBVi8yTaPPDhD7voR9PEx0,10504
 akshare/futures/futures_contract_detail.py,sha256=Glm1x72WBwF4G-f_ZYzHsbNhlQ6Ti1HeF0Rzhx-pfFg,1190
 akshare/futures/futures_daily_bar.py,sha256=pultXs8digLfWT0dzyWs0AtFk3Fi2uZDT-zxbg_PcOM,25299
@@ -326,7 +326,7 @@ akshare/stock_feature/stock_hist_em.py,sha256=4WN44TUCdjjxVyhMbvQG3Ttm2ShG3_kh5X
 akshare/stock_feature/stock_hist_tx.py,sha256=T3eegWWohahHzsFOx58qJFLq9QQRUiDXEaiJdQLkex0,3346
 akshare/stock_feature/stock_hk_valuation_baidu.py,sha256=_sErx4UhNsSXJgXyPfrL0aPxkW53Mg1zH9gEKoziaCA,1968
 akshare/stock_feature/stock_hot_xq.py,sha256=P4-fLjrh-9CdVe5BQ2O5hmeSesHQAu9E49aMKmhMedM,9023
-akshare/stock_feature/stock_hsgt_em.py,sha256=qdR2ZqnrVgAukZ3SdU59b8em2Ki2qxiqfDc121Wnl8M,57638
+akshare/stock_feature/stock_hsgt_em.py,sha256=6X4izxAbApHIO1YK2nYaZCE1hdn18tTbGjJta4Q-7a0,62222
 akshare/stock_feature/stock_hsgt_exchange_rate.py,sha256=dSNtqVUyySIqfBu9U5TiDZOETwb2fcO6Y16vLc67c0w,7152
 akshare/stock_feature/stock_hsgt_min_em.py,sha256=DBNrZwbbR_XoGvGHvi-vexWsBq1Ddio8qe0L9ck0iqY,2841
 akshare/stock_feature/stock_info.py,sha256=JSmJWrSzzq4sP4CgOU0mYGVcbXeWlRDQxNYtbSjJmiM,9043
@@ -391,10 +391,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.92.dist-info/licenses/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.16.94.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.92.dist-info/METADATA,sha256=wkydrCZ8ttmlad1WBR1yR8GYjRtS0s1ghWDzNK5LU30,11902
-akshare-1.16.92.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-akshare-1.16.92.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.16.92.dist-info/RECORD,,
+akshare-1.16.94.dist-info/METADATA,sha256=YFcrPxnL-Y09BjxXlLWe7afvg6SUPit5Bezu6BoHmqE,11902
+akshare-1.16.94.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+akshare-1.16.94.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.16.94.dist-info/RECORD,,

{akshare-1.16.92.dist-info → akshare-1.16.94.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any