akshare 1.14.34__tar.gz → 1.14.36__tar.gz

{akshare-1.14.34 → akshare-1.14.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.34
+Version: 1.14.36
 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.34 → akshare-1.14.36}/akshare/__init__.py

@@ -2844,10 +2844,12 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.14.31 fix: fix option_shfe_daily interface
 1.14.32 add: add stock_concept_cons_futu interface
 1.14.33 fix: fix stock_concept_cons_futu interface
-1.14.34 fix: fix macro_rmb_loan interface
+1.14.34 add: add macro_rmb_loan interface
+1.14.35 add: add macro_rmb_deposit interface
+1.14.36 fix: fix option_czce_daily interface
 """
 
-__version__ = "1.14.34"
+__version__ = "1.14.36"
 __author__ = "AKFamily"
 
 import sys
@@ -2872,7 +2874,7 @@ del sys
 """
 同花顺-数据中心-宏观数据-股票筹资
 """
-from akshare.economic.macro_finance_ths import macro_stock_finance, macro_rmb_loan
+from akshare.economic.macro_finance_ths import macro_stock_finance, macro_rmb_loan, macro_rmb_deposit
 
 """
 富途牛牛-主题投资-概念板块-成分股

{akshare-1.14.34 → akshare-1.14.36}/akshare/economic/macro_finance_ths.py

@@ -77,9 +77,57 @@ def macro_rmb_loan() -> pd.DataFrame:
     return temp_df
 
 
+def macro_rmb_deposit() -> pd.DataFrame:
+    """
+    同花顺-数据中心-宏观数据-人民币存款余额
+    https://data.10jqka.com.cn/macro/rmb/
+    :return: 人民币存款余额
+    :rtype: pandas.DataFrame
+    """
+    url = "https://data.10jqka.com.cn/macro/rmb/"
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36"
+    }
+    r = requests.get(url, headers=headers)
+    temp_df = pd.read_html(StringIO(r.text), skiprows=0)[0]
+    temp_df.columns = [
+        "月份",
+        "新增存款-数量",
+        "新增存款-同比",
+        "新增存款-环比",
+        "新增企业存款-数量",
+        "新增企业存款-同比",
+        "新增企业存款-环比",
+        "新增储蓄存款-数量",
+        "新增储蓄存款-同比",
+        "新增储蓄存款-环比",
+        "新增其他存款-数量",
+        "新增其他存款-同比",
+        "新增其他存款-环比",
+    ]
+    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["新增其他存款-数量"] = pd.to_numeric(
+        temp_df["新增其他存款-数量"], errors="coerce"
+    )
+    return temp_df
+
+
 if __name__ == "__main__":
     macro_stock_finance_df = macro_stock_finance()
     print(macro_stock_finance_df)
 
     macro_rmb_loan_df = macro_rmb_loan()
     print(macro_rmb_loan_df)
+
+    macro_rmb_deposit_df = macro_rmb_deposit()
+    print(macro_rmb_deposit_df)

{akshare-1.14.34 → akshare-1.14.36}/akshare/option/option_commodity.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/11/17 17:00
+Date: 2024/7/19 14:00
 Desc: 商品期权数据
 说明：
 (1) 价格：自2019年12月02日起，纤维板报价单位由元/张改为元/立方米
