akshare 1.15.20__py3-none-any.whl → 1.15.22__py3-none-any.whl

akshare/__init__.py

@@ -2930,9 +2930,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.18 fix: fix stock_share_hold_change_sse indicator
 1.15.19 fix: fix stock_share_hold_change_szse indicator
 1.15.20 fix: fix rv_from_stock_zh_a_hist_min_em indicator
+1.15.21 fix: fix get_futures_daily indicator
+1.15.22 fix: fix air_quality_hebei indicator
 """
 
-__version__ = "1.15.20"
+__version__ = "1.15.22"
 __author__ = "AKFamily"
 
 import sys

akshare/air/air_hebei.py

@@ -15,70 +15,93 @@ https://110.249.223.67/publish
 发布单位：河北省环境应急与重污染天气预警中心 技术支持：中国科学院大气物理研究所 中科三清科技有限公司
 """
 
-from datetime import datetime
-
 import pandas as pd
 import requests
-from tqdm import tqdm
+from bs4 import BeautifulSoup
 
 
-def air_quality_hebei(symbol: str = "唐山市") -> pd.DataFrame:
+def air_quality_hebei() -> pd.DataFrame:
     """
     河北省空气质量预报信息发布系统-空气质量预报, 未来 6 天
-    https://110.249.223.67/publish/
-    :param symbol: choice of {'石家庄市', '唐山市', '秦皇岛市', '邯郸市', '邢台市', '保定市', '张家口市', '承德市', '沧州市', '廊坊市', '衡水市', '辛集市', '定州市'}
-    :type symbol: str
+    http://218.11.10.130:8080/#/application/home
     :return: city = "", 返回所有地区的数据; city="唐山市", 返回唐山市的数据
     :rtype: pandas.DataFrame
     """
-    url = (
-        "http://110.249.223.67/server/api/CityPublishInfo/GetProvinceAndCityPublishData"
-    )
-    params = {"publishDate": f"{datetime.today().strftime('%Y-%m-%d')} 16:00:00"}
-    r = requests.get(url, params=params)
-    json_data = r.json()
-    city_list = pd.DataFrame.from_dict(json_data["cityPublishDatas"], orient="columns")[
-        "CityName"
-    ].tolist()
-    outer_df = pd.DataFrame()
-    for i in tqdm(range(1, 7), leave=False):
-        inner_df = pd.DataFrame(
-            [item[f"Date{i}"] for item in json_data["cityPublishDatas"]],
-            index=city_list,
-        )
-        outer_df = pd.concat([outer_df, inner_df])
-    if symbol == "":
-        temp_df = outer_df.reset_index()
-        temp_df.columns = [
-            "city",
-            "date",
-            "pollutant",
-            "minAQI",
-            "maxAQI",
-            "level",
-        ]
-        temp_df["date"] = pd.to_datetime(temp_df["date"]).dt.date
-        temp_df["minaqi"] = pd.to_numeric(temp_df["minaqi"])
-        temp_df["maxaqi"] = pd.to_numeric(temp_df["maxaqi"])
-        return temp_df
-    else:
-        temp_df = outer_df.reset_index()
-        temp_df.columns = [
-            "city",
-            "date",
-            "pollutant",
-            "minaqi",
-            "maxaqi",
-            "level",
-        ]
-        temp_df["date"] = pd.to_datetime(temp_df["date"]).dt.date
-        temp_df["minaqi"] = pd.to_numeric(temp_df["minaqi"])
-        temp_df["maxaqi"] = pd.to_numeric(temp_df["maxaqi"])
-        temp_df = temp_df[temp_df["city"] == symbol]
-        temp_df.reset_index(inplace=True, drop=True)
-        return temp_df
+    url = "http://218.11.10.130:8080/api/hour/130000.xml"
+    r = requests.get(url)
+    soup = BeautifulSoup(r.content, features="xml")
+    data = []
+    cities = soup.find_all("City")
+    for city in cities:
+        pointers = city.find_all("Pointer")
+        for pointer in pointers:
+            row = {
+                "City": city.Name.text if city.Name else None,
+                "Region": pointer.Region.text if pointer.Region else None,
+                "Station": pointer.Name.text if pointer.Name else None,
+                "DateTime": pointer.DataTime.text if pointer.DataTime else None,
+                "AQI": pointer.AQI.text if pointer.AQI else None,
+                "Level": pointer.Level.text if pointer.Level else None,
+                "MaxPoll": pointer.MaxPoll.text if pointer.MaxPoll else None,
+                "Longitude": pointer.CLng.text if pointer.CLng else None,
+                "Latitude": pointer.CLat.text if pointer.CLat else None,
+            }
+            polls = pointer.find_all("Poll")
+            for poll in polls:
+                poll_name = poll.Name.text if poll.Name else None
+                poll_value = poll.Value.text if poll.Value else None
+                row[f"{poll_name}_Value"] = poll_value
+                row[f"{poll_name}_IAQI"] = poll.IAQI.text if poll.IAQI else None
+            data.append(row)
+
+    df = pd.DataFrame(data)
+    numeric_columns = ["AQI", "Longitude", "Latitude"] + [
+        col for col in df.columns if col.endswith("_Value") or col.endswith("_IAQI")
+    ]
+    for col in numeric_columns:
+        df[col] = pd.to_numeric(df[col], errors="coerce")
+
+    column_names = {
+        "City": "城市",
+        "Region": "区域",
+        "Station": "监测点",
+        "DateTime": "时间",
+        "Level": "空气质量等级",
+        "MaxPoll": "首要污染物",
+        "Longitude": "经度",
+        "Latitude": "纬度",
+        "SO2_Value": "二氧化硫_浓度",
+        "SO2_IAQI": "二氧化硫_IAQI",
+        "CO_Value": "一氧化碳_浓度",
+        "CO_IAQI": "一氧化碳_IAQI",
+        "NO2_Value": "二氧化氮_浓度",
+        "NO2_IAQI": "二氧化氮_IAQI",
+        "O3-1H_Value": "臭氧1小时_浓度",
+        "O3-1H_IAQI": "臭氧1小时_IAQI",
+        "O3-8H_Value": "臭氧8小时_浓度",
+        "O3-8H_IAQI": "臭氧8小时_IAQI",
+        "PM2.5_Value": "PM2.5_浓度",
+        "PM2.5_IAQI": "PM2.5_IAQI",
+        "PM10_Value": "PM10_浓度",
+        "PM10_IAQI": "PM10_IAQI",
+    }
+    df = df.rename(columns=column_names)
+    basic_columns = [
+        "城市",
+        "区域",
+        "监测点",
+        "时间",
+        "AQI",
+        "空气质量等级",
+        "首要污染物",
+        "经度",
+        "纬度",
+    ]
+    pollutant_columns = [col for col in df.columns if col not in basic_columns]
+    df = df[basic_columns + sorted(pollutant_columns)]
+    return df
 
 
 if __name__ == "__main__":
