akshare 1.12.99__py3-none-any.whl → 1.15.72__py3-none-any.whl

akshare/other/{other_car.py → other_car_gasgoo.py}

@@ -1,56 +1,18 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/1/20 23:00
-Desc: 乘联会
-https://data.cpcaauto.com/FuelMarket
-汽车行业制造企业数据库
-https://i.gasgoo.com/data/ranking
+Date: 2024/4/3 19:00
+Desc: 汽车行业制造企业数据库
+http://i.gasgoo.com/data/ranking
 """
+
 import pandas as pd
 import requests
 
 from akshare.utils import demjson
 
 
-def car_energy_sale_cpca() -> pd.DataFrame:
-    """
-    乘联会-新能源细分市场-整体市场
-    https://data.cpcaauto.com/FuelMarket
-    :return: 新能源细分市场-整体市场
-    :rtype: pandas.DataFrame
-    """
-    url = "http://data.cpcaauto.com/api/chartlist"
-    params = {"charttype": "6"}
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json[0]["dataList"])
-    temp_current_year_list = []
-    temp_previous_year_list = []
-    for item in data_json[0]["dataList"]:
-        temp_previous_year_list.append(item[temp_df.columns[2]])
-        try:
-            temp_current_year_list.append(item[temp_df.columns[1]])
-        except:
-            continue
-    temp_current_year_df = pd.DataFrame(temp_current_year_list)
-    temp_previous_year_df = pd.DataFrame(temp_previous_year_list)
-    big_df = pd.DataFrame(
-        [temp_current_year_df.iloc[:, 2], temp_previous_year_df.iloc[:, 2]]
-    ).T
-    big_df.columns = [temp_df.columns[1], temp_df.columns[2]]
-    big_df["月份"] = temp_df["month"]
-    big_df = big_df[
-        [
-            "月份",
-            temp_df.columns[2],
-            temp_df.columns[1],
-        ]
-    ]
-    return big_df
-
-
-def car_gasgoo_sale_rank(symbol: str = "车企榜", date: str = "202109") -> pd.DataFrame:
+def car_sale_rank_gasgoo(symbol: str = "车企榜", date: str = "202109") -> pd.DataFrame:
     """
     盖世汽车-汽车行业制造企业数据库-销量数据
     https://i.gasgoo.com/data/ranking
@@ -88,7 +50,8 @@ def car_gasgoo_sale_rank(symbol: str = "车企榜", date: str = "202109") -> pd.
         "Connection": "keep-alive",
         "Content-Length": "195",
         "Content-Type": "application/json; charset=UTF-8",
-        "Cookie": "Hm_lvt_8e90480b1bf68ede548c407057660718=1636981448; _ga=GA1.2.858318653.1636981449; _gid=GA1.2.1448165285.1636981449; _gat=1; Hm_lpvt_8e90480b1bf68ede548c407057660718=1636982578",
+        "Cookie": "Hm_lvt_8e90480b1bf68ede548c407057660718=1636981448; _ga=GA1.2.858318653.1636981449; "
+        "_gid=GA1.2.1448165285.1636981449; _gat=1; Hm_lpvt_8e90480b1bf68ede548c407057660718=1636982578",
         "Host": "i.gasgoo.com",
         "Origin": "https://i.gasgoo.com",
         "Pragma": "no-cache",
@@ -99,7 +62,8 @@ def car_gasgoo_sale_rank(symbol: str = "车企榜", date: str = "202109") -> pd.
         "Sec-Fetch-Dest": "empty",
         "Sec-Fetch-Mode": "cors",
         "Sec-Fetch-Site": "same-origin",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/95.0.4638.69 Safari/537.36",
         "X-Requested-With": "XMLHttpRequest",
     }
     r = requests.post(url, json=payload, headers=headers)
@@ -110,14 +74,11 @@ def car_gasgoo_sale_rank(symbol: str = "车企榜", date: str = "202109") -> pd.
 
 
 if __name__ == "__main__":
