akshare 1.14.82__py3-none-any.whl → 1.14.84__py3-none-any.whl

akshare/__init__.py

@@ -2893,9 +2893,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.14.80 fix: fix stock_hot_rank_wc interface
 1.14.81 fix: fix stock_hsgt_hist_em interface
 1.14.82 fix: fix stock_comment_detail_scrd_desire_daily_em interface
+1.14.83 fix: fix stock_comment_detail_zhpj_lspf_em interface
+1.14.84 fix: fix drewry_wci_index interface
 """
 
-__version__ = "1.14.82"
+__version__ = "1.14.84"
 __author__ = "AKFamily"
 
 import sys

akshare/index/index_drewry.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/9/30 15:30
+Date: 2024/9/26 18:00
 Desc: Drewry 集装箱指数
 https://www.drewry.co.uk/supply-chain-advisors/supply-chain-expertise/world-container-index-assessed-by-drewry
 https://infogram.com/world-container-index-1h17493095xl4zj
 """
+
 import pandas as pd
 import requests
 from bs4 import BeautifulSoup
@@ -17,7 +18,8 @@ def drewry_wci_index(symbol: str = "composite") -> pd.DataFrame:
     """
     Drewry 集装箱指数
     https://infogram.com/world-container-index-1h17493095xl4zj
-    :param symbol: choice of {"composite", "shanghai-rotterdam", "rotterdam-shanghai", "shanghai-los angeles", "los angeles-shanghai", "shanghai-genoa", "new york-rotterdam", "rotterdam-new york"}
+    :param symbol: choice of {"composite", "shanghai-rotterdam", "rotterdam-shanghai", "shanghai-los angeles",
+    "los angeles-shanghai", "shanghai-genoa", "new york-rotterdam", "rotterdam-new york"}
     :type symbol: str
     :return: Drewry 集装箱指数
     :rtype: pandas.DataFrame
@@ -34,24 +36,23 @@ def drewry_wci_index(symbol: str = "composite") -> pd.DataFrame:
     }
     url = "https://infogram.com/world-container-index-1h17493095xl4zj"
     r = requests.get(url)
-    soup = BeautifulSoup(r.text, "lxml")
+    soup = BeautifulSoup(r.text, features="lxml")
     data_text = soup.find_all("script")[-4].string.strip("window.infographicData=")[:-1]
     data_json = demjson.decode(data_text)
-    temp_df = pd.DataFrame(data_json["elements"][2]["data"][symbol_map[symbol]])
-    temp_df = temp_df.iloc[1:, :]
+    data_json_need = data_json["elements"]["content"]["content"]["entities"][
+        "7a55585f-3fb3-44e6-9b54-beea1cd20b4d"
+    ]["data"][symbol_map[symbol]]
+    date_list = [item[0]["value"] for item in data_json_need[1:]]
+    try:
+        value_list = [item[1]["value"] for item in data_json_need[1:]]
+    except TypeError:
+        value_list = [item[1]["value"] for item in data_json_need[1:-1]]
+    temp_df = pd.DataFrame([date_list, value_list]).T
     temp_df.columns = ["date", "wci"]
-    temp_df["date"] = [item["value"] for item in temp_df["date"]]
-    temp_df["wci"] = [item["value"] for item in temp_df["wci"]]
-    day = temp_df["date"].str.split("-", expand=True).iloc[:, 0].str.strip()
-    month = temp_df["date"].str.split("-", expand=True).iloc[:, 1].str.strip()
-    month = month.str.replace("July", "Jul")
-    year = temp_df["date"].str.split("-", expand=True).iloc[:, 2].str.strip()
-    temp_df["date"] = day + "-" + month + "-" + year
-    # 修正数据源中日期格式的错误
-    temp_df["date"] = temp_df["date"].str.replace("Sept", "Sep")
-    temp_df["date"] = pd.to_datetime(temp_df["date"], format="%d-%b-%y").dt.date
+    temp_df["date"] = pd.to_datetime(
+        temp_df["date"], format="%d-%b-%y", errors="coerce"
+    ).dt.date
     temp_df["wci"] = pd.to_numeric(temp_df["wci"], errors="coerce")
-    temp_df.reset_index(inplace=True, drop=True)
     return temp_df
 
 

akshare/stock_feature/stock_comment_em.py

@@ -28,7 +28,8 @@ def stock_comment_em() -> pd.DataFrame:
         "pageSize": "500",
         "pageNumber": "1",
         "reportName": "RPT_DMSK_TS_STOCKNEW",
-        "quoteColumns": "f2~01~SECURITY_CODE~CLOSE_PRICE,f8~01~SECURITY_CODE~TURNOVERRATE,f3~01~SECURITY_CODE~CHANGE_RATE,f9~01~SECURITY_CODE~PE_DYNAMIC",
+        "quoteColumns": "f2~01~SECURITY_CODE~CLOSE_PRICE,f8~01~SECURITY_CODE~TURNOVERRATE,"
+        "f3~01~SECURITY_CODE~CHANGE_RATE,f9~01~SECURITY_CODE~PE_DYNAMIC",
         "columns": "ALL",
         "filter": "",
         "token": "894050c76af8597a853f5b408b759f5d",
@@ -137,11 +138,11 @@ def stock_comment_detail_zlkp_jgcyd_em(symbol: str = "600000") -> pd.DataFrame:
     data_json = r.json()
     temp_df = pd.DataFrame(data_json["result"]["data"])
     temp_df = temp_df[["TRADE_DATE", "ORG_PARTICIPATE"]]
-    temp_df.columns = ["date", "value"]
-    temp_df["date"] = pd.to_datetime(temp_df["date"], errors="coerce").dt.date
-    temp_df.sort_values(["date"], inplace=True)
+    temp_df.columns = ["交易日", "机构参与度"]
+    temp_df["交易日"] = pd.to_datetime(temp_df["交易日"], errors="coerce").dt.date
+    temp_df.sort_values(["交易日"], inplace=True)
     temp_df.reset_index(inplace=True, drop=True)
-    temp_df["value"] = pd.to_numeric(temp_df["value"], errors="coerce") * 100
+    temp_df["机构参与度"] = pd.to_numeric(temp_df["机构参与度"], errors="coerce") * 100
     return temp_df
 
 
@@ -154,36 +155,31 @@ def stock_comment_detail_zhpj_lspf_em(symbol: str = "600000") -> pd.DataFrame:
     :return: 综合评价-历史评分
     :rtype: pandas.DataFrame
     """