-    air_quality_hebei_df = air_quality_hebei(symbol="定州市")
+    air_quality_hebei_df = air_quality_hebei()
     print(air_quality_hebei_df)

akshare/futures/futures_daily_bar.py

@@ -668,11 +668,13 @@ def get_futures_daily(
     df_list = list()
     while start_date <= end_date:
         df = f(date=str(start_date).replace("-", ""))
-        if df is not None:
+        if not df.empty:
             df_list.append(df)
         start_date += datetime.timedelta(days=1)
 
-    if len(df_list) > 0:
+    if len(df_list) == 0:
+        return pd.DataFrame()
+    elif len(df_list) > 0:
         temp_df = pd.concat(df_list).reset_index(drop=True)
         temp_df = temp_df[~temp_df["symbol"].str.contains("efp")]
         return temp_df
@@ -680,7 +682,7 @@ def get_futures_daily(
 
 if __name__ == "__main__":
     get_futures_daily_df = get_futures_daily(
-        start_date="20240701", end_date="20240720", market="DCE"
+        start_date="20240101", end_date="20240101", market="DCE"
     )
     print(get_futures_daily_df)
 

{akshare-1.15.20.dist-info → akshare-1.15.22.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
-akshare/__init__.py,sha256=tm7bXNtip0j5OllX2lcHSm1FZsjin7eNbqvBsvU2Lbc,183707
+akshare/__init__.py,sha256=AXVv2_gqZdsjH1cyySkVhQP5U2Btx4t2ktLayHcBrwc,183797
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
 akshare/air/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
-akshare/air/air_hebei.py,sha256=xIXNGLK7IGYqrkteM9fxnHAwWqk6PCQs6D9-ggZ7byY,4442
+akshare/air/air_hebei.py,sha256=jFhsi41EfSGYpRUo98bvJ1oer1FPiQgw1grSrb_q5Yg,5415
 akshare/air/air_zhenqi.py,sha256=FurRxuYyoZpTa2lsP6BgUJfbfMgOO26_VPuc-ekKZXs,9636
 akshare/air/cons.py,sha256=v4TGVepsboZUpKgeuBdoSGlf7KVZPq783FfaXqtJNDA,9771
 akshare/air/crypto.js,sha256=0V4nL8-myB3vu9J-P3YEEg67Lw9ht-q9cS0odAuJsD0,8443
@@ -111,7 +111,7 @@ akshare/futures/futures_comex_em.py,sha256=V-mkKQkH5N8PyaZWKdyggb2lTnY8DDDxiUPt-
 akshare/futures/futures_comm_ctp.py,sha256=V8TEKO0R0i6LfE8DDFqrMA3JGwNlpmaQCvvMugKZ1I8,1004
 akshare/futures/futures_comm_qihuo.py,sha256=uQfabZ63qME8sTaxUbIUVQBVi8yTaPPDhD7voR9PEx0,10504
 akshare/futures/futures_contract_detail.py,sha256=auwzNdaoFi5hoJY6rNkO54v5FD2gmEkQu7B90yEDtkc,1175
-akshare/futures/futures_daily_bar.py,sha256=1f9khe6IVGC34aon79uTAqlSseeZU5mES47hEXbG0EY,25225
+akshare/futures/futures_daily_bar.py,sha256=X3Lx2Bo_oeruLNSW1uGshuNTfDZd8a05p51J2966nOw,25281
 akshare/futures/futures_foreign.py,sha256=oSIoAg5oy-CIlPWHkQffcvZGu02Y2GWOrt-6aPA53Xg,2059
 akshare/futures/futures_hf_em.py,sha256=OEUltaq1LKabl9eTQoNxswnl1BLKpB27eiIHwbu_Rh4,3178
 akshare/futures/futures_hq_sina.py,sha256=eK1gEan4DPvpYmln8-tNnzh_J_733s95DBr--NqNYVA,9576
@@ -383,8 +383,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.15.20.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.20.dist-info/METADATA,sha256=cnW_OxqMeP9leLgv6cIn1SLeaI_y1-2BMh1S7EZ3r3A,14259
-akshare-1.15.20.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-akshare-1.15.20.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.20.dist-info/RECORD,,
+akshare-1.15.22.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.22.dist-info/METADATA,sha256=5kDb9qRTYO_boKapiejhKgm2GZUwl0WMEfIMa5_vB5k,14259
+akshare-1.15.22.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+akshare-1.15.22.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.22.dist-info/RECORD,,

{akshare-1.15.20.dist-info → akshare-1.15.22.dist-info}/WHEEL

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