crawlo 1.1.3__py3-none-any.whl → 1.1.4__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of crawlo might be problematic. Click here for more details.

Files changed (118) hide show
  1. crawlo/__init__.py +34 -34
  2. crawlo/__version__.py +1 -1
  3. crawlo/cli.py +40 -40
  4. crawlo/commands/__init__.py +13 -13
  5. crawlo/commands/check.py +594 -594
  6. crawlo/commands/genspider.py +151 -151
  7. crawlo/commands/list.py +155 -155
  8. crawlo/commands/run.py +285 -285
  9. crawlo/commands/startproject.py +196 -196
  10. crawlo/commands/stats.py +188 -188
  11. crawlo/commands/utils.py +186 -186
  12. crawlo/config.py +279 -279
  13. crawlo/core/__init__.py +2 -2
  14. crawlo/core/engine.py +171 -171
  15. crawlo/core/enhanced_engine.py +189 -189
  16. crawlo/core/processor.py +40 -40
  17. crawlo/core/scheduler.py +165 -165
  18. crawlo/crawler.py +1027 -1027
  19. crawlo/downloader/__init__.py +242 -242
  20. crawlo/downloader/aiohttp_downloader.py +212 -212
  21. crawlo/downloader/cffi_downloader.py +251 -251
  22. crawlo/downloader/httpx_downloader.py +259 -259
  23. crawlo/event.py +11 -11
  24. crawlo/exceptions.py +81 -81
  25. crawlo/extension/__init__.py +38 -31
  26. crawlo/extension/health_check.py +142 -0
  27. crawlo/extension/log_interval.py +58 -49
  28. crawlo/extension/log_stats.py +82 -44
  29. crawlo/extension/logging_extension.py +44 -35
  30. crawlo/extension/memory_monitor.py +89 -0
  31. crawlo/extension/performance_profiler.py +118 -0
  32. crawlo/extension/request_recorder.py +108 -0
  33. crawlo/filters/__init__.py +154 -154
  34. crawlo/filters/aioredis_filter.py +241 -241
  35. crawlo/filters/memory_filter.py +269 -269
  36. crawlo/items/__init__.py +23 -23
  37. crawlo/items/base.py +21 -21
  38. crawlo/items/fields.py +53 -53
  39. crawlo/items/items.py +104 -104
  40. crawlo/middleware/__init__.py +21 -21
  41. crawlo/middleware/default_header.py +32 -32
  42. crawlo/middleware/download_delay.py +28 -28
  43. crawlo/middleware/middleware_manager.py +135 -135
  44. crawlo/middleware/proxy.py +248 -248
  45. crawlo/middleware/request_ignore.py +30 -30
  46. crawlo/middleware/response_code.py +18 -18
  47. crawlo/middleware/response_filter.py +26 -26
  48. crawlo/middleware/retry.py +124 -124
  49. crawlo/mode_manager.py +200 -200
  50. crawlo/network/__init__.py +21 -21
  51. crawlo/network/request.py +311 -311
  52. crawlo/network/response.py +271 -271
  53. crawlo/pipelines/__init__.py +21 -21
  54. crawlo/pipelines/bloom_dedup_pipeline.py +156 -156
  55. crawlo/pipelines/console_pipeline.py +39 -39
  56. crawlo/pipelines/csv_pipeline.py +316 -316
  57. crawlo/pipelines/database_dedup_pipeline.py +224 -224
  58. crawlo/pipelines/json_pipeline.py +218 -218
  59. crawlo/pipelines/memory_dedup_pipeline.py +115 -115
  60. crawlo/pipelines/mongo_pipeline.py +132 -117
  61. crawlo/pipelines/mysql_pipeline.py +317 -195
  62. crawlo/pipelines/pipeline_manager.py +56 -56
  63. crawlo/pipelines/redis_dedup_pipeline.py +162 -162
  64. crawlo/project.py +153 -153
  65. crawlo/queue/pqueue.py +37 -37
  66. crawlo/queue/queue_manager.py +307 -307
  67. crawlo/queue/redis_priority_queue.py +208 -208
  68. crawlo/settings/__init__.py +7 -7
  69. crawlo/settings/default_settings.py +278 -244
  70. crawlo/settings/setting_manager.py +99 -99
  71. crawlo/spider/__init__.py +639 -639
  72. crawlo/stats_collector.py +59 -59
  73. crawlo/subscriber.py +131 -106
  74. crawlo/task_manager.py +30 -30
  75. crawlo/templates/crawlo.cfg.tmpl +10 -10
  76. crawlo/templates/project/__init__.py.tmpl +3 -3
  77. crawlo/templates/project/items.py.tmpl +17 -17
  78. crawlo/templates/project/middlewares.py.tmpl +111 -87
  79. crawlo/templates/project/pipelines.py.tmpl +97 -341
  80. crawlo/templates/project/run.py.tmpl +251 -251
  81. crawlo/templates/project/settings.py.tmpl +279 -250
  82. crawlo/templates/project/spiders/__init__.py.tmpl +5 -5
  83. crawlo/templates/spider/spider.py.tmpl +142 -178
  84. crawlo/utils/__init__.py +7 -7
  85. crawlo/utils/controlled_spider_mixin.py +439 -439
  86. crawlo/utils/date_tools.py +233 -233
  87. crawlo/utils/db_helper.py +343 -343
  88. crawlo/utils/func_tools.py +82 -82
  89. crawlo/utils/large_scale_config.py +286 -286
  90. crawlo/utils/large_scale_helper.py +343 -343
  91. crawlo/utils/log.py +128 -128
  92. crawlo/utils/queue_helper.py +175 -175
  93. crawlo/utils/request.py +267 -267
  94. crawlo/utils/request_serializer.py +219 -219
  95. crawlo/utils/spider_loader.py +62 -62
  96. crawlo/utils/system.py +11 -11
  97. crawlo/utils/tools.py +4 -4
  98. crawlo/utils/url.py +39 -39
  99. crawlo-1.1.4.dist-info/METADATA +403 -0
  100. crawlo-1.1.4.dist-info/RECORD +117 -0
  101. examples/__init__.py +7 -7
  102. examples/controlled_spider_example.py +205 -205
  103. tests/__init__.py +7 -7
  104. tests/test_final_validation.py +153 -153
  105. tests/test_proxy_health_check.py +32 -32
  106. tests/test_proxy_middleware_integration.py +136 -136
  107. tests/test_proxy_providers.py +56 -56
  108. tests/test_proxy_stats.py +19 -19
  109. tests/test_proxy_strategies.py +59 -59
  110. tests/test_redis_config.py +28 -28
  111. tests/test_redis_queue.py +224 -224
  112. tests/test_request_serialization.py +70 -70
  113. tests/test_scheduler.py +241 -241
  114. crawlo-1.1.3.dist-info/METADATA +0 -635
  115. crawlo-1.1.3.dist-info/RECORD +0 -113
  116. {crawlo-1.1.3.dist-info → crawlo-1.1.4.dist-info}/WHEEL +0 -0
  117. {crawlo-1.1.3.dist-info → crawlo-1.1.4.dist-info}/entry_points.txt +0 -0
  118. {crawlo-1.1.3.dist-info → crawlo-1.1.4.dist-info}/top_level.txt +0 -0
