crawlo 1.3.6__py3-none-any.whl → 1.3.7__py3-none-any.whl

tests/test_all_redis_key_configs.py

@@ -1,146 +1,146 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-所有Redis Key配置测试脚本
-用于验证所有配置文件是否符合新的Redis key命名规范
-"""
-import sys
-import os
-import re
-
-# 添加项目根目录到路径
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
-
-
-def test_all_redis_key_configs():
-    """测试所有Redis key配置"""
-    print("测试所有Redis key配置...")
-    
-    try:
-        # 检查示例项目配置文件
-        example_projects = [
-            "examples/books_distributed/books_distributed/settings.py",
-            "examples/api_data_collection/api_data_collection/settings.py",
-            "examples/telecom_licenses_distributed/telecom_licenses_distributed/settings.py"
-        ]
-        
-        for project_config in example_projects:
-            print(f"   检查 {project_config}...")
-            if not os.path.exists(project_config):
-                print(f"配置文件不存在: {project_config}")
-                return False
-                
-            with open(project_config, 'r', encoding='utf-8') as f:
-                content = f.read()
-            
-            # 检查是否移除了旧的REDIS_KEY配置
-            if re.search(r'REDIS_KEY\s*=', content) and 'crawlo:{PROJECT_NAME}:filter:fingerprint' not in content:
-                print(f"{project_config}中仍然存在旧的REDIS_KEY配置")
-                return False
-                
-            # 检查是否添加了新的注释
-            if 'crawlo:{PROJECT_NAME}:filter:fingerprint' not in content:
-                print(f"{project_config}中缺少新的Redis key命名规范注释")
-                return False
-                
-            print(f"      {project_config}符合新的Redis key命名规范")
-        
-        # 检查模板文件
-        template_file = "crawlo/templates/project/settings.py.tmpl"
-        print(f"   检查 {template_file}...")
-        if not os.path.exists(template_file):
-            print(f"模板文件不存在: {template_file}")
-            return False
-            
-        with open(template_file, 'r', encoding='utf-8') as f:
-            template_content = f.read()
-        
-        # 检查是否移除了旧的REDIS_KEY配置
-        if "REDIS_KEY = f'{{project_name}}:fingerprint'" in template_content:
-            print("模板文件中仍然存在旧的REDIS_KEY配置")
-            return False
-            
-        # 检查是否添加了新的注释
-        if '# crawlo:{project_name}:filter:fingerprint (请求去重)' not in template_content:
-            print("模板文件中缺少请求去重的Redis key命名规范注释")
-            return False
-            
-        if '# crawlo:{project_name}:item:fingerprint (数据项去重)' not in template_content:
-            print("模板文件中缺少数据项去重的Redis key命名规范注释")
-            return False
-            
-        print(f"      {template_file}符合新的Redis key命名规范")
-        
-        # 检查mode_manager.py
-        mode_manager_file = "crawlo/mode_manager.py"
-        print(f"   检查 {mode_manager_file}...")
-        if not os.path.exists(mode_manager_file):
-            print(f"文件不存在: {mode_manager_file}")
-            return False
-            
-        with open(mode_manager_file, 'r', encoding='utf-8') as f:
-            mode_manager_content = f.read()
-        
-        # 检查是否移除了旧的REDIS_KEY配置
-        if "'REDIS_KEY': f'{project_name}:fingerprint'" in mode_manager_content:
-            print("mode_manager.py中仍然存在旧的REDIS_KEY配置")
-            return False
-            
-        # 检查是否添加了新的注释
-        if 'crawlo:{project_name}:filter:fingerprint (请求去重)' not in mode_manager_content:
-            print("mode_manager.py中缺少新的Redis key命名规范注释")
-            return False
-            
-        print(f"      {mode_manager_file}符合新的Redis key命名规范")
-        
-        # 检查默认设置文件
-        default_settings_file = "crawlo/settings/default_settings.py"
-        print(f"   检查 {default_settings_file}...")
-        if not os.path.exists(default_settings_file):
-            print(f"文件不存在: {default_settings_file}")
-            return False
-            
-        with open(default_settings_file, 'r', encoding='utf-8') as f:
-            default_settings_content = f.read()
-        
-        # 检查是否移除了旧的REDIS_KEY配置
-        if re.search(r'REDIS_KEY\s*=\s*.*fingerprint', default_settings_content):
-            print("默认设置文件中仍然存在旧的REDIS_KEY配置")
-            return False
-            
-        print(f"      {default_settings_file}符合新的Redis key命名规范")
-        
-        print("所有Redis key配置测试通过！")
-        return True
-        
-    except Exception as e:
-        print(f"测试过程中发生错误: {e}")
-        return False
-
-
-def main():
-    """主测试函数"""
-    print("开始所有Redis key配置测试...")
-    print("=" * 50)
-    
-    try:
-        success = test_all_redis_key_configs()
-        
-        print("=" * 50)
-        if success:
-            print("所有测试通过！所有配置文件符合新的Redis key命名规范")
-        else:
-            print("测试失败，请检查配置文件")
-            return 1
-            
-    except Exception as e:
-        print("=" * 50)
-        print(f"测试过程中发生异常: {e}")
-        return 1
-    
-    return 0
-
-
-if __name__ == "__main__":
-    exit_code = main()
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+所有Redis Key配置测试脚本
+用于验证所有配置文件是否符合新的Redis key命名规范
+"""
+import sys
+import os
+import re
+
+# 添加项目根目录到路径
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+
+
+def test_all_redis_key_configs():
+    """测试所有Redis key配置"""
+    print("测试所有Redis key配置...")
+    
+    try:
+        # 检查示例项目配置文件
+        example_projects = [
+            "examples/books_distributed/books_distributed/settings.py",
+            "examples/api_data_collection/api_data_collection/settings.py",
+            "examples/telecom_licenses_distributed/telecom_licenses_distributed/settings.py"
+        ]
+        
+        for project_config in example_projects:
+            print(f"   检查 {project_config}...")
+            if not os.path.exists(project_config):
+                print(f"配置文件不存在: {project_config}")
+                return False
+                
+            with open(project_config, 'r', encoding='utf-8') as f:
+                content = f.read()
+            
+            # 检查是否移除了旧的REDIS_KEY配置
+            if re.search(r'REDIS_KEY\s*=', content) and 'crawlo:{PROJECT_NAME}:filter:fingerprint' not in content:
+                print(f"{project_config}中仍然存在旧的REDIS_KEY配置")
+                return False
+                
+            # 检查是否添加了新的注释
+            if 'crawlo:{PROJECT_NAME}:filter:fingerprint' not in content:
+                print(f"{project_config}中缺少新的Redis key命名规范注释")
+                return False
+                
+            print(f"      {project_config}符合新的Redis key命名规范")
+        
+        # 检查模板文件
+        template_file = "crawlo/templates/project/settings.py.tmpl"
+        print(f"   检查 {template_file}...")
+        if not os.path.exists(template_file):
+            print(f"模板文件不存在: {template_file}")
+            return False
+            
+        with open(template_file, 'r', encoding='utf-8') as f:
+            template_content = f.read()
+        
+        # 检查是否移除了旧的REDIS_KEY配置
+        if "REDIS_KEY = f'{{project_name}}:fingerprint'" in template_content:
+            print("模板文件中仍然存在旧的REDIS_KEY配置")
+            return False
+            
+        # 检查是否添加了新的注释
+        if '# crawlo:{project_name}:filter:fingerprint (请求去重)' not in template_content:
+            print("模板文件中缺少请求去重的Redis key命名规范注释")
+            return False
+            
+        if '# crawlo:{project_name}:item:fingerprint (数据项去重)' not in template_content:
+            print("模板文件中缺少数据项去重的Redis key命名规范注释")
+            return False
+            
+        print(f"      {template_file}符合新的Redis key命名规范")
+        
+        # 检查mode_manager.py
+        mode_manager_file = "crawlo/mode_manager.py"
+        print(f"   检查 {mode_manager_file}...")
+        if not os.path.exists(mode_manager_file):
+            print(f"文件不存在: {mode_manager_file}")
+            return False
+            
+        with open(mode_manager_file, 'r', encoding='utf-8') as f:
+            mode_manager_content = f.read()
+        
+        # 检查是否移除了旧的REDIS_KEY配置
+        if "'REDIS_KEY': f'{project_name}:fingerprint'" in mode_manager_content:
+            print("mode_manager.py中仍然存在旧的REDIS_KEY配置")
+            return False
+            
+        # 检查是否添加了新的注释
+        if 'crawlo:{project_name}:filter:fingerprint (请求去重)' not in mode_manager_content:
+            print("mode_manager.py中缺少新的Redis key命名规范注释")
+            return False
+            
+        print(f"      {mode_manager_file}符合新的Redis key命名规范")
+        
+        # 检查默认设置文件
+        default_settings_file = "crawlo/settings/default_settings.py"
+        print(f"   检查 {default_settings_file}...")
+        if not os.path.exists(default_settings_file):
+            print(f"文件不存在: {default_settings_file}")
+            return False
+            
+        with open(default_settings_file, 'r', encoding='utf-8') as f:
+            default_settings_content = f.read()
+        
+        # 检查是否移除了旧的REDIS_KEY配置
+        if re.search(r'REDIS_KEY\s*=\s*.*fingerprint', default_settings_content):
+            print("默认设置文件中仍然存在旧的REDIS_KEY配置")
+            return False
+            
+        print(f"      {default_settings_file}符合新的Redis key命名规范")
+        
+        print("所有Redis key配置测试通过！")
+        return True
+        
+    except Exception as e:
+        print(f"测试过程中发生错误: {e}")
+        return False
+
+
+def main():
+    """主测试函数"""
+    print("开始所有Redis key配置测试...")
+    print("=" * 50)
+    
+    try:
+        success = test_all_redis_key_configs()
+        
+        print("=" * 50)
+        if success:
+            print("所有测试通过！所有配置文件符合新的Redis key命名规范")
+        else:
+            print("测试失败，请检查配置文件")
+            return 1
+            
+    except Exception as e:
+        print("=" * 50)
+        print(f"测试过程中发生异常: {e}")
+        return 1
+    
+    return 0
+
+
+if __name__ == "__main__":
+    exit_code = main()
     sys.exit(exit_code)