-    car_energy_sale_cpca_df = car_energy_sale_cpca()
-    print(car_energy_sale_cpca_df)
-
-    car_gasgoo_sale_rank_df = car_gasgoo_sale_rank(symbol="品牌榜", date="202311")
-    print(car_gasgoo_sale_rank_df)
+    car_sale_rank_gasgoo_df = car_sale_rank_gasgoo(symbol="品牌榜", date="202311")
+    print(car_sale_rank_gasgoo_df)
 
-    car_gasgoo_sale_rank_df = car_gasgoo_sale_rank(symbol="车型榜", date="202311")
-    print(car_gasgoo_sale_rank_df)
+    car_sale_rank_gasgoo_df = car_sale_rank_gasgoo(symbol="车型榜", date="202311")
+    print(car_sale_rank_gasgoo_df)
 
-    car_gasgoo_sale_rank_df = car_gasgoo_sale_rank(symbol="车企榜", date="202311")
-    print(car_gasgoo_sale_rank_df)
+    car_sale_rank_gasgoo_df = car_sale_rank_gasgoo(symbol="车企榜", date="202311")
+    print(car_sale_rank_gasgoo_df)

akshare/qdii/qdii_jsl.py

@@ -0,0 +1,233 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+"""
+Date: 2024/10/6 17:00
+Desc: 集思录-T+0 QDII
+集思录：https://www.jisilu.cn/data/qdii/#qdiie
+"""
+
+import pandas as pd
+
+from akshare.request import make_request_with_retry_json
+
+
+def qdii_e_index_jsl() -> pd.DataFrame:
+    """
+    集思录-T+0 QDII-欧美市场-欧美指数
+    https://www.jisilu.cn/data/qdii/#qdiia
+    :return: T+0 QDII-亚洲市场
+    :rtype: pandas.DataFrame
+    """
+    url = "https://www.jisilu.cn/data/qdii/qdii_list/E"
+    params = {
+        "___jsl": "LST___t=1728207798534",
+        "rp": "22",
+    }
+    data_json = make_request_with_retry_json(url, params)
+    temp_df = pd.DataFrame([item["cell"] for item in data_json["rows"]])
+    temp_df.rename(
+        columns={
+            "fund_id": "代码",
+            "fund_nm": "名称",
+            "price": "现价",
+            "increase_rt": "涨幅",
+            "volume": "成交",
+            "amount": "场内份额",
+            "amount_incr": "场内新增",
+            "fund_nav": "T-2净值",
+            "nav_dt": "净值日期",
+            "estimate_value": "T-1估值",
+            "last_est_dt": "估值日期",
+            "discount_rt": "T-1溢价率",
+            "index_nm": "相关标的",
+            "ref_increase_rt": "T-1指数涨幅",
+            "apply_fee": "申购费",
+            "redeem_fee": "赎回费",
+            "mt_fee": "托管费",
+            "issuer_nm": "基金公司",
+        },
+        inplace=True,
+    )
+    temp_df = temp_df[
+        [
+            "代码",
+            "名称",
+            "现价",
+            "涨幅",
+            "成交",
+            "场内份额",
+            "场内新增",
+            "T-2净值",
+            "净值日期",
+            "T-1估值",
+            "估值日期",
+            "T-1溢价率",
+            "相关标的",
+            "T-1指数涨幅",
+            "申购费",
+            "赎回费",
+            "托管费",
+            "基金公司",
+        ]
+    ]
+    temp_df["净值日期"] = pd.to_datetime(temp_df["净值日期"], errors="coerce").dt.date
+    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["T-2净值"] = pd.to_numeric(temp_df["T-2净值"], errors="coerce")
+    temp_df["T-1估值"] = pd.to_numeric(temp_df["T-1估值"], errors="coerce")
+    temp_df["托管费"] = pd.to_numeric(temp_df["托管费"], errors="coerce")
+    return temp_df
+
+
+def qdii_e_comm_jsl() -> pd.DataFrame:
+    """
+    集思录-T+0 QDII-欧美市场-商品
+    https://www.jisilu.cn/data/qdii/#qdiia
+    :return: T+0 QDII-欧美市场-商品
+    :rtype: pandas.DataFrame
+    """
+    url = "https://www.jisilu.cn/data/qdii/qdii_list/C"
+    params = {
+        "___jsl": "LST___t=1728207798534",
+        "rp": "22",
+    }
+    data_json = make_request_with_retry_json(url, params=params)
+    temp_df = pd.DataFrame([item["cell"] for item in data_json["rows"]])
+    temp_df.rename(
+        columns={
+            "fund_id": "代码",
+            "fund_nm": "名称",
+            "price": "现价",
+            "increase_rt": "涨幅",
+            "volume": "成交",
+            "amount": "场内份额",
+            "amount_incr": "场内新增",
+            "fund_nav": "T-2净值",
+            "nav_dt": "净值日期",
+            "estimate_value": "T-1估值",
+            "last_est_dt": "估值日期",
+            "discount_rt": "T-1溢价率",
+            "index_nm": "相关标的",
+            "ref_increase_rt": "T-1指数涨幅",
+            "apply_fee": "申购费",
+            "redeem_fee": "赎回费",
+            "mt_fee": "托管费",
+            "issuer_nm": "基金公司",
+        },
+        inplace=True,
+    )
+    temp_df = temp_df[
+        [
+            "代码",
+            "名称",
+            "现价",
+            "涨幅",
+            "成交",
+            "场内份额",
+            "场内新增",
+            "T-2净值",
+            "净值日期",
+            "T-1估值",
+            "估值日期",
+            "T-1溢价率",
+            "相关标的",
+            "T-1指数涨幅",
+            "申购费",
+            "赎回费",
+            "托管费",
+            "基金公司",
+        ]
+    ]
+    temp_df["净值日期"] = pd.to_datetime(temp_df["净值日期"], errors="coerce").dt.date
+    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["T-2净值"] = pd.to_numeric(temp_df["T-2净值"], errors="coerce")
+    temp_df["T-1估值"] = pd.to_numeric(temp_df["T-1估值"], errors="coerce")
+    temp_df["托管费"] = pd.to_numeric(temp_df["托管费"], errors="coerce")
+    return temp_df
+
+
+def qdii_a_index_jsl() -> pd.DataFrame:
+    """
+    集思录-T+0 QDII-亚洲市场-亚洲指数
+    https://www.jisilu.cn/data/qdii/#qdiia
+    :return: T+0 QDII-亚洲市场-亚洲指数
+    :rtype: pandas.DataFrame
+    """
+    url = "https://www.jisilu.cn/data/qdii/qdii_list/A"
+    params = {
+        "___jsl": "LST___t=1728206439242",
+        "rp": "22",
+    }
+    data_json = make_request_with_retry_json(url, params=params)
+    temp_df = pd.DataFrame([item["cell"] for item in data_json["rows"]])
+    temp_df.rename(
+        columns={
+            "fund_id": "代码",
+            "fund_nm": "名称",
+            "price": "现价",
+            "increase_rt": "涨幅",
+            "volume": "成交",
+            "amount": "场内份额",
+            "amount_incr": "场内新增",
+            "fund_nav": "净值",
+            "nav_dt": "净值日期",
+            "estimate_value": "估值",
+            "discount_rt": "溢价率",
+            "index_nm": "相关标的",
+            "ref_increase_rt": "指数涨幅",
+            "apply_fee": "申购费",
+            "redeem_fee": "赎回费",
+            "mt_fee": "托管费",
+            "issuer_nm": "基金公司",
+        },
+        inplace=True,
+    )
+
+    temp_df = temp_df[
+        [
+            "代码",
+            "名称",
+            "现价",
+            "涨幅",
+            "成交",
+            "场内份额",
+            "场内新增",
+            "净值",
+            "净值日期",
+            "估值",
+            "溢价率",
+            "相关标的",
+            "指数涨幅",
+            "申购费",
+            "赎回费",
+            "托管费",
+            "基金公司",
+        ]
+    ]
+    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["净值"] = 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__":
+    qdii_e_index_jsl_df = qdii_e_index_jsl()
+    print(qdii_e_index_jsl_df)
+
+    qdii_e_comm_jsl_df = qdii_e_comm_jsl()
+    print(qdii_e_comm_jsl_df)
+
+    qdii_a_index_jsl_df = qdii_a_index_jsl()
+    print(qdii_a_index_jsl_df)