@@ -144,10 +144,11 @@ def option_czce_daily(
 ) -> pd.DataFrame:
     """
     郑州商品交易所-期权-日频行情数据
-
+    http://www.czce.com.cn/cn/sspz/dejbqhqq/H770227index_1.htm#tabs-2
     :param trade_date: 交易日
     :type trade_date: str
-    :param symbol: choice of {"白糖期权", "棉花期权", "甲醇期权", "PTA期权", "菜籽粕期权", "动力煤期权", "菜籽油期权", "花生期权"}
+    :param symbol: choice of {"白糖期权", "棉花期权", "甲醇期权", "PTA期权",  "菜籽粕期权", "动力煤期权", "短纤期权",
+    "菜籽油期权", "花生期权", "棉花期权", "短纤期权", "纯碱期权", "锰硅期权", "硅铁期权", "尿素期权", "对二甲苯期权", "烧碱期权", "玻璃期权"}
     :type symbol: str
     :return: 日频行情数据
     :rtype: pandas.DataFrame
@@ -157,7 +158,7 @@ def option_czce_daily(
     if day.strftime("%Y%m%d") not in calendar:
         warnings.warn("{}非交易日".format(day.strftime("%Y%m%d")))
         return pd.DataFrame()
-    if day > datetime.date(2010, 8, 24):
+    if day > datetime.date(year=2010, month=8, day=24):
         url = CZCE_DAILY_OPTION_URL_3.format(day.strftime("%Y"), day.strftime("%Y%m%d"))
         try:
             r = requests.get(url)
@@ -215,6 +216,22 @@ def option_czce_daily(
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("UR")]
                 temp_df.reset_index(inplace=True, drop=True)
                 return temp_df.iloc[:-1, :]
+            elif symbol == "对二甲苯期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("PX")]
+                temp_df.reset_index(inplace=True, drop=True)
+                return temp_df.iloc[:-1, :]
+            elif symbol == "烧碱期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("SH")]
+                temp_df.reset_index(inplace=True, drop=True)
+                return temp_df.iloc[:-1, :]
+            elif symbol == "玻璃期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("FG")]
+                temp_df.reset_index(inplace=True, drop=True)
+                return temp_df.iloc[:-1, :]
+            elif symbol == "短纤期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("PF")]
+                temp_df.reset_index(inplace=True, drop=True)
+                return temp_df.iloc[:-1, :]
             else:
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("AP")]
                 temp_df.reset_index(inplace=True, drop=True)
@@ -485,7 +502,7 @@ def option_gfex_vol_daily(symbol: str = "碳酸锂", trade_date: str = "20230724
 
 
 if __name__ == "__main__":
-    option_czce_daily_df = option_czce_daily(symbol="动力煤期权", trade_date="20220808")
+    option_czce_daily_df = option_czce_daily(symbol="短纤期权", trade_date="20240718")
     print(option_czce_daily_df)
 
     option_dce_daily_one, option_dce_daily_two = option_dce_daily(

{akshare-1.14.34 → akshare-1.14.36}/akshare/stock_feature/stock_board_industry_ths.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/7/16 22:30
+Date: 2024/7/19 14:20
 Desc: 同花顺-板块-行业板块
 https://q.10jqka.com.cn/thshy/
 """
@@ -117,6 +117,8 @@ def stock_board_industry_name_ths() -> pd.DataFrame:
         "881180": "石油加工贸易",
         "881181": "环保",
         "881182": "美容护理",
+        "881207": "元件",  # 20240719
+        "881266": "橡胶制品",  # 20240719
         "884001": "种子生产",
         "884002": "粮食种植",
         "884003": "其他种植业",
@@ -572,7 +574,7 @@ def stock_board_industry_summary_ths() -> pd.DataFrame:
         url = f"http://q.10jqka.com.cn/thshy/index/field/199112/order/desc/page/{page}/ajax/1/"
         r = requests.get(url, headers=headers)
         temp_df = pd.read_html(StringIO(r.text))[0]
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
 
     big_df.columns = [
         "序号",
@@ -604,7 +606,7 @@ if __name__ == "__main__":
     stock_board_industry_name_ths_df = stock_board_industry_name_ths()
     print(stock_board_industry_name_ths_df)
 
-    stock_board_industry_info_ths_df = stock_board_industry_info_ths(symbol="小家电")
+    stock_board_industry_info_ths_df = stock_board_industry_info_ths(symbol="橡胶制品")
     print(stock_board_industry_info_ths_df)
 
     stock_board_industry_index_ths_df = stock_board_industry_index_ths(

{akshare-1.14.34 → akshare-1.14.36}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.34
+Version: 1.14.36
 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