akshare-proxy-patch 0.2.2__tar.gz → 0.2.3__tar.gz

{akshare_proxy_patch-0.2.2 → akshare_proxy_patch-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare-proxy-patch
-Version: 0.2.2
+Version: 0.2.3
 Summary: 针对 AkShare 的底层补丁，自动为东财等接口注入代理认证头，从而避免 `stock_zh_a_spot_em` 等方法报错。
 Home-page: https://github.com/helloyie/akshare-proxy-patch
 Author: cheapproxy.net

{akshare_proxy_patch-0.2.2 → akshare_proxy_patch-0.2.3}/akshare_proxy_patch/__init__.py

@@ -2,11 +2,10 @@ import time
 import threading
 import requests
 from requests.adapters import HTTPAdapter
-from copy import deepcopy
 
-# --- 全局配置与状态 ---
-__version__ = "1.0.2"
-_original_send = HTTPAdapter.send
+__version__ = "0.2.3"
+# 备份 Session 的原始 request 方法，这是所有 requests.get/post 的最终入口
+_original_request = requests.Session.request
 _auth_session = requests.Session()
 
 
@@ -23,14 +22,12 @@ _cache = AuthCache()
 
 def get_auth_config_with_cache(auth_url, auth_token):
     now = time.time()
-
-    # 检查缓存是否有效 (双重检查锁前置)
+    # 1. 检查缓存是否有效
     if _cache.data and now < _cache.expire_at:
         return _cache.data
 
-    # 缓存失效，加锁更新
+    # 2. 缓存失效，加锁更新
     with _cache.lock:
-        # 再次检查，防止多个线程同时穿透锁
         if _cache.data and now < _cache.expire_at:
             return _cache.data
 
@@ -53,48 +50,67 @@ def get_auth_config_with_cache(auth_url, auth_token):
 
 
 def install_patch(auth_ip, auth_token):
-    def patched_send(self, request, **kwargs):
-        # 排除非目标域名，减少性能损耗
-        url = request.url or ""
-        if not any(
-            d in url
+    def patched_request(self, method, url, **kwargs):
+        # 排除非目标域名
+        is_target = any(
+            d in (url or "")
             for d in [
                 "fund.eastmoney.com",
                 "push2.eastmoney.com",
                 "push2his.eastmoney.com",
             ]
-        ):
-            return _original_send(self, request, **kwargs)
+        )
+
+        if not is_target:
+            return _original_request(self, method, url, **kwargs)
 
         auth_url = f"http://{auth_ip}:47001/api/akshare-auth"
 
-        for _ in range(30):
+        # 重试逻辑
+        for _ in range(10):
             auth_res = get_auth_config_with_cache(auth_url, auth_token)
             if not auth_res:
                 time.sleep(0.5)
                 continue
 
-            request.headers["User-Agent"] = auth_res["ua"]
-            request.headers["Cookie"] = (
+            # 处理 Headers：确保不破坏业务代码传入的 headers
+            headers = kwargs.get("headers") or {}
+            headers["User-Agent"] = auth_res["ua"]
+            headers["Cookie"] = (
                 f"nid18={auth_res['nid18']}; nid18_create_time={auth_res['nid18_create_time']}"
             )
-
-            # 动态注入代理
+            kwargs["headers"] = headers
             kwargs["proxies"] = {
                 "http": auth_res["proxy"],
                 "https": auth_res["proxy"],
             }
-            kwargs["timeout"] = 8
+
+            if "timeout" not in kwargs:
+                kwargs["timeout"] = 8
 
             try:
-                resp = _original_send(self, request, **kwargs)
+                # 调用原始 request 方法
+                resp = _original_request(self, method, url, **kwargs)
                 if resp.ok:
                     return resp
+
+                # 如果遇到 403 等可能是代理失效
+                if resp.status_code == 403:
+                    with _cache.lock:
+                        _cache.expire_at = 0
             except Exception:
+                # 网络异常直接使缓存失效，强制下一个请求换 IP
                 with _cache.lock:
                     _cache.expire_at = 0
                 time.sleep(0.1)
 
-        return _original_send(self, request, **kwargs)
+        # 最终尝试
+        return _original_request(self, method, url, **kwargs)
+
+    # 关键：全局替换 Session 的 request 入口
+    requests.Session.request = patched_request
+
 
-    HTTPAdapter.send = patched_send
+# 使用示例
+# install_patch("你的IP", "你的TOKEN")
+# requests.get("http://fund.eastmoney.com/...")

{akshare_proxy_patch-0.2.2 → akshare_proxy_patch-0.2.3}/akshare_proxy_patch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare-proxy-patch
-Version: 0.2.2
+Version: 0.2.3
 Summary: 针对 AkShare 的底层补丁，自动为东财等接口注入代理认证头，从而避免 `stock_zh_a_spot_em` 等方法报错。
 Home-page: https://github.com/helloyie/akshare-proxy-patch
 Author: cheapproxy.net

{akshare_proxy_patch-0.2.2 → akshare_proxy_patch-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "akshare-proxy-patch"  # 包名，需在 PyPI 唯一
-version = "0.2.2"
+version = "0.2.3"
 authors = [
   { name="cheapproxy", email="emezxyj1@gmail.com" },
 ]

{akshare_proxy_patch-0.2.2 → akshare_proxy_patch-0.2.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="akshare-proxy-patch",  # 包名，用户 pip install 时的名称
-    version="0.2.2",  # 版本号
+    version="0.2.3",  # 版本号
     author="cheapproxy.net",
     author_email="emezxyj1@gmail.com",
     description="AkShare 报错全局Hook",