akshare/request.py

@@ -0,0 +1,117 @@
+import time
+
+import requests
+from requests.exceptions import RequestException
+
+from akshare.exceptions import NetworkError, APIError, RateLimitError, DataParsingError
+from akshare.utils.context import config
+
+
+def make_request_with_retry_json(
+    url, params=None, headers=None, proxies=None, max_retries=3, retry_delay=1
+):
+    """
+    发送 HTTP GET 请求，支持重试机制和代理设置。
+
+    :param url: 请求的 URL
+    :param params: URL 参数 (可选)
+    :param headers: 请求头 (可选)
+    :param proxies: 代理设置 (可选)
+    :param max_retries: 最大重试次数
+    :param retry_delay: 初始重试延迟（秒）
+    :return: 解析后的 JSON 数据
+    """
+    if proxies is None:
+        proxies = config.proxies
+    for attempt in range(max_retries):
+        try:
+            response = requests.get(
+                url, params=params, headers=headers, proxies=proxies
+            )
+            if response.status_code == 200:
+                try:
+                    data = response.json()
+                    if not data:
+                        raise DataParsingError("Empty response data")
+                    return data
+                except ValueError:
+                    raise DataParsingError("Failed to parse JSON response")
+            elif response.status_code == 429:
+                raise RateLimitError(
+                    f"Rate limit exceeded. Status code: {response.status_code}"
+                )
+            else:
+                raise APIError(
+                    f"API request failed. Status code: {response.status_code}"
+                )
+
+        except (RequestException, RateLimitError, APIError, DataParsingError) as e:
+            if attempt == max_retries - 1:
+                if isinstance(e, RateLimitError):
+                    raise
+                elif isinstance(e, (APIError, DataParsingError)):
+                    raise
+                else:
+                    raise NetworkError(
+                        f"Failed to connect after {max_retries} attempts: {str(e)}"
+                    )
+
+            time.sleep(retry_delay)
+            retry_delay *= 2  # 指数退避策略
+
+    raise NetworkError(f"Failed to connect after {max_retries} attempts")
+
+
+def make_request_with_retry_text(
+    url, params=None, headers=None, proxies=None, max_retries=3, retry_delay=1
+):
+    """
+    发送 HTTP GET 请求，支持重试机制和代理设置。
+
+    :param url: 请求的 URL
+    :param params: URL 参数 (可选)
+    :param headers: 请求头 (可选)
+    :param proxies: 代理设置 (可选)
+    :param max_retries: 最大重试次数
+    :param retry_delay: 初始重试延迟（秒）
+    :return: 解析后的 JSON 数据
+    """
+    if proxies is None:
+        proxies = config.proxies
+    for attempt in range(max_retries):
+        try:
+            response = requests.get(
+                url, params=params, headers=headers, proxies=proxies
+            )
+            if response.status_code == 200:
+                try:
+                    data = response.text
+                    if not data:
+                        raise DataParsingError("Empty response data")
+                    return data
+                except ValueError:
+                    raise DataParsingError("Failed to parse JSON response")
+            elif response.status_code == 429:
+                raise RateLimitError(
+                    f"Rate limit exceeded. Status code: {response.status_code}"
+                )
+            else:
+                raise APIError(
+                    f"API request failed. Status code: {response.status_code}"
+                )
+
+        except (RequestException, RateLimitError, APIError, DataParsingError) as e:
+            if attempt == max_retries - 1:
+                if isinstance(e, RateLimitError):
+                    raise
+                elif isinstance(e, (APIError, DataParsingError)):
+                    raise
+                else:
+                    raise NetworkError(
+                        f"Failed to connect after {max_retries} attempts: {str(e)}"
+                    )
+
+            time.sleep(retry_delay)
+            retry_delay *= 2  # 指数退避策略
+
+    raise NetworkError(f"Failed to connect after {max_retries} attempts")