tests/test_scheduler.py CHANGED
@@ -1,242 +1,242 @@
1
- #!/usr/bin/env python3
2
- # -*- coding: utf-8 -*-
3
- """
4
- 测试修复后的 Scheduler 分布式队列功能
5
- """
6
- import asyncio
7
- import sys
8
- from unittest.mock import Mock
9
- from crawlo.core.scheduler import Scheduler
10
- from crawlo.network.request import Request
11
- from crawlo.utils.log import get_logger
12
-
13
-
14
- class MockCrawler:
15
- """模拟 Crawler 对象"""
16
- def __init__(self, use_redis=True):
17
- self.settings = MockSettings(use_redis)
18
- self.stats = Mock()
19
-
20
-
21
- class MockSettings:
22
- """模拟 Settings 对象"""
23
- def __init__(self, use_redis=True):
24
- self.use_redis = use_redis
25
-
26
- def get(self, key, default=None):
27
- config = {
28
- 'FILTER_CLASS': 'crawlo.filters.memory_filter.MemoryFilter',
29
- 'LOG_LEVEL': 'INFO',
30
- 'DEPTH_PRIORITY': 1,
31
- 'SCHEDULER_MAX_QUEUE_SIZE': 100,
32
- 'SCHEDULER_QUEUE_NAME': 'test:crawlo:requests',
33
- 'FILTER_DEBUG': False,
34
- 'PROJECT_NAME': 'test',
35
- }
36
- if self.use_redis:
37
- config['REDIS_URL'] = 'redis://localhost:6379/0'
38
-
39
- return config.get(key, default)
40
-
41
- def get_int(self, key, default=0):
42
- value = self.get(key, default)
43
- return int(value) if value is not None else default
44
-
45
- def get_bool(self, key, default=False):
46
- value = self.get(key, default)
47
- if isinstance(value, bool):
48
- return value
49
- if isinstance(value, str):
50
- return value.lower() in ('true', '1', 'yes')
51
- return bool(value) if value is not None else default
52
-
53
-
54
- class MockFilter:
55
- """模拟去重过滤器"""
56
- def __init__(self):
57
- self.seen = set()
58
-
59
- @classmethod
60
- def create_instance(cls, crawler):
61
- return cls()
62
-
63
- async def requested(self, request):
64
- if request.url in self.seen:
65
- return True
66
- self.seen.add(request.url)
67
- return False
68
-
69
- def log_stats(self, request):
70
- pass
71
-
72
-
73
- async def test_memory_scheduler():
74
- """测试内存调度器"""
75
- print("🔍 测试内存调度器...")
76
-
77
- crawler = MockCrawler(use_redis=False)
78
- scheduler = Scheduler.create_instance(crawler)
79
-
80
- # 模拟去重过滤器
81
- scheduler.dupe_filter = MockFilter()
82
-
83
- scheduler.open()
84
-
85
- # 测试入队
86
- request1 = Request(url="https://example1.com")
87
- request2 = Request(url="https://example2.com")
88
-
89
- success1 = await scheduler.enqueue_request(request1)
90
- success2 = await scheduler.enqueue_request(request2)
91
-
92
- print(f" 📤 入队结果: {success1}, {success2}")
93
- print(f" 📊 队列大小: {len(scheduler)}")
94
-
95
- # 测试出队
96
- req1 = await scheduler.next_request()
97
- req2 = await scheduler.next_request()
98
-
99
- print(f" 📥 出队结果: {req1.url if req1 else None}, {req2.url if req2 else None}")
100
- print(f" 📊 剩余大小: {len(scheduler)}")
101
-
102
- await scheduler.close()
103
- print(" ✅ 内存调度器测试完成")
104
-
105
-
106
- async def test_redis_scheduler():
107
- """测试 Redis 调度器"""
108
- print("🔍 测试 Redis 调度器...")
109
-
110
- try:
111
- crawler = MockCrawler(use_redis=True)
112
- scheduler = Scheduler.create_instance(crawler)
113
-
114
- # 模拟去重过滤器
115
- scheduler.dupe_filter = MockFilter()
116
-
117
- scheduler.open()
118
-
119
- # 测试入队
120
- request1 = Request(url="https://redis-test1.com", priority=5)
121
- request2 = Request(url="https://redis-test2.com", priority=3)
122
- request3 = Request(url="https://redis-test3.com", priority=8)
123
-
124
- success1 = await scheduler.enqueue_request(request1)
125
- success2 = await scheduler.enqueue_request(request2)
126
- success3 = await scheduler.enqueue_request(request3)
127
-
128
- print(f" 📤 入队结果: {success1}, {success2}, {success3}")
129
- print(f" 📊 队列大小: {len(scheduler)}")
130
-
131
- # 等待一小段时间让 Redis 操作完成
132
- await asyncio.sleep(0.5)
133
-
134
- # 测试出队(应该按优先级排序)
135
- req1 = await scheduler.next_request()
136
- req2 = await scheduler.next_request()
137
- req3 = await scheduler.next_request()
138
-
139
- print(" 📥 出队结果(按优先级):")
140
- if req1:
141
- print(f" {req1.url} (优先级: {getattr(req1, 'priority', 0)})")
142
- if req2:
143
- print(f" {req2.url} (优先级: {getattr(req2, 'priority', 0)})")
144
- if req3:
145
- print(f" {req3.url} (优先级: {getattr(req3, 'priority', 0)})")
146
-
147
- print(f" 📊 剩余大小: {len(scheduler)}")
148
-
149
- await scheduler.close()
150
- print(" ✅ Redis 调度器测试完成")
151
-
152
- except Exception as e:
153
- print(f" ❌ Redis 调度器测试失败: {e}")
154
- import traceback
155
- traceback.print_exc()
156
-
157
-
158
- async def test_concurrent_redis():
159
- """测试并发 Redis 操作"""
160
- print("🔍 测试并发 Redis 操作...")
161
-
162
- async def producer(scheduler, name, count):
163
- """生产者"""
164
- for i in range(count):
165
- request = Request(url=f"https://{name}-{i}.com", priority=i % 10)
166
- await scheduler.enqueue_request(request)
167
- await asyncio.sleep(0.01)
168
- print(f" ✅ 生产者 {name} 完成 ({count} 个请求)")
169
-
170
- async def consumer(scheduler, name, count):
171
- """消费者"""
172
- consumed = 0
173
- for _ in range(count):
174
- request = await scheduler.next_request()
175
- if request:
176
- consumed += 1
177
- await asyncio.sleep(0.005)
178
- else:
179
- break
180
- print(f" ✅ 消费者 {name} 处理了 {consumed} 个请求")
181
-
182
- try:
183
- crawler = MockCrawler(use_redis=True)
184
- scheduler = Scheduler.create_instance(crawler)
185
- scheduler.dupe_filter = MockFilter()
186
- scheduler.open()
187
-
188
- # 并发运行生产者和消费者
189
- tasks = [
190
- producer(scheduler, "producer-1", 5),
191
- producer(scheduler, "producer-2", 5),
192
- consumer(scheduler, "consumer-1", 3),
193
- consumer(scheduler, "consumer-2", 3),
194
- consumer(scheduler, "consumer-3", 4),
195
- ]
196
-
197
- await asyncio.gather(*tasks, return_exceptions=True)
198
-
199
- print(f" 📊 最终队列大小: {len(scheduler)}")
200
-
201
- await scheduler.close()
202
- print(" ✅ 并发测试完成")
203
-
204
- except Exception as e:
205
- print(f" ❌ 并发测试失败: {e}")
206
- import traceback
207
- traceback.print_exc()
208
-
209
-
210
- async def main():
211
- """主测试函数"""
212
- print("🚀 开始测试修复后的 Scheduler...")
213
- print("=" * 50)
214
-
215
- try:
216
- # 1. 测试内存调度器
217
- await test_memory_scheduler()
218
- print()
219
-
220
- # 2. 测试 Redis 调度器
221
- await test_redis_scheduler()
222
- print()
223
-
224
- # 3. 测试并发操作
225
- await test_concurrent_redis()
226
-
227
- print("=" * 50)
228
- print("🎉 所有 Scheduler 测试完成!")
229
-
230
- except Exception as e:
231
- print("=" * 50)
232
- print(f"❌ 测试失败: {e}")
233
- import traceback
234
- traceback.print_exc()
235
-
236
-
237
- if __name__ == "__main__":
238
- # 设置日志级别避免过多输出
239
- import logging
240
- logging.getLogger('crawlo').setLevel(logging.WARNING)
241
-
1
+ #!/usr/bin/env python3
2
+ # -*- coding: utf-8 -*-
3
+ """
4
+ 测试修复后的 Scheduler 分布式队列功能
5
+ """
6
+ import asyncio
7
+ import sys
8
+ from unittest.mock import Mock
9
+ from crawlo.core.scheduler import Scheduler
10
+ from crawlo.network.request import Request
11
+ from crawlo.utils.log import get_logger
12
+
13
+
14
+ class MockCrawler:
15
+ """模拟 Crawler 对象"""
16
+ def __init__(self, use_redis=True):
17
+ self.settings = MockSettings(use_redis)
18
+ self.stats = Mock()
19
+
20
+
21
+ class MockSettings:
22
+ """模拟 Settings 对象"""
23
+ def __init__(self, use_redis=True):
24
+ self.use_redis = use_redis
25
+
26
+ def get(self, key, default=None):
27
+ config = {
28
+ 'FILTER_CLASS': 'crawlo.filters.memory_filter.MemoryFilter',
29
+ 'LOG_LEVEL': 'INFO',
30
+ 'DEPTH_PRIORITY': 1,
31
+ 'SCHEDULER_MAX_QUEUE_SIZE': 100,
32
+ 'SCHEDULER_QUEUE_NAME': 'test:crawlo:requests',
33
+ 'FILTER_DEBUG': False,
34
+ 'PROJECT_NAME': 'test',
35
+ }
36
+ if self.use_redis:
37
+ config['REDIS_URL'] = 'redis://localhost:6379/0'
38
+
39
+ return config.get(key, default)
40
+
41
+ def get_int(self, key, default=0):
42
+ value = self.get(key, default)
43
+ return int(value) if value is not None else default
44
+
45
+ def get_bool(self, key, default=False):
46
+ value = self.get(key, default)
47
+ if isinstance(value, bool):
48
+ return value
49
+ if isinstance(value, str):
50
+ return value.lower() in ('true', '1', 'yes')
51
+ return bool(value) if value is not None else default
52
+
53
+
54
+ class MockFilter:
55
+ """模拟去重过滤器"""
56
+ def __init__(self):
57
+ self.seen = set()
58
+
59
+ @classmethod
60
+ def create_instance(cls, crawler):
61
+ return cls()
62
+
63
+ async def requested(self, request):
64
+ if request.url in self.seen:
65
+ return True
66
+ self.seen.add(request.url)
67
+ return False
68
+
69
+ def log_stats(self, request):
70
+ pass
71
+
72
+
73
+ async def test_memory_scheduler():
74
+ """测试内存调度器"""
75
+ print("🔍 测试内存调度器...")
76
+
77
+ crawler = MockCrawler(use_redis=False)
78
+ scheduler = Scheduler.create_instance(crawler)
79
+
80
+ # 模拟去重过滤器
81
+ scheduler.dupe_filter = MockFilter()
82
+
83
+ scheduler.open()
84
+
85
+ # 测试入队
86
+ request1 = Request(url="https://example1.com")
87
+ request2 = Request(url="https://example2.com")
88
+
89
+ success1 = await scheduler.enqueue_request(request1)
90
+ success2 = await scheduler.enqueue_request(request2)
91
+
92
+ print(f" 📤 入队结果: {success1}, {success2}")
93
+ print(f" 📊 队列大小: {len(scheduler)}")
94
+
95
+ # 测试出队
96
+ req1 = await scheduler.next_request()
97
+ req2 = await scheduler.next_request()
98
+
99
+ print(f" 📥 出队结果: {req1.url if req1 else None}, {req2.url if req2 else None}")
100
+ print(f" 📊 剩余大小: {len(scheduler)}")
101
+
102
+ await scheduler.close()
103
+ print(" ✅ 内存调度器测试完成")
104
+
105
+
106
+ async def test_redis_scheduler():
107
+ """测试 Redis 调度器"""
108
+ print("🔍 测试 Redis 调度器...")
109
+
110
+ try:
111
+ crawler = MockCrawler(use_redis=True)
112
+ scheduler = Scheduler.create_instance(crawler)
113
+
114
+ # 模拟去重过滤器
115
+ scheduler.dupe_filter = MockFilter()
116
+
117
+ scheduler.open()
118
+
119
+ # 测试入队
120
+ request1 = Request(url="https://redis-test1.com", priority=5)
121
+ request2 = Request(url="https://redis-test2.com", priority=3)
122
+ request3 = Request(url="https://redis-test3.com", priority=8)
123
+
124
+ success1 = await scheduler.enqueue_request(request1)
125
+ success2 = await scheduler.enqueue_request(request2)
126
+ success3 = await scheduler.enqueue_request(request3)
127
+
128
+ print(f" 📤 入队结果: {success1}, {success2}, {success3}")
129
+ print(f" 📊 队列大小: {len(scheduler)}")
130
+
131
+ # 等待一小段时间让 Redis 操作完成
132
+ await asyncio.sleep(0.5)
133
+
134
+ # 测试出队(应该按优先级排序)
135
+ req1 = await scheduler.next_request()
136
+ req2 = await scheduler.next_request()
137
+ req3 = await scheduler.next_request()
138
+
139
+ print(" 📥 出队结果(按优先级):")
140
+ if req1:
141
+ print(f" {req1.url} (优先级: {getattr(req1, 'priority', 0)})")
142
+ if req2:
143
+ print(f" {req2.url} (优先级: {getattr(req2, 'priority', 0)})")
144
+ if req3:
145
+ print(f" {req3.url} (优先级: {getattr(req3, 'priority', 0)})")
146
+
147
+ print(f" 📊 剩余大小: {len(scheduler)}")
148
+
149
+ await scheduler.close()
150
+ print(" ✅ Redis 调度器测试完成")
151
+
152
+ except Exception as e:
153
+ print(f" ❌ Redis 调度器测试失败: {e}")
154
+ import traceback
155
+ traceback.print_exc()
156
+
157
+
158
+ async def test_concurrent_redis():
159
+ """测试并发 Redis 操作"""
160
+ print("🔍 测试并发 Redis 操作...")
161
+
162
+ async def producer(scheduler, name, count):
163
+ """生产者"""
164
+ for i in range(count):
165
+ request = Request(url=f"https://{name}-{i}.com", priority=i % 10)
166
+ await scheduler.enqueue_request(request)
167
+ await asyncio.sleep(0.01)
168
+ print(f" ✅ 生产者 {name} 完成 ({count} 个请求)")
169
+
170
+ async def consumer(scheduler, name, count):
171
+ """消费者"""
172
+ consumed = 0
173
+ for _ in range(count):
174
+ request = await scheduler.next_request()
175
+ if request:
176
+ consumed += 1
177
+ await asyncio.sleep(0.005)
178
+ else:
179
+ break
180
+ print(f" ✅ 消费者 {name} 处理了 {consumed} 个请求")
181
+
182
+ try:
183
+ crawler = MockCrawler(use_redis=True)
184
+ scheduler = Scheduler.create_instance(crawler)
185
+ scheduler.dupe_filter = MockFilter()
186
+ scheduler.open()
187
+
188
+ # 并发运行生产者和消费者
189
+ tasks = [
190
+ producer(scheduler, "producer-1", 5),
191
+ producer(scheduler, "producer-2", 5),
192
+ consumer(scheduler, "consumer-1", 3),
193
+ consumer(scheduler, "consumer-2", 3),
194
+ consumer(scheduler, "consumer-3", 4),
195
+ ]
196
+
197
+ await asyncio.gather(*tasks, return_exceptions=True)
198
+
199
+ print(f" 📊 最终队列大小: {len(scheduler)}")
200
+
201
+ await scheduler.close()
202
+ print(" ✅ 并发测试完成")
203
+
204
+ except Exception as e:
205
+ print(f" ❌ 并发测试失败: {e}")
206
+ import traceback
207
+ traceback.print_exc()
208
+
209
+
210
+ async def main():
211
+ """主测试函数"""
212
+ print("🚀 开始测试修复后的 Scheduler...")
213
+ print("=" * 50)
214
+
215
+ try:
216
+ # 1. 测试内存调度器
217
+ await test_memory_scheduler()
218
+ print()
219
+
220
+ # 2. 测试 Redis 调度器
221
+ await test_redis_scheduler()
222
+ print()
223
+
224
+ # 3. 测试并发操作
225
+ await test_concurrent_redis()
226
+
227
+ print("=" * 50)
228
+ print("🎉 所有 Scheduler 测试完成!")
229
+
230
+ except Exception as e:
231
+ print("=" * 50)
232
+ print(f"❌ 测试失败: {e}")
233
+ import traceback
234
+ traceback.print_exc()
235
+
236
+
237
+ if __name__ == "__main__":
238
+ # 设置日志级别避免过多输出
239
+ import logging
240
+ logging.getLogger('crawlo').setLevel(logging.WARNING)
241
+
242
242
  asyncio.run(main())