tests/test_authenticated_proxy.py

@@ -1,142 +1,142 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-测试带认证代理的功能
-"""
-
-import asyncio
-import aiohttp
-import httpx
-from crawlo.network.request import Request
-from crawlo.tools import AuthenticatedProxy
-
-
-async def test_proxy_with_aiohttp():
-    """测试AioHttp与认证代理"""
-    print("=== 测试AioHttp与认证代理 ===")
-    
-    # 代理配置
-    proxy_config = {
-        "http": "http://dwe20241014:Dwe0101014@182.201.243.186:58111",
-        "https": "http://dwe20241014:Dwe0101014@182.201.243.186:58111"
-    }
-    
-    # 创建代理对象
-    proxy_url = proxy_config["http"]
-    proxy = AuthenticatedProxy(proxy_url)
-    
-    print(f"原始代理URL: {proxy_url}")
-    print(f"清洁URL: {proxy.clean_url}")
-    print(f"认证信息: {proxy.get_auth_credentials()}")
-    
-    # 使用aiohttp直接测试
-    try:
-        auth = proxy.get_auth_credentials()
-        if auth:
-            basic_auth = aiohttp.BasicAuth(auth['username'], auth['password'])
-        else:
-            basic_auth = None
-            
-        async with aiohttp.ClientSession() as session:
-            async with session.get(
-                "https://httpbin.org/ip",
-                proxy=proxy.clean_url,
-                proxy_auth=basic_auth
-            ) as response:
-                print(f"AioHttp测试成功!")
-                print(f"状态码: {response.status}")
-                content = await response.text()
-                print(f"响应内容: {content[:200]}...")
-                
-    except Exception as e:
-        print(f"AioHttp测试失败: {e}")
-        import traceback
-        traceback.print_exc()
-
-
-def test_proxy_with_httpx():
-    """测试HttpX与认证代理"""
-    print("\n=== 测试HttpX与认证代理 ===")
-    
-    # 代理配置
-    proxy_config = {
-        "http": "http://dwe20241014:Dwe0101014@182.201.243.186:58111",
-        "https": "http://dwe20241014:Dwe0101014@182.201.243.186:58111"
-    }
-    
-    # 使用httpx直接测试
-    try:
-        # HttpX可以直接使用带认证的URL作为proxy参数
-        proxy_url = proxy_config["http"]
-        
-        with httpx.Client(proxy=proxy_url) as client:
-            response = client.get("https://httpbin.org/ip")
-            print(f"HttpX测试成功!")
-            print(f"状态码: {response.status_code}")
-            print(f"响应内容: {response.text[:200]}...")
-                
-    except Exception as e:
-        print(f"HttpX测试失败: {e}")
-        import traceback
-        traceback.print_exc()
-
-
-async def test_proxy_with_curl_cffi():
-    """测试CurlCffi与认证代理"""
-    print("\n=== 测试CurlCffi与认证代理 ===")
-    
-    # 代理配置
-    proxy_config = {
-        "http": "http://dwe20241014:Dwe0101014@182.201.243.186:58111",
-        "https": "http://dwe20241014:Dwe0101014@182.201.243.186:58111"
-    }
-    
-    # 创建代理对象
-    proxy_url = proxy_config["http"]
-    proxy = AuthenticatedProxy(proxy_url)
-    
-    print(f"原始代理URL: {proxy_url}")
-    print(f"代理字典: {proxy.proxy_dict}")
-    print(f"认证头: {proxy.get_auth_header()}")
-    
-    # 使用curl-cffi直接测试
-    try:
-        from curl_cffi import requests as curl_requests
-        
-        # 设置代理和认证头
-        proxies = proxy.proxy_dict
-        headers = {}
-        auth_header = proxy.get_auth_header()
-        if auth_header:
-            headers["Proxy-Authorization"] = auth_header
-            
-        response = curl_requests.get(
-            "https://httpbin.org/ip",
-            proxies=proxies,
-            headers=headers
-        )
-        
-        print(f"CurlCffi测试成功!")
-        print(f"状态码: {response.status_code}")
-        print(f"响应内容: {response.text[:200]}...")
-                
-    except Exception as e:
-        print(f"CurlCffi测试失败: {e}")
-        import traceback
-        traceback.print_exc()
-
-
-async def main():
-    """主测试函数"""
-    print("开始测试带认证代理的功能...\n")
-    
-    # 测试各个库
-    await test_proxy_with_aiohttp()
-    test_proxy_with_httpx()
-    await test_proxy_with_curl_cffi()
-    
-    print("\n所有测试完成!")
-
-
-if __name__ == "__main__":
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+测试带认证代理的功能
+"""
+
+import asyncio
+import aiohttp
+import httpx
+from crawlo.network.request import Request
+from crawlo.tools import AuthenticatedProxy
+
+
+async def test_proxy_with_aiohttp():
+    """测试AioHttp与认证代理"""
+    print("=== 测试AioHttp与认证代理 ===")
+    
+    # 代理配置
+    proxy_config = {
+        "http": "http://dwe20241014:Dwe0101014@182.201.243.186:58111",
+        "https": "http://dwe20241014:Dwe0101014@182.201.243.186:58111"
+    }
+    
+    # 创建代理对象
+    proxy_url = proxy_config["http"]
+    proxy = AuthenticatedProxy(proxy_url)
+    
+    print(f"原始代理URL: {proxy_url}")
+    print(f"清洁URL: {proxy.clean_url}")
+    print(f"认证信息: {proxy.get_auth_credentials()}")
+    
+    # 使用aiohttp直接测试
+    try:
+        auth = proxy.get_auth_credentials()
+        if auth:
+            basic_auth = aiohttp.BasicAuth(auth['username'], auth['password'])
+        else:
+            basic_auth = None
+            
+        async with aiohttp.ClientSession() as session:
+            async with session.get(
+                "https://httpbin.org/ip",
+                proxy=proxy.clean_url,
+                proxy_auth=basic_auth
+            ) as response:
+                print(f"AioHttp测试成功!")
+                print(f"状态码: {response.status}")
+                content = await response.text()
+                print(f"响应内容: {content[:200]}...")
+                
+    except Exception as e:
+        print(f"AioHttp测试失败: {e}")
+        import traceback
+        traceback.print_exc()
+
+
+def test_proxy_with_httpx():
+    """测试HttpX与认证代理"""
+    print("\n=== 测试HttpX与认证代理 ===")
+    
+    # 代理配置
+    proxy_config = {
+        "http": "http://dwe20241014:Dwe0101014@182.201.243.186:58111",
+        "https": "http://dwe20241014:Dwe0101014@182.201.243.186:58111"
+    }
+    
+    # 使用httpx直接测试
+    try:
+        # HttpX可以直接使用带认证的URL作为proxy参数
+        proxy_url = proxy_config["http"]
+        
+        with httpx.Client(proxy=proxy_url) as client:
+            response = client.get("https://httpbin.org/ip")
+            print(f"HttpX测试成功!")
+            print(f"状态码: {response.status_code}")
+            print(f"响应内容: {response.text[:200]}...")
+                
+    except Exception as e:
+        print(f"HttpX测试失败: {e}")
+        import traceback
+        traceback.print_exc()
+
+
+async def test_proxy_with_curl_cffi():
+    """测试CurlCffi与认证代理"""
+    print("\n=== 测试CurlCffi与认证代理 ===")
+    
+    # 代理配置
+    proxy_config = {
+        "http": "http://dwe20241014:Dwe0101014@182.201.243.186:58111",
+        "https": "http://dwe20241014:Dwe0101014@182.201.243.186:58111"
+    }
+    
+    # 创建代理对象
+    proxy_url = proxy_config["http"]
+    proxy = AuthenticatedProxy(proxy_url)
+    
+    print(f"原始代理URL: {proxy_url}")
+    print(f"代理字典: {proxy.proxy_dict}")
+    print(f"认证头: {proxy.get_auth_header()}")
+    
+    # 使用curl-cffi直接测试
+    try:
+        from curl_cffi import requests as curl_requests
+        
+        # 设置代理和认证头
+        proxies = proxy.proxy_dict
+        headers = {}
+        auth_header = proxy.get_auth_header()
+        if auth_header:
+            headers["Proxy-Authorization"] = auth_header
+            
+        response = curl_requests.get(
+            "https://httpbin.org/ip",
+            proxies=proxies,
+            headers=headers
+        )
+        
+        print(f"CurlCffi测试成功!")
+        print(f"状态码: {response.status_code}")
+        print(f"响应内容: {response.text[:200]}...")
+                
+    except Exception as e:
+        print(f"CurlCffi测试失败: {e}")
+        import traceback
+        traceback.print_exc()
+
+
+async def main():
+    """主测试函数"""
+    print("开始测试带认证代理的功能...\n")
+    
+    # 测试各个库
+    await test_proxy_with_aiohttp()
+    test_proxy_with_httpx()
+    await test_proxy_with_curl_cffi()
+    
+    print("\n所有测试完成!")
+
+
+if __name__ == "__main__":
     asyncio.run(main())