akshare-proxy-patch 0.1.5__tar.gz → 0.2.1__tar.gz

{akshare_proxy_patch-0.1.5 → akshare_proxy_patch-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare-proxy-patch
-Version: 0.1.5
+Version: 0.2.1
 Summary: 针对 AkShare 的底层补丁，自动为东财等接口注入代理认证头，从而避免 `stock_zh_a_spot_em` 等方法报错。
 Home-page: https://github.com/helloyie/akshare-proxy-patch
 Author: cheapproxy.net
@@ -30,7 +30,7 @@ pip install --upgrade akshare-proxy-patch
 
 ## 使用
 
-1. 访问 https://cheapproxy.net 联系客服（备注: token），获取授权码 `AUTH_IP` 和 `AUTH_TOKEN`
+1. 登录 https://cheapproxy.net，获取授权码 `AUTH_IP` 和 `AUTH_TOKEN`
 
 2. 将 akshare 升级到最新
 
@@ -40,16 +40,24 @@ pip install --upgrade akshare
 
 3. 在使用 akshare 文件顶部添加下面的内容 
 ```
+# 文件顶部添加
 import akshare_proxy_patch
 
 akshare_proxy_patch.install_patch("AUTH_IP", "AUTH_TOKEN")
 
-
+# 你的正常业务代码......
 # import akshare as ak
 # df = ak.stock_zh_a_spot_em()
-# 你的其他代码......
 ```
 
-# 使用问题交流群
+## 目前Hook的接口域名清单 
+- fund.eastmoney.com
+- push2.eastmoney.com
+- push2his.eastmoney.com
+
+## TODO 
+- 多线程情况下容易出现问题，需暂时不使用多线程或减少线程数
+
+## 使用问题交流群
 
 ![8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp](https://cdn.nodeimage.com/i/8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp)

{akshare_proxy_patch-0.1.5 → akshare_proxy_patch-0.2.1}/README.md

@@ -9,7 +9,7 @@ pip install --upgrade akshare-proxy-patch
 
 ## 使用
 
-1. 访问 https://cheapproxy.net 联系客服（备注: token），获取授权码 `AUTH_IP` 和 `AUTH_TOKEN`
+1. 登录 https://cheapproxy.net，获取授权码 `AUTH_IP` 和 `AUTH_TOKEN`
 
 2. 将 akshare 升级到最新
 
@@ -19,16 +19,24 @@ pip install --upgrade akshare
 
 3. 在使用 akshare 文件顶部添加下面的内容 
 ```
+# 文件顶部添加
 import akshare_proxy_patch
 
 akshare_proxy_patch.install_patch("AUTH_IP", "AUTH_TOKEN")
 
-
+# 你的正常业务代码......
 # import akshare as ak
 # df = ak.stock_zh_a_spot_em()
-# 你的其他代码......
 ```
 
-# 使用问题交流群
+## 目前Hook的接口域名清单 
+- fund.eastmoney.com
+- push2.eastmoney.com
+- push2his.eastmoney.com
+
+## TODO 
+- 多线程情况下容易出现问题，需暂时不使用多线程或减少线程数
+
+## 使用问题交流群
 
 ![8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp](https://cdn.nodeimage.com/i/8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp)

akshare_proxy_patch-0.2.1/akshare_proxy_patch/__init__.py

@@ -0,0 +1,93 @@
+import time
+import threading
+import requests
+from copy import deepcopy
+from requests.adapters import HTTPAdapter
+
+# 备份原始 send
+_original_send = HTTPAdapter.send
+
+# 线程局部状态
+_thread_state = threading.local()
+
+# 独立 Session：专门用于授权请求（不走 hook）
+_auth_session = requests.Session()
+
+
+def get_auth_config_realtime(auth_url, auth_token):
+    """实时获取授权信息（不走全局 hook）"""
+    try:
+        resp = _auth_session.get(
+            auth_url,
+            params={"token": auth_token},
+            timeout=5,
+        )
+        data = resp.json()
+        if data.get("ua"):
+            return data
+        error_msg = (
+            data.get("error_msg")
+            or "接口授权失败，请登录 https://cheapproxy.net 联系客服获取授权码"
+        )
+        print(f"========={error_msg}========")
+    except Exception as e:
+        print(f"=========接口授权失败，{e}========")
+    return None
+
+
+def install_patch(auth_ip, auth_token):
+    def patched_send(self, request, **kwargs):
+        # 如果明确标记跳过 hook，直接原逻辑
+        if getattr(_thread_state, "skip_hook", False):
+            return _original_send(self, request, **kwargs)
+
+        url = request.url or ""
+
+        is_target = any(
+            d in url
+            for d in (
+                "fund.eastmoney.com",
+                "push2.eastmoney.com",
+                "push2his.eastmoney.com",
+            )
+        )
+
+        # 非目标域名直接放行
+        if not is_target:
+            return _original_send(self, request, **kwargs)
+
+        auth_url = f"http://{auth_ip}:47001/api/akshare-auth"
+
+        # 每次请求都用“独立副本”
+        new_request = deepcopy(request)
+        new_kwargs = deepcopy(kwargs)
+
+        for _ in range(30):
+            try:
+                auth_res = get_auth_config_realtime(auth_url, auth_token)
+                if auth_res:
+                    new_request.headers = deepcopy(request.headers)
+                    new_request.headers["User-Agent"] = auth_res["ua"]
+                    new_request.headers["Cookie"] = (
+                        f"nid18={auth_res['nid18']}; "
+                        f"nid18_create_time={auth_res['nid18_create_time']}"
+                    )
+
+                    proxy = auth_res["proxy"]
+                    new_kwargs["proxies"] = {
+                        "http": proxy,
+                        "https": proxy,
+                    }
+                    new_kwargs["timeout"] = 8
+
+                resp = _original_send(self, new_request, **new_kwargs)
+                if resp.ok:
+                    return resp
+
+            except Exception:
+                time.sleep(0.01)
+
+        # 兜底：30 次都失败，走原请求
+        return _original_send(self, request, **kwargs)
+
+    HTTPAdapter.send = patched_send

{akshare_proxy_patch-0.1.5 → akshare_proxy_patch-0.2.1}/akshare_proxy_patch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare-proxy-patch
-Version: 0.1.5
+Version: 0.2.1
 Summary: 针对 AkShare 的底层补丁，自动为东财等接口注入代理认证头，从而避免 `stock_zh_a_spot_em` 等方法报错。
 Home-page: https://github.com/helloyie/akshare-proxy-patch
 Author: cheapproxy.net
@@ -30,7 +30,7 @@ pip install --upgrade akshare-proxy-patch
 
 ## 使用
 
-1. 访问 https://cheapproxy.net 联系客服（备注: token），获取授权码 `AUTH_IP` 和 `AUTH_TOKEN`
+1. 登录 https://cheapproxy.net，获取授权码 `AUTH_IP` 和 `AUTH_TOKEN`
 
 2. 将 akshare 升级到最新
 
@@ -40,16 +40,24 @@ pip install --upgrade akshare
 
 3. 在使用 akshare 文件顶部添加下面的内容 
 ```
+# 文件顶部添加
 import akshare_proxy_patch
 
 akshare_proxy_patch.install_patch("AUTH_IP", "AUTH_TOKEN")
 
-
+# 你的正常业务代码......
 # import akshare as ak
 # df = ak.stock_zh_a_spot_em()
-# 你的其他代码......
 ```
 
-# 使用问题交流群
+## 目前Hook的接口域名清单 
+- fund.eastmoney.com
+- push2.eastmoney.com
+- push2his.eastmoney.com
+
+## TODO 
+- 多线程情况下容易出现问题，需暂时不使用多线程或减少线程数
+
+## 使用问题交流群
 
 ![8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp](https://cdn.nodeimage.com/i/8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp)

{akshare_proxy_patch-0.1.5 → akshare_proxy_patch-0.2.1}/pyproject.toml

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

{akshare_proxy_patch-0.1.5 → akshare_proxy_patch-0.2.1}/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.1.5",  # 版本号
+    version="0.2.1",  # 版本号
     author="cheapproxy.net",
     author_email="emezxyj1@gmail.com",
     description="AkShare 报错全局Hook",

akshare_proxy_patch-0.1.5/akshare_proxy_patch/__init__.py

@@ -1,49 +0,0 @@
-import time
-import requests
-from requests.adapters import HTTPAdapter
-
-original_send = HTTPAdapter.send
-
-
-def install_patch(auth_ip, auth_token):
-    def patched_send(self, request, **kwargs):
-        auth_url = f"http://{auth_ip}:47001/api/akshare-auth"
-        url = request.url
-        is_hook = (
-            ("fund.eastmoney.com" in url)
-            or ("push2.eastmoney.com" in url)
-            or ("push2his.eastmoney.com" in url)
-        )
-        for i in range(60):
-            try:
-                if not is_hook:
-                    return original_send(self, request, **kwargs)
-                with requests.Session() as s:
-                    HTTPAdapter.send = original_send
-                    auth_res = s.get(
-                        auth_url, params={"token": auth_token}, timeout=5
-                    ).json()
-                    if not auth_res["ua"]:
-                        error_msg = (
-                            auth_res.get("error_msg", "")
-                            or "未知异常，请联系 cheapproxy.net 客服"
-                        )
-                        print(error_msg)
-                        return None
-
-                    HTTPAdapter.send = patched_send
-                request.headers["User-Agent"] = auth_res["ua"]
-                cookie_str = f"nid18={auth_res['nid18']}; nid18_create_time={auth_res['nid18_create_time']}"
-                request.headers["Cookie"] = cookie_str
-                proxy = auth_res["proxy"]
-                kwargs["proxies"] = {"http": proxy, "https": proxy}
-                kwargs["timeout"] = 8
-                return original_send(self, request, **kwargs)
-            except Exception as e:
-                if not is_hook:
-                    time.sleep(0.5)
-                HTTPAdapter.send = patched_send
-
-        return original_send(self, request, **kwargs)
-
-    HTTPAdapter.send = patched_send