akshare 1.13.46__py3-none-any.whl → 1.17.99__py3-none-any.whl

akshare/datasets.py

@@ -1,24 +1,19 @@
 # -*- coding:utf-8 -*-
 # !/usr/bin/env python
 """
-Date: 2023/9/24 16:08
+Date: 2024/12/30 15:30
 Desc: 导入文件工具，可以正确处理路径问题
 """
+
 import pathlib
 from importlib import resources
 
 
 def get_ths_js(file: str = "ths.js") -> pathlib.Path:
-    """Get path to data "ths.js" text file.
-
-    Returns
-    -------
-    pathlib.PosixPath
-        Path to file.
-
-    References
-    ----------
-    .. [1] E.A.Abbott, ”Flatland”, Seeley & Co., 1884.
+    """
+    get path to data "ths.js" text file.
+    :return: 文件路径
+    :rtype: pathlib.Path
     """
     with resources.path("akshare.data", file) as f:
         data_file_path = f
@@ -26,16 +21,10 @@ def get_ths_js(file: str = "ths.js") -> pathlib.Path:
 
 
 def get_crypto_info_csv(file: str = "crypto_info.zip") -> pathlib.Path:
-    """Get path to data "ths.js" text file.
-
-    Returns
-    -------
-    pathlib.PosixPath
-        Path to file.
-
-    References
-    ----------
-    .. [1] E.A.Abbott, ”Flatland”, Seeley & Co., 1884.
+    """
+    get path to data "ths.js" text file.
+    :return: 文件路径
+    :rtype: pathlib.Path
     """
     with resources.path("akshare.data", file) as f:
         data_file_path = f

akshare/economic/cons.py

@@ -4,6 +4,7 @@
 Date: 2019/10/21 21:11
 Desc: 宏观经济配置文件
 """
+
 # urls-china
 JS_CHINA_CPI_YEARLY_URL = (
     "https://cdn.jin10.com/dc/reports/dc_chinese_cpi_yoy_all.js?v={}&_={}"
@@ -24,7 +25,9 @@ JS_CHINA_GDP_YEARLY_URL = (
     "https://cdn.jin10.com/dc/reports/dc_chinese_gdp_yoy_all.js?v={}&_={}"
 )
 JS_CHINA_CX_PMI_YEARLY_URL = "https://cdn.jin10.com/dc/reports/dc_chinese_caixin_manufacturing_pmi_all.js?v={}&_={}"
-JS_CHINA_CX_SERVICE_PMI_YEARLY_URL = "https://cdn.jin10.com/dc/reports/dc_chinese_caixin_services_pmi_all.js?v={}&_={}"
+JS_CHINA_CX_SERVICE_PMI_YEARLY_URL = (
+    "https://cdn.jin10.com/dc/reports/dc_chinese_caixin_services_pmi_all.js?v={}&_={}"
+)
 JS_CHINA_FX_RESERVES_YEARLY_URL = (
     "https://cdn.jin10.com/dc/reports/dc_chinese_fx_reserves_all.js?v={}&_={}"
 )
@@ -35,8 +38,12 @@ JS_CHINA_NON_MAN_PMI_MONTHLY_URL = (
     "https://cdn.jin10.com/dc/reports/dc_chinese_non_manufacturing_pmi_all.js?v={}&_={}"
 )
 JS_CHINA_RMB_DAILY_URL = "https://cdn.jin10.com/dc/reports/dc_rmb_data_all.js?v={}&_={}"
-JS_CHINA_MARKET_MARGIN_SZ_URL = "https://cdn.jin10.com/dc/reports/dc_market_margin_sz_all.js?v={}&_={}"
-JS_CHINA_MARKET_MARGIN_SH_URL = "https://cdn.jin10.com/dc/reports/dc_market_margin_sse_all.js?v={}&_={}"
+JS_CHINA_MARKET_MARGIN_SZ_URL = (
+    "https://cdn.jin10.com/dc/reports/dc_market_margin_sz_all.js?v={}&_={}"
+)
+JS_CHINA_MARKET_MARGIN_SH_URL = (
+    "https://cdn.jin10.com/dc/reports/dc_market_margin_sse_all.js?v={}&_={}"
+)
 JS_CHINA_REPORT_URL = "https://cdn.jin10.com/dc/reports/dc_sge_report_all.js?v={}&_={}"
 
 # urls-usa

akshare/economic/macro_australia.py

@@ -1,15 +1,14 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2022/11/27 20:26
+Date: 2025/1/17 15:30
 Desc: 东方财富-经济数据-澳大利亚
 https://data.eastmoney.com/cjsj/foreign_5_0.html
 """
+
 import pandas as pd
 import requests
 
-from akshare.utils import demjson
-
 
 # 零售销售月率
 def macro_australia_retail_rate_monthly() -> pd.DataFrame:
@@ -33,7 +32,6 @@ def macro_australia_retail_rate_monthly() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -47,18 +45,19 @@ def macro_australia_retail_rate_monthly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -84,7 +83,6 @@ def macro_australia_trade() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -98,17 +96,19 @@ def macro_australia_trade() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -134,7 +134,6 @@ def macro_australia_unemployment_rate() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -148,17 +147,19 @@ def macro_australia_unemployment_rate() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -184,7 +185,6 @@ def macro_australia_ppi_quarterly() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -198,17 +198,19 @@ def macro_australia_ppi_quarterly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -216,7 +218,7 @@ def macro_australia_ppi_quarterly() -> pd.DataFrame:
 def macro_australia_cpi_quarterly() -> pd.DataFrame:
     """
     东方财富-经济数据-澳大利亚-消费者物价指数季率
-    http://data.eastmoney.com/cjsj/foreign_5_4.html
+    https://data.eastmoney.com/cjsj/foreign_5_4.html
     :return: 消费者物价指数季率
     :rtype: pandas.DataFrame
     """
@@ -234,7 +236,6 @@ def macro_australia_cpi_quarterly() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -248,17 +249,19 @@ def macro_australia_cpi_quarterly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -284,7 +287,6 @@ def macro_australia_cpi_yearly() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -298,17 +300,19 @@ def macro_australia_cpi_yearly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -334,7 +338,6 @@ def macro_australia_bank_rate() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -348,21 +351,23 @@ def macro_australia_bank_rate() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     macro_australia_retail_rate_monthly_df = macro_australia_retail_rate_monthly()
     print(macro_australia_retail_rate_monthly_df)