akshare 1.15.5__tar.gz → 1.15.7__tar.gz

{akshare-1.15.5 → akshare-1.15.7}/PKG-INFO

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

@@ -2915,9 +2915,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.3 fix: fix stock_share_change_cninfo interface
 1.15.4 fix: fix stock_allotment_cninfo interface
 1.15.5 fix: fix stock_individual_spot_xq interface
+1.15.6 fix: fix qdii_e_index_jsl interface
+1.15.7 fix: fix index_hist_sw interface
 """
 
-__version__ = "1.15.5"
+__version__ = "1.15.7"
 __author__ = "AKFamily"
 
 import sys
@@ -5381,6 +5383,18 @@ from akshare.fund.fund_xq import (
     fund_individual_detail_hold_xq,
 )
 
+"""
+异常处理模块
+"""
+from .exceptions import (
+    AkshareException,
+    APIError,
+    DataParsingError,
+    InvalidParameterError,
+    NetworkError,
+    RateLimitError,
+)
+
 """
 Pro API 设置
 """

akshare-1.15.7/akshare/exceptions.py

@@ -0,0 +1,43 @@
+"""
+AKShare 异常处理模块
+"""
+
+
+class AkshareException(Exception):
+    """Base exception for akshare library"""
+
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class APIError(AkshareException):
+    """Raised when API request fails"""
+
+    def __init__(self, message, status_code=None):
+        self.status_code = status_code
+        super().__init__(f"API Error: {message} (Status code: {status_code})")
+
+
+class DataParsingError(AkshareException):
+    """Raised when data parsing fails"""
+
+    pass
+
+
+class InvalidParameterError(AkshareException):
+    """Raised when an invalid parameter is provided"""
+
+    pass
+
+
+class NetworkError(AkshareException):
+    """Raised when network-related issues occur"""
+
+    pass
+
+
+class RateLimitError(AkshareException):
+    """Raised when API rate limit is exceeded"""
+
+    pass

{akshare-1.15.5 → akshare-1.15.7}/akshare/index/index_research_sw.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/5/22 15:00
+Date: 2024/10/23 13:00
 Desc: 申万宏源研究-指数系列
-https://www.swhyresearch.com/institute_sw/allIndex/releasedIndex
+https://www.swsresearch.com/institute_sw/allIndex/releasedIndex
 """
 
 import math
@@ -17,7 +17,7 @@ from akshare.utils.tqdm import get_tqdm
 def index_hist_sw(symbol: str = "801030", period: str = "day") -> pd.DataFrame:
     """
     申万宏源研究-指数发布-指数详情-指数历史数据
-    https://www.swhyresearch.com/institute_sw/allIndex/releasedIndex/releasedetail?code=801001&name=%E7%94%B3%E4%B8%8750
+    https://www.swsresearch.com/institute_sw/allIndex/releasedIndex/releasedetail?code=801001&name=%E7%94%B3%E4%B8%8750
     :param symbol: 指数代码
     :type symbol: str
     :param period: choice of {"day", "week", "month"}
@@ -30,7 +30,7 @@ def index_hist_sw(symbol: str = "801030", period: str = "day") -> pd.DataFrame:
         "week": "WEEK",
         "month": "MONTH",
     }
-    url = "https://www.swhyresearch.com/institute-sw/api/index_publish/trend/"
+    url = "https://www.swsresearch.com/institute-sw/api/index_publish/trend/"
     params = {
         "swindexcode": symbol,
         "period": period_map[period],
@@ -81,14 +81,14 @@ def index_hist_sw(symbol: str = "801030", period: str = "day") -> pd.DataFrame:
 def index_min_sw(symbol: str = "801001") -> pd.DataFrame:
     """
     申万宏源研究-指数发布-指数详情-指数分时数据
-    https://www.swhyresearch.com/institute_sw/allIndex/releasedIndex/releasedetail?code=801001&name=%E7%94%B3%E4%B8%8750
+    https://www.swsresearch.com/institute_sw/allIndex/releasedIndex/releasedetail?code=801001&name=%E7%94%B3%E4%B8%8750
     :param symbol: 指数代码
     :type symbol: str
     :return: 指数分时数据
     :rtype: pandas.DataFrame
     """
     url = (
-        "https://www.swhyresearch.com/institute-sw/api/index_publish/details/timelines/"
+        "https://www.swsresearch.com/institute-sw/api/index_publish/details/timelines/"
     )
     params = {
         "swindexcode": symbol,
@@ -127,13 +127,13 @@ def index_min_sw(symbol: str = "801001") -> pd.DataFrame:
 def index_component_sw(symbol: str = "801001") -> pd.DataFrame:
     """
     申万宏源研究-指数发布-指数详情-成分股