-    url = f"https://data.eastmoney.com/stockcomment/api/{symbol}.json"
-    try_count = 10
-    data_json = None
-    while try_count:
-        try:
-            r = requests.get(url)
-            data_json = r.json()
-            break
-        except requests.exceptions.JSONDecodeError:
-            try_count -= 1
-            time.sleep(1)
-            continue
-    current_year = data_json["ApiResults"]["zhpj"]["ComprehensiveScoreRank1"][0][0][
-        "TradeDate"
-    ].split("/")[0]
-
-    temp_df = pd.DataFrame(
-        [
-            data_json["ApiResults"]["zhpj"]["HistoryScore"]["XData"],
-            data_json["ApiResults"]["zhpj"]["HistoryScore"]["Ydata"]["Score"],
-            data_json["ApiResults"]["zhpj"]["HistoryScore"]["Ydata"]["Price"],
-        ]
-    ).T
-    temp_df.columns = ["日期", "评分", "股价"]
-    temp_df["日期"] = current_year + "-" + temp_df["日期"]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], errors="coerce").dt.date
-    temp_df.sort_values(by=["日期"], inplace=True)
+    url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
+    params = {
+        "filter": f'(SECURITY_CODE="{symbol}")',
+        "columns": "ALL",
+        "source": "WEB",
+        "client": "WEB",
+        "reportName": "RPT_STOCK_HISTORYMARK",
+        "sortColumns": "DIAGNOSE_DATE",
+        "sortTypes": "1",
+    }
+    r = requests.get(url=url, params=params)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["result"]["data"])
+    temp_df.rename(
+        columns={
+            "TOTAL_SCORE": "评分",
+            "DIAGNOSE_DATE": "交易日",
+        },
+        inplace=True,
+    )
+    temp_df = temp_df[["交易日", "评分"]]
+    temp_df["交易日"] = pd.to_datetime(temp_df["交易日"], errors="coerce").dt.date
+    temp_df.sort_values(by=["交易日"], inplace=True)
     temp_df.reset_index(inplace=True, drop=True)
     temp_df["评分"] = pd.to_numeric(temp_df["评分"], errors="coerce")
-    temp_df["股价"] = pd.to_numeric(temp_df["股价"], errors="coerce")
     return temp_df
 
 

