crawlo 1.2.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

tests/test_queue_manager_redis_key.py

@@ -1,177 +1,177 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-QueueManager Redis Key 测试脚本
-用于验证QueueManager在创建RedisPriorityQueue时是否正确传递module_name参数
-"""
-import asyncio
-import sys
-import os
-import traceback
-
-# 添加项目根目录到路径
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
-
-from crawlo.queue.queue_manager import QueueManager, QueueConfig, QueueType
-
-
-class MockSettings:
-    """模拟设置类"""
-    def __init__(self, project_name="test_project"):
-        self.project_name = project_name
-        self.REDIS_URL = "redis://127.0.0.1:6379/15"  # 使用测试数据库
-        self.REDIS_TTL = 0
-        self.CLEANUP_FP = 0
-        self.FILTER_DEBUG = True
-        self.LOG_LEVEL = "INFO"
-        self.DECODE_RESPONSES = True
-    
-    def get(self, key, default=None):
-        if key == 'PROJECT_NAME':
-            return self.project_name
-        elif key == 'REDIS_URL':
-            return self.REDIS_URL
-        elif key == 'FILTER_DEBUG':
-            return self.FILTER_DEBUG
-        elif key == 'LOG_LEVEL':
-            return self.LOG_LEVEL
-        elif key == 'DECODE_RESPONSES':
-            return self.DECODE_RESPONSES
-        return default
-    
-    def get_bool(self, key, default=False):
-        if key == 'FILTER_DEBUG':
-            return self.FILTER_DEBUG
-        elif key == 'DECODE_RESPONSES':
-            return self.DECODE_RESPONSES
-        elif key == 'CLEANUP_FP':
-            return self.CLEANUP_FP
-        return default
-    
-    def get_int(self, key, default=0):
-        if key == 'REDIS_TTL':
-            return self.REDIS_TTL
-        elif key == 'REDIS_PORT':
-            return 6379
-        elif key == 'REDIS_DB':
-            return 0
-        elif key == 'SCHEDULER_MAX_QUEUE_SIZE':
-            return 1000
-        elif key == 'QUEUE_MAX_RETRIES':
-            return 3
-        elif key == 'QUEUE_TIMEOUT':
-            return 300
-        return default
-
-
-async def test_queue_manager_redis_key():
-    """测试QueueManager创建Redis队列时的key命名"""
-    print("🔍 测试QueueManager创建Redis队列时的key命名...")
-    
-    try:
-        # 测试不同的队列名称配置
-        test_cases = [
-            {
-                "queue_name": "crawlo:books_distributed:queue:requests",
-                "expected_module_name": "books_distributed",
-                "description": "标准项目名称"
-            },
-            {
-                "queue_name": "crawlo:api_data_collection:queue:requests",
-                "expected_module_name": "api_data_collection",
-                "description": "API数据采集项目"
-            },
-            {
-                "queue_name": "crawlo:test_project:queue:requests",
-                "expected_module_name": "test_project",
-                "description": "测试项目"
-            },
-            {
-                "queue_name": "simple_queue_name",
-                "expected_module_name": "simple_queue_name",
-                "description": "简单队列名称"
-            },
-            {
-                "queue_name": "",
-                "expected_module_name": "default",
-                "description": "空队列名称"
-            }
-        ]
-        
-        for i, test_case in enumerate(test_cases, 1):
-            print(f"   {i}. 测试 {test_case['description']}...")
-            
-            # 创建QueueConfig
-            config = QueueConfig(
-                queue_type=QueueType.REDIS,
-                redis_url="redis://127.0.0.1:6379/15",
-                queue_name=test_case["queue_name"],
-                max_queue_size=1000,
-                max_retries=3,
-                timeout=300
-            )
-            
-            # 创建QueueManager
-            queue_manager = QueueManager(config)
-            
-            # 创建队列实例
-            queue = await queue_manager._create_queue(QueueType.REDIS)
-            
-            # 验证module_name是否正确设置
-            assert hasattr(queue, 'module_name'), "RedisPriorityQueue缺少module_name属性"
-            assert queue.module_name == test_case["expected_module_name"], \
-                f"module_name不匹配: {queue.module_name} != {test_case['expected_module_name']}"
-            
-            # 验证队列名称是否符合规范
-            expected_queue_name = f"crawlo:{queue.module_name}:queue:requests"
-            expected_processing_queue = f"crawlo:{queue.module_name}:queue:processing"
-            expected_failed_queue = f"crawlo:{queue.module_name}:queue:failed"
-            
-            assert queue.queue_name == expected_queue_name, \
-                f"队列名称不匹配: {queue.queue_name} != {expected_queue_name}"
-            assert queue.processing_queue == expected_processing_queue, \
-                f"处理中队列名称不匹配: {queue.processing_queue} != {expected_processing_queue}"
-            assert queue.failed_queue == expected_failed_queue, \
-                f"失败队列名称不匹配: {queue.failed_queue} != {expected_failed_queue}"
-            
-            print(f"      ✅ module_name: {queue.module_name}")
-            print(f"      ✅ 队列名称: {queue.queue_name}")
-            print(f"      ✅ 处理中队列名称: {queue.processing_queue}")
-            print(f"      ✅ 失败队列名称: {queue.failed_queue}")
-        
-        print("✅ QueueManager Redis key命名测试通过！")
-        return True
-        
-    except Exception as e:
-        print(f"❌ QueueManager Redis key命名测试失败: {e}")
-        traceback.print_exc()
-        return False
-
-
-async def main():
-    """主测试函数"""
-    print("🚀 开始QueueManager Redis key命名测试...")
-    print("=" * 50)
-    
-    try:
-        success = await test_queue_manager_redis_key()
-        
-        print("=" * 50)
-        if success:
-            print("🎉 所有测试通过！QueueManager正确传递module_name参数")
-        else:
-            print("❌ 测试失败，请检查实现")
-            return 1
-            
-    except Exception as e:
-        print("=" * 50)
-        print(f"❌ 测试过程中发生异常: {e}")
-        traceback.print_exc()
-        return 1
-    
-    return 0
-
-
-if __name__ == "__main__":
-    exit_code = asyncio.run(main())
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+QueueManager Redis Key 测试脚本
+用于验证QueueManager在创建RedisPriorityQueue时是否正确传递module_name参数
+"""
+import asyncio
+import sys
+import os
+import traceback
+
+# 添加项目根目录到路径
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+
+from crawlo.queue.queue_manager import QueueManager, QueueConfig, QueueType
+
+
+class MockSettings:
+    """模拟设置类"""
+    def __init__(self, project_name="test_project"):
+        self.project_name = project_name
+        self.REDIS_URL = "redis://127.0.0.1:6379/15"  # 使用测试数据库
+        self.REDIS_TTL = 0
+        self.CLEANUP_FP = 0
+        self.FILTER_DEBUG = True
+        self.LOG_LEVEL = "INFO"
+        self.DECODE_RESPONSES = True
+    
+    def get(self, key, default=None):
+        if key == 'PROJECT_NAME':
+            return self.project_name
+        elif key == 'REDIS_URL':
+            return self.REDIS_URL
+        elif key == 'FILTER_DEBUG':
+            return self.FILTER_DEBUG
+        elif key == 'LOG_LEVEL':
+            return self.LOG_LEVEL
+        elif key == 'DECODE_RESPONSES':
+            return self.DECODE_RESPONSES
+        return default
+    
+    def get_bool(self, key, default=False):
+        if key == 'FILTER_DEBUG':
+            return self.FILTER_DEBUG
+        elif key == 'DECODE_RESPONSES':
+            return self.DECODE_RESPONSES
+        elif key == 'CLEANUP_FP':
+            return self.CLEANUP_FP
+        return default
+    
+    def get_int(self, key, default=0):
+        if key == 'REDIS_TTL':
+            return self.REDIS_TTL
+        elif key == 'REDIS_PORT':
+            return 6379
+        elif key == 'REDIS_DB':
+            return 0
+        elif key == 'SCHEDULER_MAX_QUEUE_SIZE':
+            return 1000
+        elif key == 'QUEUE_MAX_RETRIES':
+            return 3
+        elif key == 'QUEUE_TIMEOUT':
+            return 300
+        return default
+
+
+async def test_queue_manager_redis_key():
+    """测试QueueManager创建Redis队列时的key命名"""
+    print("🔍 测试QueueManager创建Redis队列时的key命名...")
+    
+    try:
+        # 测试不同的队列名称配置
+        test_cases = [
+            {
+                "queue_name": "crawlo:books_distributed:queue:requests",
+                "expected_module_name": "books_distributed",
+                "description": "标准项目名称"
+            },
+            {
+                "queue_name": "crawlo:api_data_collection:queue:requests",
+                "expected_module_name": "api_data_collection",
+                "description": "API数据采集项目"
+            },
+            {
+                "queue_name": "crawlo:test_project:queue:requests",
+                "expected_module_name": "test_project",
+                "description": "测试项目"
+            },
+            {
+                "queue_name": "simple_queue_name",
+                "expected_module_name": "simple_queue_name",
+                "description": "简单队列名称"
+            },
+            {
+                "queue_name": "",
+                "expected_module_name": "default",
+                "description": "空队列名称"
+            }
+        ]
+        
+        for i, test_case in enumerate(test_cases, 1):
+            print(f"   {i}. 测试 {test_case['description']}...")
+            
+            # 创建QueueConfig
+            config = QueueConfig(
+                queue_type=QueueType.REDIS,
+                redis_url="redis://127.0.0.1:6379/15",
+                queue_name=test_case["queue_name"],
+                max_queue_size=1000,
+                max_retries=3,
+                timeout=300
+            )
+            
+            # 创建QueueManager
+            queue_manager = QueueManager(config)
+            
+            # 创建队列实例
+            queue = await queue_manager._create_queue(QueueType.REDIS)
+            
+            # 验证module_name是否正确设置
+            assert hasattr(queue, 'module_name'), "RedisPriorityQueue缺少module_name属性"
+            assert queue.module_name == test_case["expected_module_name"], \
+                f"module_name不匹配: {queue.module_name} != {test_case['expected_module_name']}"
+            
+            # 验证队列名称是否符合规范
+            expected_queue_name = f"crawlo:{queue.module_name}:queue:requests"
+            expected_processing_queue = f"crawlo:{queue.module_name}:queue:processing"
+            expected_failed_queue = f"crawlo:{queue.module_name}:queue:failed"
+            
+            assert queue.queue_name == expected_queue_name, \
+                f"队列名称不匹配: {queue.queue_name} != {expected_queue_name}"
+            assert queue.processing_queue == expected_processing_queue, \
+                f"处理中队列名称不匹配: {queue.processing_queue} != {expected_processing_queue}"
+            assert queue.failed_queue == expected_failed_queue, \
+                f"失败队列名称不匹配: {queue.failed_queue} != {expected_failed_queue}"
+            
+            print(f"      ✅ module_name: {queue.module_name}")
+            print(f"      ✅ 队列名称: {queue.queue_name}")
+            print(f"      ✅ 处理中队列名称: {queue.processing_queue}")
+            print(f"      ✅ 失败队列名称: {queue.failed_queue}")
+        
+        print("✅ QueueManager Redis key命名测试通过！")
+        return True
+        
+    except Exception as e:
+        print(f"❌ QueueManager Redis key命名测试失败: {e}")
+        traceback.print_exc()
+        return False
+
+
+async def main():
+    """主测试函数"""
+    print("🚀 开始QueueManager Redis key命名测试...")
+    print("=" * 50)
+    
+    try:
+        success = await test_queue_manager_redis_key()
+        
+        print("=" * 50)
+        if success:
+            print("🎉 所有测试通过！QueueManager正确传递module_name参数")
+        else:
+            print("❌ 测试失败，请检查实现")
+            return 1
+            
+    except Exception as e:
+        print("=" * 50)
+        print(f"❌ 测试过程中发生异常: {e}")
+        traceback.print_exc()
+        return 1
+    
+    return 0
+
+
+if __name__ == "__main__":
+    exit_code = asyncio.run(main())
     sys.exit(exit_code)