-    https://www.swhyresearch.com/institute_sw/allIndex/releasedIndex/releasedetail?code=801001&name=%E7%94%B3%E4%B8%8750
+    https://www.swsresearch.com/institute_sw/allIndex/releasedIndex/releasedetail?code=801001&name=%E7%94%B3%E4%B8%8750
     :param symbol: 指数代码
     :type symbol: str
     :return: 成分股
     :rtype: pandas.DataFrame
     """
-    url = "https://www.swhyresearch.com/institute-sw/api/index_publish/details/component_stocks/"
+    url = "https://www.swsresearch.com/institute-sw/api/index_publish/details/component_stocks/"
     params = {"swindexcode": symbol, "page": "1", "page_size": "10000"}
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
@@ -221,7 +221,7 @@ def __index_realtime_sw(symbol: str = "大类风格指数") -> pd.DataFrame:
 def index_realtime_sw(symbol: str = "二级行业") -> pd.DataFrame:
     """
     申万宏源研究-指数系列
-    https://www.swhyresearch.com/institute_sw/allIndex/releasedIndex
+    https://www.swsresearch.com/institute_sw/allIndex/releasedIndex
     :param symbol: choice of {"市场表征", "一级行业", "二级行业", "风格指数", "大类风格指数", "金创指数"}
     :type symbol: str
     :return: 指数系列实时行情数据
@@ -230,7 +230,7 @@ def index_realtime_sw(symbol: str = "二级行业") -> pd.DataFrame:
     if symbol in {"大类风格指数", "金创指数"}:
         temp_df = __index_realtime_sw(symbol)
         return temp_df
-    url = "https://www.swhyresearch.com/institute-sw/api/index_publish/current/"
+    url = "https://www.swsresearch.com/institute-sw/api/index_publish/current/"
     params = {"page": "1", "page_size": "50", "indextype": symbol}
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
@@ -289,7 +289,7 @@ def index_analysis_daily_sw(
 ) -> pd.DataFrame:
     """
     申万宏源研究-指数分析
-    https://www.swhyresearch.com/institute_sw/allIndex/analysisIndex
+    https://www.swsresearch.com/institute_sw/allIndex/analysisIndex
     :param symbol: choice of {"市场表征", "一级行业", "二级行业", "风格指数"}
     :type symbol: str
     :param start_date: 开始日期
@@ -299,7 +299,7 @@ def index_analysis_daily_sw(
     :return: 指数分析
     :rtype: pandas.DataFrame
     """