{akshare-1.14.82.dist-info → akshare-1.14.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.82
+Version: 1.14.84
 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.14.82.dist-info → akshare-1.14.84.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=YO9Udam6vO1ZAFhd8UC05cTlFrdL4plge5YA8Ue3_JY,181919
+akshare/__init__.py,sha256=siaAbZ64GnNdzkScy_hOfwhcG3zhBZGLWEgWtD90PLA,182024
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/air/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/air/air_hebei.py,sha256=xIXNGLK7IGYqrkteM9fxnHAwWqk6PCQs6D9-ggZ7byY,4442
@@ -158,7 +158,7 @@ akshare/index/index_cflp.py,sha256=iPn_0kePK74eScwC7rj0IhC-3w-kGQWtWlwsW-J0nbs,4
 akshare/index/index_cni.py,sha256=qravLXiETWlegIMV_EIUTDbGQfdC2zsj4LykWzC8Lko,8563
 akshare/index/index_cons.py,sha256=3jrDfdxhNr9c4NVsTVOyORZwKBFNUU8giERYoIKkUUY,7682
 akshare/index/index_cx.py,sha256=aAmsIKkswKFNOhAsW0QOhp-q6q1aFOSBtqcDaZhIh6A,16775
-akshare/index/index_drewry.py,sha256=PR38IXgKH5q_d5uli12Q_T4Y8cKlRO576uINehPWjgg,3175
+akshare/index/index_drewry.py,sha256=BM7V6P8K4QUFQArsdaWRu5qJUZaCoyNz97_b8dmLeCw,2937
 akshare/index/index_eri.py,sha256=7X0KNDBntEkE_qSb2jb6IBv-S8PsevLFdxGT8nKT3W0,2111
 akshare/index/index_fear_greed_funddb.py,sha256=7Z6GqYkKPJHNHMEN-uZNu2KnNNLTWvJcVlYpfAShJJc,2378
 akshare/index/index_hog.py,sha256=kb867BVagt70_ycZMn22ks5Z9jlVbMiuTsvq5ygjeig,1657
@@ -296,7 +296,7 @@ akshare/stock_feature/stock_analyst_em.py,sha256=Md3_G-Px0O1lk4dx5dCEKl8Vjgwt79S
 akshare/stock_feature/stock_board_industry_ths.py,sha256=bn4vPXaK_ybU-qUttQshnzFC1L_S9reO2OydmAt7sGI,12488
 akshare/stock_feature/stock_buffett_index_lg.py,sha256=NpNccHmGjtqLz6aUladB6InPzO2pjoImbgCgmNEYUuM,2027
 akshare/stock_feature/stock_classify_sina.py,sha256=Lg7ROG5W9HioFRplJI2rZ6tAAHM09N3g9qF6kReIQYI,3210
-akshare/stock_feature/stock_comment_em.py,sha256=JX_CanyJdHPr-tAEobOJegk0csikJqcykBdzrxFUNDs,14180
+akshare/stock_feature/stock_comment_em.py,sha256=xDq2a5j46VuqWHvB_WPZiv6NUZ4ln6dVxicYMGDNE_0,13947
 akshare/stock_feature/stock_concept_futu.py,sha256=jKJ9mfdJXgXwcMb3gVpbDl5ivr-zcMkuGO7jjgyA3os,6228
 akshare/stock_feature/stock_congestion_lg.py,sha256=iTEcmL0HoSqWGfxv_gSM-qA4O23aqUH7qHl9asDtoO0,1299
 akshare/stock_feature/stock_cyq_em.py,sha256=ijHL6BWGDLI8dctYQ4pYWDK2UHOSfn5mRu0c9E5zwp0,11017
@@ -380,8 +380,8 @@ akshare/utils/token_process.py,sha256=K4rGXjh_tgugbRcyOK2h2x0jP3PT65IIK7nxhUKhOe
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
 tests/__init__.py,sha256=gNzhlO0UPjFq6Ieb38kaVIODXv4cTDByrdohAZnDYt4,82
 tests/test_func.py,sha256=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.14.82.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.14.82.dist-info/METADATA,sha256=KcKXIUdRYEV1AvzrfsfGYiYCJgd0D0al40Z5sSzMcVc,14112
-akshare-1.14.82.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-akshare-1.14.82.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.14.82.dist-info/RECORD,,
+akshare-1.14.84.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.14.84.dist-info/METADATA,sha256=dQ1bPRyg9ju6jfQG2hSJhIVA-I7jQLjs20dPBY1Jm0s,14112
+akshare-1.14.84.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+akshare-1.14.84.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.14.84.dist-info/RECORD,,