tests/test_real_scenario_proxy.py

@@ -0,0 +1,196 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+真实场景代理测试
+================
+使用用户提供的headers、cookies和URL测试代理功能
+"""
+
+import asyncio
+import aiohttp
+import sys
+import os
+from urllib.parse import urlparse
+
+# 添加项目根目录到Python路径
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+
+# 用户提供的请求头
+HEADERS = {
+    "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+    "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
+    "cache-control": "no-cache",
+    "pragma": "no-cache",
+    "priority": "u=0, i",
+    "sec-ch-ua": "\"Chromium\";v=\"140\", \"Not=A?Brand\";v=\"24\", \"Google Chrome\";v=\"140\"",
+    "sec-ch-ua-mobile": "?0",
+    "sec-ch-ua-platform": "\"Windows\"",
+    "sec-fetch-dest": "document",
+    "sec-fetch-mode": "navigate",
+    "sec-fetch-site": "none",
+    "sec-fetch-user": "?1",
+    "upgrade-insecure-requests": "1",
+    "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36"
+}
+
+# 用户提供的cookies
+COOKIES = {
+    "Hm_lvt_722143063e4892925903024537075d0d": "1758071793",
+    "Hm_lvt_929f8b362150b1f77b477230541dbbc2": "1758071793",
+    "historystock": "600699",
+    "spversion": "20130314",
+    "cid": "f9bc812da2c3a7ddf6d5df1fa2d497091758076438",
+    "u_ukey": "A10702B8689642C6BE607730E11E6E4A",
+    "u_uver": "1.0.0",
+    "u_dpass": "Qk3U07X7SHGKa0AcRUg1R1DVWbPioD9Eg270bdikvlwWWXexbsXnRsQNt%2B04iXwdHi80LrSsTFH9a%2B6rtRvqGg%3D%3D",
+    "u_did": "E3ED337393E1429DA56E380DD00B3CCD",
+    "u_ttype": "WEB",
+    "user_status": "0",
+    "ttype": "WEB",
+    "log": "",
+    "Hm_lvt_69929b9dce4c22a060bd22d703b2a280": "1758079404,1758113068,1758157144",
+    "HMACCOUNT": "08DF0D235A291EAA",
+    "Hm_lvt_78c58f01938e4d85eaf619eae71b4ed1": "1758071793,1758113068,1758157144",
+    "user": "MDpteF9lNXRkY3RpdHo6Ok5vbmU6NTAwOjgxNzYyOTAwNDo3LDExMTExMTExMTExLDQwOzQ0LDExLDQwOzYsMSw0MDs1LDEsNDA7MSwxMDEsNDA7MiwxLDQwOzMsMSw0MDs1LDEsNDA7OCwwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMSw0MDsxMDIsMSw0MDoxNjo6OjgwNzYyOTAwNDoxNzU4MTYxNTE0Ojo6MTc1ODA3MjA2MDo2MDQ4MDA6MDoxYTQ0NmFlNDY4M2VmZWY3YmNjYTczY2U3ODZmZTNiODg6ZGVmYXVsdF81OjA%3D",
+    "userid": "807629004",
+    "u_name": "mx_e5tdctitz",
+    "escapename": "mx_e5tdctitz",
+    "ticket": "85eea709becdd924d7eb975351de629e",
+    "utk": "8959c4c6b6f5fb7628864feab15473f4",
+    "sess_tk": "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiIsImtpZCI6InNlc3NfdGtfMSIsImJ0eSI6InNlc3NfdGsifQ.eyJqdGkiOiI4ODNiZmU4NmU3M2NhN2NjN2JlZmVmODM0NmFlNDZhNDEiLCJpYXQiOjE3NTgxNjE1MTQsImV4cCI6MTc1ODc2NjMxNCwic3ViIjoiODA3NjI5MDA0IiwiaXNzIjoidXBhc3MuaXdlbmNhaS5jb20iLCJhdWQiOiIyMDIwMTExODUyODg5MDcyIiwiYWN0Ijoib2ZjIiwiY3VocyI6ImIwNTcyZDVjOWNlNDg0MGFlOWYxYTlhYjU3NGZkNjQyYjgzNmExN2E3Y2NhZjk4ZWRiNzI5ZmJkOWFjOGVkYmYifQ.UBNIzxGvQQtXSiIcB_1JJl-EuAc1S9j2LcTLXjwy4ImhDDbh1oJvyRdDUrXdUpwBpIyx5zgYqgt_3FEhY_iayw",
+    "cuc": "ap2eap3gg99g",
+    "Hm_lvt_f79b64788a4e377c608617fba4c736e2": "1758161692",
+    "v": "A1glI4rWhPCQGqh0MvA0ioufKY3vQbzLHqWQT5JJpBNGLfazOlGMW261YNrh",
+    "Hm_lpvt_78c58f01938e4d85eaf619eae71b4ed1": "1758163145",
+    "Hm_lpvt_f79b64788a4e377c608617fba4c736e2": "1758163145",
+    "Hm_lpvt_69929b9dce4c22a060bd22d703b2a280": "1758163145"
+}
+
+# 用户提供的URL
+URL = "https://stock.10jqka.com.cn/20240315/c655957791.shtml"
+
+
+async def test_without_proxy():
+    """不使用代理直接测试访问"""
+    print("=== 不使用代理直接访问 ===")
+    print(f"URL: {URL}")
+    
+    try:
+        timeout = aiohttp.ClientTimeout(total=15)
+        async with aiohttp.ClientSession(timeout=timeout, headers=HEADERS, cookies=COOKIES) as session:
+            async with session.get(URL) as response:
+                print(f"状态码: {response.status}")
+                if response.status == 200:
+                    print("✅ 直接访问成功")
+                    return True
+                else:
+                    print(f"❌ 直接访问失败，状态码: {response.status}")
+                    return False
+    except Exception as e:
+        print(f"❌ 直接访问出错: {e}")
+        return False
+
+
+async def test_with_proxy(proxy_url):
+    """使用代理测试访问"""
+    print(f"\n=== 使用代理访问 ===")
+    print(f"代理地址: {proxy_url}")
+    print(f"URL: {URL}")
+    
+    try:
+        timeout = aiohttp.ClientTimeout(total=15)
+        async with aiohttp.ClientSession(timeout=timeout, headers=HEADERS, cookies=COOKIES) as session:
+            # 处理带认证的代理
+            if "@" in proxy_url and "://" in proxy_url:
+                parsed = urlparse(proxy_url)
+                if parsed.username and parsed.password:
+                    # 提取认证信息
+                    auth = aiohttp.BasicAuth(parsed.username, parsed.password)
+                    # 清理代理URL
+                    clean_proxy = f"{parsed.scheme}://{parsed.hostname}"
+                    if parsed.port:
+                        clean_proxy += f":{parsed.port}"
+                    
+                    print(f"使用带认证的代理: {clean_proxy}")
+                    async with session.get(URL, proxy=clean_proxy, proxy_auth=auth) as response:
+                        print(f"状态码: {response.status}")
+                        if response.status == 200:
+                            print("✅ 代理访问成功")
+                            return True
+                        else:
+                            print(f"❌ 代理访问失败，状态码: {response.status}")
+                            return False
+            else:
+                # 直接使用代理URL
+                print(f"使用代理: {proxy_url}")
+                async with session.get(URL, proxy=proxy_url) as response:
+                    print(f"状态码: {response.status}")
+                    if response.status == 200:
+                        print("✅ 代理访问成功")
+                        return True
+                    else:
+                        print(f"❌ 代理访问失败，状态码: {response.status}")
+                        return False
+    except Exception as e:
+        print(f"❌ 代理访问出错: {e}")
+        return False
+
+
+async def get_proxy_from_api():
+    """从代理API获取代理"""
+    proxy_api = 'http://test.proxy.api:8080/proxy/getitem/'
+    print(f"\n=== 从代理API获取代理 ===")
+    print(f"API地址: {proxy_api}")
+    
+    try:
+        timeout = aiohttp.ClientTimeout(total=10)
+        async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with session.get(proxy_api) as response:
+                print(f"状态码: {response.status}")
+                
+                if response.status == 200:
+                    data = await response.json()
+                    print(f"响应数据: {data}")
+                    
+                    # 提取代理URL
+                    if isinstance(data, dict) and data.get('status') == 0:
+                        proxy_info = data.get('proxy', {})
+                        if isinstance(proxy_info, dict):
+                            proxy_url = proxy_info.get('https') or proxy_info.get('http')
+                            if proxy_url:
+                                print(f"提取到的代理URL: {proxy_url}")
+                                return proxy_url
+                print("无法获取代理URL")
+                return None
+    except Exception as e:
+        print(f"API请求出错: {e}")
+        return None
+
+
+async def main():
+    """主测试函数"""
+    print("开始真实场景代理测试...")
+    print("=" * 50)
+    
+    # 1. 首先测试不使用代理直接访问
+    direct_success = await test_without_proxy()
+    
+    # 2. 从代理API获取代理
+    proxy_url = await get_proxy_from_api()
+    
+    if not proxy_url:
+        print("\n❌ 无法获取代理，测试结束")
+        return
+    
+    # 3. 使用代理访问
+    proxy_success = await test_with_proxy(proxy_url)
+    
+    # 4. 测试结果总结
+    print(f"\n{'='*30}")
+    print("测试结果:")
+    print(f"直接访问: {'成功' if direct_success else '失败'}")
+    print(f"代理访问: {'成功' if proxy_success else '失败'}")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

tests/test_redis_config.py

@@ -1,29 +1,29 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-快速测试 Redis 连接配置修复
-"""
-import asyncio
-from crawlo.queue.redis_priority_queue import RedisPriorityQueue
-from crawlo.settings.default_settings import REDIS_URL
-
-async def test_redis_config():
-    """测试修复后的 Redis 配置"""
-    print(f"🔍 测试 Redis 配置: {REDIS_URL}")
-    
-    try:
-        queue = RedisPriorityQueue(redis_url=REDIS_URL)
-        await queue.connect()
-        print("✅ Redis 连接成功！")
-        await queue.close()
-        return True
-    except Exception as e:
-        print(f"❌ Redis 连接失败: {e}")
-        return False
-
-if __name__ == "__main__":
-    success = asyncio.run(test_redis_config())
-    if success:
-        print("🎉 配置修复成功！现在可以运行你的爬虫了。")
-    else:
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+快速测试 Redis 连接配置修复
+"""
+import asyncio
+from crawlo.queue.redis_priority_queue import RedisPriorityQueue
+from crawlo.settings.default_settings import REDIS_URL
+
+async def test_redis_config():
+    """测试修复后的 Redis 配置"""
+    print(f"🔍 测试 Redis 配置: {REDIS_URL}")
+    
+    try:
+        queue = RedisPriorityQueue(redis_url=REDIS_URL)
+        await queue.connect()
+        print("✅ Redis 连接成功！")
+        await queue.close()
+        return True
+    except Exception as e:
+        print(f"❌ Redis 连接失败: {e}")
+        return False
+
+if __name__ == "__main__":
+    success = asyncio.run(test_redis_config())
+    if success:
+        print("🎉 配置修复成功！现在可以运行你的爬虫了。")
+    else:
         print("❌ 配置仍有问题，请检查 Redis 服务状态。")