-    url = "https://www.swhyresearch.com/institute-sw/api/index_analysis/index_analysis_report/"
+    url = "https://www.swsresearch.com/institute-sw/api/index_analysis/index_analysis_report/"
     params = {
         "page": "1",
         "page_size": "50",
@@ -363,13 +363,13 @@ def index_analysis_daily_sw(
 def index_analysis_week_month_sw(symbol: str = "month") -> pd.DataFrame:
     """
     申万宏源研究-周/月报表-日期序列
-    https://www.swhyresearch.com/institute_sw/allIndex/analysisIndex
+    https://www.swsresearch.com/institute_sw/allIndex/analysisIndex
     :param symbol: choice of {"week", "month"}
     :type symbol: str
     :return: 日期序列
     :rtype: pandas.DataFrame
     """
-    url = "https://www.swhyresearch.com/institute-sw/api/index_analysis/week_month_datetime/"
+    url = "https://www.swsresearch.com/institute-sw/api/index_analysis/week_month_datetime/"
     params = {"type": symbol.upper()}
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
@@ -392,7 +392,7 @@ def index_analysis_weekly_sw(
 ) -> pd.DataFrame:
     """
     申万宏源研究-指数分析-周报告
-    https://www.swhyresearch.com/institute_sw/allIndex/analysisIndex
+    https://www.swsresearch.com/institute_sw/allIndex/analysisIndex
     :param symbol: choice of {"市场表征", "一级行业", "二级行业", "风格指数"}
     :type symbol: str
     :param date: 查询日期; 通过调用 ak.index_analysis_week_month_sw(date="20221104") 接口获取
@@ -400,7 +400,7 @@ def index_analysis_weekly_sw(
     :return: 指数分析
     :rtype: pandas.DataFrame
     """
-    url = "https://www.swhyresearch.com/institute-sw/api/index_analysis/index_analysis_reports/"
+    url = "https://www.swsresearch.com/institute-sw/api/index_analysis/index_analysis_reports/"
     params = {
         "page": "1",
         "page_size": "50",
@@ -467,7 +467,7 @@ def index_analysis_monthly_sw(
 ) -> pd.DataFrame:
     """
     申万宏源研究-指数分析-月报告
-    https://www.swhyresearch.com/institute_sw/allIndex/analysisIndex
+    https://www.swsresearch.com/institute_sw/allIndex/analysisIndex
     :param symbol: choice of {"市场表征", "一级行业", "二级行业", "风格指数"}
     :type symbol: str
     :param date: 查询日期; 通过调用 ak.index_analysis_week_month_sw() 接口获取
@@ -475,7 +475,7 @@ def index_analysis_monthly_sw(
     :return: 指数分析
     :rtype: pandas.DataFrame
     """
-    url = "https://www.swhyresearch.com/institute-sw/api/index_analysis/index_analysis_reports/"
+    url = "https://www.swsresearch.com/institute-sw/api/index_analysis/index_analysis_reports/"
     params = {
         "page": "1",
         "page_size": "50",

{akshare-1.15.5 → akshare-1.15.7}/akshare/qdii/qdii_jsl.py

@@ -7,7 +7,8 @@ Desc: 集思录-T+0 QDII
 """
 
 import pandas as pd
-import requests
+
+from akshare.request import make_request_with_retry_json
 
 
 def qdii_e_index_jsl() -> pd.DataFrame:
@@ -22,8 +23,7 @@ def qdii_e_index_jsl() -> pd.DataFrame:
         "___jsl": "LST___t=1728207798534",
         "rp": "22",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
+    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={
@@ -94,8 +94,7 @@ def qdii_e_comm_jsl() -> pd.DataFrame:
         "___jsl": "LST___t=1728207798534",
         "rp": "22",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
+    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={
@@ -166,8 +165,7 @@ def qdii_a_index_jsl() -> pd.DataFrame:
         "___jsl": "LST___t=1728206439242",
         "rp": "22",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
+    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={

akshare-1.15.7/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")

akshare-1.15.7/akshare/utils/context.py

@@ -0,0 +1,43 @@
+class AkshareConfig:
+    _instance = None
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            cls._instance.proxies = None
+        return cls._instance
+
+    @classmethod
+    def set_proxies(cls, proxies):
+        cls().proxies = proxies
+
+    @classmethod
+    def get_proxies(cls):
+        return cls().proxies
+
+
+config = AkshareConfig()
+
+
+# 导出 set_proxies 函数
+def set_proxies(proxies):
+    config.set_proxies(proxies)
+
+
+def get_proxies():
+    return config.get_proxies()
+
+
+class ProxyContext:
+    def __init__(self, proxies):
+        self.proxies = proxies
+        self.old_proxies = None
+
+    def __enter__(self):
+        self.old_proxies = config.get_proxies()
+        config.set_proxies(self.proxies)
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        config.set_proxies(self.old_proxies)
+        return False  # 不处理异常

{akshare-1.15.5 → akshare-1.15.7}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.5
+Version: 1.15.7
 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.5 → akshare-1.15.7}/akshare.egg-info/SOURCES.txt

@@ -4,6 +4,8 @@ pyproject.toml
 setup.py
 akshare/__init__.py
 akshare/datasets.py
+akshare/exceptions.py
+akshare/request.py
 akshare.egg-info/PKG-INFO
 akshare.egg-info/SOURCES.txt
 akshare.egg-info/dependency_links.txt
@@ -381,6 +383,7 @@ akshare/tool/__init__.py
 akshare/tool/trade_date_hist.py
 akshare/utils/__init__.py
 akshare/utils/cons.py
+akshare/utils/context.py
 akshare/utils/demjson.py
 akshare/utils/func.py
 akshare/utils/token_process.py