crawlo 1.4.1__py3-none-any.whl → 1.4.3__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 (326) hide show
  1. crawlo/__init__.py +93 -93
  2. crawlo/__version__.py +1 -1
  3. crawlo/cli.py +75 -75
  4. crawlo/commands/__init__.py +14 -14
  5. crawlo/commands/check.py +594 -594
  6. crawlo/commands/genspider.py +151 -151
  7. crawlo/commands/help.py +138 -138
  8. crawlo/commands/list.py +155 -155
  9. crawlo/commands/run.py +341 -341
  10. crawlo/commands/startproject.py +436 -436
  11. crawlo/commands/stats.py +187 -187
  12. crawlo/commands/utils.py +196 -196
  13. crawlo/config.py +312 -312
  14. crawlo/config_validator.py +277 -277
  15. crawlo/core/__init__.py +52 -52
  16. crawlo/core/engine.py +438 -439
  17. crawlo/core/processor.py +47 -47
  18. crawlo/core/scheduler.py +291 -257
  19. crawlo/crawler.py +650 -650
  20. crawlo/data/__init__.py +5 -5
  21. crawlo/data/user_agents.py +194 -194
  22. crawlo/downloader/__init__.py +273 -273
  23. crawlo/downloader/aiohttp_downloader.py +233 -228
  24. crawlo/downloader/cffi_downloader.py +245 -245
  25. crawlo/downloader/httpx_downloader.py +259 -259
  26. crawlo/downloader/hybrid_downloader.py +212 -212
  27. crawlo/downloader/playwright_downloader.py +402 -402
  28. crawlo/downloader/selenium_downloader.py +472 -472
  29. crawlo/event.py +11 -11
  30. crawlo/exceptions.py +81 -81
  31. crawlo/extension/__init__.py +63 -63
  32. crawlo/extension/health_check.py +141 -141
  33. crawlo/extension/log_interval.py +94 -94
  34. crawlo/extension/log_stats.py +70 -70
  35. crawlo/extension/logging_extension.py +61 -61
  36. crawlo/extension/memory_monitor.py +104 -104
  37. crawlo/extension/performance_profiler.py +133 -133
  38. crawlo/extension/request_recorder.py +107 -107
  39. crawlo/factories/__init__.py +27 -27
  40. crawlo/factories/base.py +68 -68
  41. crawlo/factories/crawler.py +103 -103
  42. crawlo/factories/registry.py +84 -84
  43. crawlo/filters/__init__.py +154 -154
  44. crawlo/filters/aioredis_filter.py +257 -257
  45. crawlo/filters/memory_filter.py +269 -269
  46. crawlo/framework.py +292 -292
  47. crawlo/initialization/__init__.py +44 -44
  48. crawlo/initialization/built_in.py +425 -425
  49. crawlo/initialization/context.py +141 -141
  50. crawlo/initialization/core.py +193 -193
  51. crawlo/initialization/phases.py +148 -148
  52. crawlo/initialization/registry.py +145 -145
  53. crawlo/items/__init__.py +23 -23
  54. crawlo/items/base.py +23 -23
  55. crawlo/items/fields.py +52 -52
  56. crawlo/items/items.py +104 -104
  57. crawlo/logging/__init__.py +45 -37
  58. crawlo/logging/async_handler.py +181 -0
  59. crawlo/logging/config.py +196 -96
  60. crawlo/logging/factory.py +171 -128
  61. crawlo/logging/manager.py +111 -111
  62. crawlo/logging/monitor.py +153 -0
  63. crawlo/logging/sampler.py +167 -0
  64. crawlo/middleware/__init__.py +21 -21
  65. crawlo/middleware/default_header.py +132 -132
  66. crawlo/middleware/download_delay.py +104 -104
  67. crawlo/middleware/middleware_manager.py +135 -135
  68. crawlo/middleware/offsite.py +123 -123
  69. crawlo/middleware/proxy.py +386 -386
  70. crawlo/middleware/request_ignore.py +86 -86
  71. crawlo/middleware/response_code.py +150 -150
  72. crawlo/middleware/response_filter.py +136 -136
  73. crawlo/middleware/retry.py +124 -124
  74. crawlo/middleware/simple_proxy.py +65 -65
  75. crawlo/mode_manager.py +219 -219
  76. crawlo/network/__init__.py +21 -21
  77. crawlo/network/request.py +379 -379
  78. crawlo/network/response.py +359 -359
  79. crawlo/pipelines/__init__.py +21 -21
  80. crawlo/pipelines/bloom_dedup_pipeline.py +146 -146
  81. crawlo/pipelines/console_pipeline.py +39 -39
  82. crawlo/pipelines/csv_pipeline.py +316 -316
  83. crawlo/pipelines/database_dedup_pipeline.py +197 -197
  84. crawlo/pipelines/json_pipeline.py +218 -218
  85. crawlo/pipelines/memory_dedup_pipeline.py +105 -105
  86. crawlo/pipelines/mongo_pipeline.py +131 -131
  87. crawlo/pipelines/mysql_pipeline.py +325 -325
  88. crawlo/pipelines/pipeline_manager.py +100 -84
  89. crawlo/pipelines/redis_dedup_pipeline.py +156 -156
  90. crawlo/project.py +349 -338
  91. crawlo/queue/pqueue.py +42 -42
  92. crawlo/queue/queue_manager.py +526 -522
  93. crawlo/queue/redis_priority_queue.py +370 -367
  94. crawlo/settings/__init__.py +7 -7
  95. crawlo/settings/default_settings.py +284 -284
  96. crawlo/settings/setting_manager.py +219 -219
  97. crawlo/spider/__init__.py +657 -657
  98. crawlo/stats_collector.py +73 -73
  99. crawlo/subscriber.py +129 -129
  100. crawlo/task_manager.py +138 -138
  101. crawlo/templates/crawlo.cfg.tmpl +10 -10
  102. crawlo/templates/project/__init__.py.tmpl +3 -3
  103. crawlo/templates/project/items.py.tmpl +17 -17
  104. crawlo/templates/project/middlewares.py.tmpl +118 -118
  105. crawlo/templates/project/pipelines.py.tmpl +96 -96
  106. crawlo/templates/project/settings.py.tmpl +170 -170
  107. crawlo/templates/project/settings_distributed.py.tmpl +169 -169
  108. crawlo/templates/project/settings_gentle.py.tmpl +166 -166
  109. crawlo/templates/project/settings_high_performance.py.tmpl +167 -167
  110. crawlo/templates/project/settings_minimal.py.tmpl +65 -65
  111. crawlo/templates/project/settings_simple.py.tmpl +164 -164
  112. crawlo/templates/project/spiders/__init__.py.tmpl +9 -9
  113. crawlo/templates/run.py.tmpl +34 -34
  114. crawlo/templates/spider/spider.py.tmpl +143 -143
  115. crawlo/templates/spiders_init.py.tmpl +9 -9
  116. crawlo/tools/__init__.py +200 -200
  117. crawlo/tools/anti_crawler.py +268 -268
  118. crawlo/tools/authenticated_proxy.py +240 -240
  119. crawlo/tools/data_formatter.py +225 -225
  120. crawlo/tools/data_validator.py +180 -180
  121. crawlo/tools/date_tools.py +289 -289
  122. crawlo/tools/distributed_coordinator.py +384 -384
  123. crawlo/tools/encoding_converter.py +127 -127
  124. crawlo/tools/network_diagnostic.py +364 -364
  125. crawlo/tools/request_tools.py +82 -82
  126. crawlo/tools/retry_mechanism.py +224 -224
  127. crawlo/tools/scenario_adapter.py +262 -262
  128. crawlo/tools/text_cleaner.py +232 -232
  129. crawlo/utils/__init__.py +34 -34
  130. crawlo/utils/batch_processor.py +259 -259
  131. crawlo/utils/class_loader.py +25 -25
  132. crawlo/utils/controlled_spider_mixin.py +439 -439
  133. crawlo/utils/db_helper.py +343 -343
  134. crawlo/utils/enhanced_error_handler.py +356 -356
  135. crawlo/utils/env_config.py +142 -142
  136. crawlo/utils/error_handler.py +165 -165
  137. crawlo/utils/fingerprint.py +122 -122
  138. crawlo/utils/func_tools.py +82 -82
  139. crawlo/utils/large_scale_config.py +286 -286
  140. crawlo/utils/large_scale_helper.py +344 -344
  141. crawlo/utils/log.py +79 -79
  142. crawlo/utils/performance_monitor.py +285 -285
  143. crawlo/utils/queue_helper.py +175 -175
  144. crawlo/utils/redis_connection_pool.py +388 -388
  145. crawlo/utils/redis_key_validator.py +198 -198
  146. crawlo/utils/request.py +267 -267
  147. crawlo/utils/request_serializer.py +225 -225
  148. crawlo/utils/spider_loader.py +61 -61
  149. crawlo/utils/system.py +11 -11
  150. crawlo/utils/tools.py +4 -4
  151. crawlo/utils/url.py +39 -39
  152. crawlo-1.4.3.dist-info/METADATA +190 -0
  153. crawlo-1.4.3.dist-info/RECORD +326 -0
  154. examples/__init__.py +7 -7
  155. examples/test_project/__init__.py +7 -7
  156. examples/test_project/run.py +34 -34
  157. examples/test_project/test_project/__init__.py +3 -3
  158. examples/test_project/test_project/items.py +17 -17
  159. examples/test_project/test_project/middlewares.py +118 -118
  160. examples/test_project/test_project/pipelines.py +96 -96
  161. examples/test_project/test_project/settings.py +169 -169
  162. examples/test_project/test_project/spiders/__init__.py +9 -9
  163. examples/test_project/test_project/spiders/of_week_dis.py +143 -143
  164. tests/__init__.py +7 -7
  165. tests/advanced_tools_example.py +275 -275
  166. tests/authenticated_proxy_example.py +106 -106
  167. tests/baidu_performance_test.py +108 -108
  168. tests/baidu_test.py +59 -59
  169. tests/cleaners_example.py +160 -160
  170. tests/comprehensive_framework_test.py +212 -212
  171. tests/comprehensive_test.py +81 -81
  172. tests/comprehensive_testing_summary.md +186 -186
  173. tests/config_validation_demo.py +142 -142
  174. tests/controlled_spider_example.py +205 -205
  175. tests/date_tools_example.py +180 -180
  176. tests/debug_configure.py +69 -69
  177. tests/debug_framework_logger.py +84 -84
  178. tests/debug_log_config.py +126 -126
  179. tests/debug_log_levels.py +63 -63
  180. tests/debug_pipelines.py +66 -66
  181. tests/detailed_log_test.py +233 -233
  182. tests/distributed_test.py +66 -66
  183. tests/distributed_test_debug.py +76 -76
  184. tests/dynamic_loading_example.py +523 -523
  185. tests/dynamic_loading_test.py +104 -104
  186. tests/env_config_example.py +133 -133
  187. tests/error_handling_example.py +171 -171
  188. tests/final_comprehensive_test.py +151 -151
  189. tests/final_log_test.py +260 -260
  190. tests/final_validation_test.py +182 -182
  191. tests/fix_log_test.py +142 -142
  192. tests/framework_performance_test.py +202 -202
  193. tests/log_buffering_test.py +111 -111
  194. tests/log_generation_timing_test.py +153 -153
  195. tests/optimized_performance_test.py +211 -211
  196. tests/performance_comparison.py +245 -245
  197. tests/queue_blocking_test.py +113 -113
  198. tests/queue_test.py +89 -89
  199. tests/redis_key_validation_demo.py +130 -130
  200. tests/request_params_example.py +150 -150
  201. tests/response_improvements_example.py +144 -144
  202. tests/scrapy_comparison/ofweek_scrapy.py +138 -138
  203. tests/scrapy_comparison/scrapy_test.py +133 -133
  204. tests/simple_command_test.py +119 -119
  205. tests/simple_crawlo_test.py +127 -127
  206. tests/simple_log_test.py +57 -57
  207. tests/simple_log_test2.py +137 -137
  208. tests/simple_optimization_test.py +128 -128
  209. tests/simple_queue_type_test.py +41 -41
  210. tests/simple_spider_test.py +49 -49
  211. tests/simple_test.py +47 -47
  212. tests/spider_log_timing_test.py +177 -177
  213. tests/test_advanced_tools.py +148 -148
  214. tests/test_all_commands.py +230 -230
  215. tests/test_all_pipeline_fingerprints.py +133 -133
  216. tests/test_all_redis_key_configs.py +145 -145
  217. tests/test_authenticated_proxy.py +141 -141
  218. tests/test_batch_processor.py +178 -178
  219. tests/test_cleaners.py +54 -54
  220. tests/test_component_factory.py +174 -174
  221. tests/test_comprehensive.py +146 -146
  222. tests/test_config_consistency.py +80 -80
  223. tests/test_config_merge.py +152 -152
  224. tests/test_config_validator.py +182 -182
  225. tests/test_controlled_spider_mixin.py +79 -79
  226. tests/test_crawlo_proxy_integration.py +108 -108
  227. tests/test_date_tools.py +123 -123
  228. tests/test_dedup_fix.py +220 -220
  229. tests/test_dedup_pipeline_consistency.py +125 -0
  230. tests/test_default_header_middleware.py +313 -313
  231. tests/test_distributed.py +65 -65
  232. tests/test_double_crawlo_fix.py +204 -204
  233. tests/test_double_crawlo_fix_simple.py +124 -124
  234. tests/test_download_delay_middleware.py +221 -221
  235. tests/test_downloader_proxy_compatibility.py +268 -268
  236. tests/test_dynamic_downloaders_proxy.py +124 -124
  237. tests/test_dynamic_proxy.py +92 -92
  238. tests/test_dynamic_proxy_config.py +146 -146
  239. tests/test_dynamic_proxy_real.py +109 -109
  240. tests/test_edge_cases.py +303 -303
  241. tests/test_enhanced_error_handler.py +270 -270
  242. tests/test_enhanced_error_handler_comprehensive.py +245 -245
  243. tests/test_env_config.py +121 -121
  244. tests/test_error_handler_compatibility.py +112 -112
  245. tests/test_factories.py +252 -252
  246. tests/test_final_validation.py +153 -153
  247. tests/test_fingerprint_consistency.py +135 -135
  248. tests/test_fingerprint_simple.py +51 -51
  249. tests/test_framework_env_usage.py +103 -103
  250. tests/test_framework_logger.py +66 -66
  251. tests/test_framework_startup.py +64 -64
  252. tests/test_get_component_logger.py +83 -83
  253. tests/test_hash_performance.py +99 -99
  254. tests/test_integration.py +169 -169
  255. tests/test_item_dedup_redis_key.py +122 -122
  256. tests/test_large_scale_config.py +112 -112
  257. tests/test_large_scale_helper.py +235 -235
  258. tests/test_logging_enhancements.py +375 -0
  259. tests/test_logging_final.py +185 -0
  260. tests/test_logging_integration.py +313 -0
  261. tests/test_logging_system.py +282 -282
  262. tests/test_middleware_debug.py +142 -0
  263. tests/test_mode_change.py +72 -72
  264. tests/test_mode_consistency.py +51 -51
  265. tests/test_offsite_middleware.py +244 -244
  266. tests/test_offsite_middleware_simple.py +203 -203
  267. tests/test_parsel.py +29 -29
  268. tests/test_performance.py +327 -327
  269. tests/test_performance_monitor.py +115 -115
  270. tests/test_pipeline_fingerprint_consistency.py +86 -86
  271. tests/test_priority_behavior.py +212 -0
  272. tests/test_priority_consistency.py +152 -0
  273. tests/test_priority_consistency_fixed.py +250 -0
  274. tests/test_proxy_api.py +264 -264
  275. tests/test_proxy_health_check.py +32 -32
  276. tests/test_proxy_middleware.py +121 -121
  277. tests/test_proxy_middleware_enhanced.py +216 -216
  278. tests/test_proxy_middleware_integration.py +136 -136
  279. tests/test_proxy_middleware_refactored.py +184 -184
  280. tests/test_proxy_providers.py +56 -56
  281. tests/test_proxy_stats.py +19 -19
  282. tests/test_proxy_strategies.py +59 -59
  283. tests/test_queue_empty_check.py +41 -41
  284. tests/test_queue_manager_double_crawlo.py +173 -173
  285. tests/test_queue_manager_redis_key.py +179 -179
  286. tests/test_queue_naming.py +154 -154
  287. tests/test_queue_type.py +106 -106
  288. tests/test_queue_type_redis_config_consistency.py +131 -0
  289. tests/test_random_headers_default.py +323 -0
  290. tests/test_random_headers_necessity.py +309 -0
  291. tests/test_random_user_agent.py +72 -72
  292. tests/test_real_scenario_proxy.py +195 -195
  293. tests/test_redis_config.py +28 -28
  294. tests/test_redis_connection_pool.py +294 -294
  295. tests/test_redis_key_naming.py +181 -181
  296. tests/test_redis_key_validator.py +123 -123
  297. tests/test_redis_queue.py +224 -224
  298. tests/test_redis_queue_name_fix.py +175 -175
  299. tests/test_redis_queue_type_fallback.py +130 -0
  300. tests/test_request_ignore_middleware.py +182 -182
  301. tests/test_request_params.py +111 -111
  302. tests/test_request_serialization.py +70 -70
  303. tests/test_response_code_middleware.py +349 -349
  304. tests/test_response_filter_middleware.py +427 -427
  305. tests/test_response_improvements.py +152 -152
  306. tests/test_retry_middleware.py +334 -242
  307. tests/test_retry_middleware_realistic.py +274 -0
  308. tests/test_scheduler.py +252 -252
  309. tests/test_scheduler_config_update.py +133 -133
  310. tests/test_simple_response.py +61 -61
  311. tests/test_telecom_spider_redis_key.py +205 -205
  312. tests/test_template_content.py +87 -87
  313. tests/test_template_redis_key.py +134 -134
  314. tests/test_tools.py +159 -159
  315. tests/test_user_agent_randomness.py +177 -0
  316. tests/test_user_agents.py +96 -96
  317. tests/tools_example.py +260 -260
  318. tests/untested_features_report.md +138 -138
  319. tests/verify_debug.py +51 -51
  320. tests/verify_distributed.py +117 -117
  321. tests/verify_log_fix.py +111 -111
  322. crawlo-1.4.1.dist-info/METADATA +0 -1199
  323. crawlo-1.4.1.dist-info/RECORD +0 -309
  324. {crawlo-1.4.1.dist-info → crawlo-1.4.3.dist-info}/WHEEL +0 -0
  325. {crawlo-1.4.1.dist-info → crawlo-1.4.3.dist-info}/entry_points.txt +0 -0
  326. {crawlo-1.4.1.dist-info → crawlo-1.4.3.dist-info}/top_level.txt +0 -0
@@ -1,367 +1,370 @@
1
- import asyncio
2
- import asyncio
3
- import pickle
4
- import time
5
- import traceback
6
- from typing import Optional, TYPE_CHECKING
7
-
8
- import redis.asyncio as aioredis
9
-
10
- # 使用 TYPE_CHECKING 避免运行时循环导入
11
- if TYPE_CHECKING:
12
- from crawlo import Request
13
-
14
- from crawlo.utils.error_handler import ErrorHandler
15
- from crawlo.utils.log import get_logger
16
- from crawlo.utils.redis_connection_pool import get_redis_pool, OptimizedRedisConnectionPool
17
- from crawlo.utils.request_serializer import RequestSerializer
18
-
19
- # 延迟初始化避免循环依赖
20
- _logger = None
21
- _error_handler = None
22
-
23
-
24
- def get_module_logger():
25
- global _logger
26
- if _logger is None:
27
- _logger = get_logger(__name__)
28
- return _logger
29
-
30
-
31
- def get_module_error_handler():
32
- global _error_handler
33
- if _error_handler is None:
34
- _error_handler = ErrorHandler(__name__)
35
- return _error_handler
36
-
37
-
38
- class RedisPriorityQueue:
39
- """
40
- 基于 Redis 的分布式异步优先级队列
41
- """
42
-
43
- def __init__(
44
- self,
45
- redis_url: str = None,
46
- queue_name: str = None, # 修改默认值为 None
47
- processing_queue: str = None, # 修改默认值为 None
48
- failed_queue: str = None, # 修改默认值为 None
49
- max_retries: int = 3,
50
- timeout: int = 300, # 任务处理超时时间(秒)
51
- max_connections: int = 10, # 连接池大小
52
- module_name: str = "default" # 添加 module_name 参数
53
- ):
54
- # 移除直接使用 os.getenv(),要求通过参数传递 redis_url
55
- if redis_url is None:
56
- # 如果没有提供 redis_url,则抛出异常,要求在 settings 中配置
57
- raise ValueError("redis_url must be provided. Configure it in settings instead of using os.getenv()")
58
-
59
- self.redis_url = redis_url
60
- self.module_name = module_name # 保存 module_name
61
-
62
- # 如果未提供 queue_name,则根据 module_name 自动生成
63
- if queue_name is None:
64
- self.queue_name = f"crawlo:{module_name}:queue:requests"
65
- else:
66
- # 处理多重 crawlo 前缀,规范化队列名称
67
- self.queue_name = self._normalize_queue_name(queue_name)
68
-
69
- # 如果未提供 processing_queue,则根据 queue_name 自动生成
70
- if processing_queue is None:
71
- if ":queue:requests" in self.queue_name:
72
- self.processing_queue = self.queue_name.replace(":queue:requests", ":queue:processing")
73
- else:
74
- self.processing_queue = f"{self.queue_name}:processing"
75
- else:
76
- self.processing_queue = processing_queue
77
-
78
- # 如果未提供 failed_queue,则根据 queue_name 自动生成
79
- if failed_queue is None:
80
- if ":queue:requests" in self.queue_name:
81
- self.failed_queue = self.queue_name.replace(":queue:requests", ":queue:failed")
82
- else:
83
- self.failed_queue = f"{self.queue_name}:failed"
84
- else:
85
- self.failed_queue = failed_queue
86
-
87
- self.max_retries = max_retries
88
- self.timeout = timeout
89
- self.max_connections = max_connections
90
- self._redis_pool: Optional[OptimizedRedisConnectionPool] = None
91
- self._redis: Optional[aioredis.Redis] = None
92
- self._lock = asyncio.Lock() # 用于连接初始化的锁
93
- self.request_serializer = RequestSerializer() # 处理序列化
94
-
95
- def _normalize_queue_name(self, queue_name: str) -> str:
96
- """
97
- 规范化队列名称,处理多重 crawlo 前缀
98
-
99
- :param queue_name: 原始队列名称
100
- :return: 规范化后的队列名称
101
- """
102
- # 如果队列名称已经符合规范(以 crawlo: 开头且不是 crawlo:crawlo:),则保持不变
103
- if queue_name.startswith("crawlo:") and not queue_name.startswith("crawlo:crawlo:"):
104
- return queue_name
105
-
106
- # 处理三重 crawlo 前缀,简化为标准格式
107
- if queue_name.startswith("crawlo:crawlo:crawlo:"):
108
- # 三重 crawlo 前缀,简化为标准 crawlo: 格式
109
- remaining = queue_name[21:] # 去掉 "crawlo:crawlo:crawlo:" 前缀
110
- if remaining:
111
- return f"crawlo:{remaining}"
112
- else:
113
- return "crawlo:requests" # 默认名称
114
-
115
- # 处理双重 crawlo 前缀
116
- elif queue_name.startswith("crawlo:crawlo:"):
117
- # 双重 crawlo 前缀,简化为标准 crawlo: 格式
118
- remaining = queue_name[14:] # 去掉 "crawlo:crawlo:" 前缀
119
- if remaining:
120
- return f"crawlo:{remaining}"
121
- else:
122
- return "crawlo:requests" # 默认名称
123
-
124
- # 处理无 crawlo 前缀的情况
125
- elif not queue_name.startswith("crawlo:"):
126
- # 无 crawlo 前缀,添加 crawlo: 前缀
127
- if queue_name:
128
- return f"crawlo:{queue_name}"
129
- else:
130
- return "crawlo:requests" # 默认名称
131
-
132
- # 其他情况,保持不变
133
- else:
134
- return queue_name
135
-
136
- async def connect(self, max_retries=3, delay=1):
137
- """异步连接 Redis,支持重试"""
138
- async with self._lock:
139
- if self._redis is not None:
140
- # 如果已经连接,测试连接是否仍然有效
141
- try:
142
- await self._redis.ping()
143
- return self._redis
144
- except Exception:
145
- # 连接失效,重新连接
146
- self._redis = None
147
-
148
- for attempt in range(max_retries):
149
- try:
150
- # 使用优化的连接池,确保 decode_responses=False 以避免编码问题
151
- self._redis_pool = get_redis_pool(
152
- self.redis_url,
153
- max_connections=self.max_connections,
154
- socket_connect_timeout=5,
155
- socket_timeout=30,
156
- health_check_interval=30,
157
- retry_on_timeout=True,
158
- decode_responses=False, # 确保不自动解码响应
159
- encoding='utf-8'
160
- )
161
-
162
- self._redis = await self._redis_pool.get_connection()
163
-
164
- # 测试连接
165
- await self._redis.ping()
166
- # 只在调试模式下输出详细连接信息
167
- # get_module_logger().debug(f"Redis 连接成功 (Module: {self.module_name})") # 注释掉重复的日志
168
- return self._redis
169
- except Exception as e:
170
- error_msg = f"Redis 连接失败 (尝试 {attempt + 1}/{max_retries}, Module: {self.module_name}): {e}"
171
- get_module_logger().warning(error_msg)
172
- get_module_logger().debug(f"详细错误信息:\n{traceback.format_exc()}")
173
- if attempt < max_retries - 1:
174
- await asyncio.sleep(delay)
175
- else:
176
- raise ConnectionError(f"无法连接 Redis (Module: {self.module_name}): {e}")
177
-
178
- async def _ensure_connection(self):
179
- """确保连接有效"""
180
- if self._redis is None:
181
- await self.connect()
182
- try:
183
- await self._redis.ping()
184
- except Exception as e:
185
- get_module_logger().warning(f"Redis 连接失效 (Module: {self.module_name}),尝试重连...: {e}")
186
- self._redis = None
187
- await self.connect()
188
-
189
- async def put(self, request, priority: int = 0) -> bool:
190
- """放入请求到队列"""
191
- try:
192
- await self._ensure_connection()
193
- score = -priority
194
- key = self._get_request_key(request)
195
-
196
- # 🔥 使用专用的序列化工具清理 Request
197
- clean_request = self.request_serializer.prepare_for_serialization(request)
198
-
199
- # 确保序列化后的数据可以被正确反序列化
200
- try:
201
- serialized = pickle.dumps(clean_request)
202
- # 验证序列化数据可以被反序列化
203
- pickle.loads(serialized)
204
- except Exception as serialize_error:
205
- get_module_logger().error(f"请求序列化验证失败 (Module: {self.module_name}): {serialize_error}")
206
- return False
207
-
208
- pipe = self._redis.pipeline()
209
- pipe.zadd(self.queue_name, {key: score})
210
- pipe.hset(f"{self.queue_name}:data", key, serialized)
211
- result = await pipe.execute()
212
-
213
- if result[0] > 0:
214
- get_module_logger().debug(f"成功入队 (Module: {self.module_name}): {request.url}") # 注释掉重复的日志
215
- return result[0] > 0
216
- except Exception as e:
217
- get_module_error_handler().handle_error(
218
- e,
219
- context=f"放入队列失败 (Module: {self.module_name})",
220
- raise_error=False
221
- )
222
- return False
223
-
224
- async def get(self, timeout: float = 5.0):
225
- """
226
- 获取请求(带超时)
227
- :param timeout: 最大等待时间(秒),避免无限轮询
228
- """
229
- try:
230
- await self._ensure_connection()
231
- start_time = asyncio.get_event_loop().time()
232
-
233
- while True:
234
- # 尝试获取任务
235
- result = await self._redis.zpopmin(self.queue_name, count=1)
236
- if result:
237
- key, score = result[0]
238
- serialized = await self._redis.hget(f"{self.queue_name}:data", key)
239
- if not serialized:
240
- continue
241
-
242
- # 移动到 processing
243
- processing_key = f"{key}:{int(time.time())}"
244
- pipe = self._redis.pipeline()
245
- pipe.zadd(self.processing_queue, {processing_key: time.time() + self.timeout})
246
- pipe.hset(f"{self.processing_queue}:data", processing_key, serialized)
247
- pipe.hdel(f"{self.queue_name}:data", key)
248
- await pipe.execute()
249
-
250
- # 更安全的反序列化方式
251
- try:
252
- # 首先尝试标准的 pickle 反序列化
253
- request = pickle.loads(serialized)
254
- return request
255
- except UnicodeDecodeError:
256
- # 如果出现编码错误,尝试使用 latin1 解码
257
- request = pickle.loads(serialized, encoding='latin1')
258
- return request
259
- except Exception as pickle_error:
260
- # 如果pickle反序列化失败,记录错误并跳过这个任务
261
- get_module_logger().error(f"无法反序列化请求数据 (Module: {self.module_name}): {pickle_error}")
262
- # 从processing队列中移除这个无效的任务
263
- await self._redis.zrem(self.processing_queue, processing_key)
264
- await self._redis.hdel(f"{self.processing_queue}:data", processing_key)
265
- # 继续尝试下一个任务
266
- continue
267
-
268
- # 检查是否超时
269
- if asyncio.get_event_loop().time() - start_time > timeout:
270
- return None
271
-
272
- # 短暂等待,避免空轮询,但减少等待时间以提高响应速度
273
- await asyncio.sleep(0.001) # 从0.01减少到0.001
274
-
275
- except Exception as e:
276
- get_module_error_handler().handle_error(
277
- e,
278
- context=f"获取队列任务失败 (Module: {self.module_name})",
279
- raise_error=False
280
- )
281
- return None
282
-
283
- async def ack(self, request: "Request"):
284
- """确认任务完成"""
285
- try:
286
- await self._ensure_connection()
287
- key = self._get_request_key(request)
288
- cursor = 0
289
- while True:
290
- cursor, keys = await self._redis.zscan(self.processing_queue, cursor, match=f"{key}:*")
291
- if keys:
292
- pipe = self._redis.pipeline()
293
- for k in keys:
294
- pipe.zrem(self.processing_queue, k)
295
- pipe.hdel(f"{self.processing_queue}:data", k)
296
- await pipe.execute()
297
- if cursor == 0:
298
- break
299
- except Exception as e:
300
- get_module_error_handler().handle_error(
301
- e,
302
- context=f"确认任务完成失败 (Module: {self.module_name})",
303
- raise_error=False
304
- )
305
-
306
- async def fail(self, request: "Request", reason: str = ""):
307
- """标记任务失败"""
308
- try:
309
- await self._ensure_connection()
310
- key = self._get_request_key(request)
311
- await self.ack(request)
312
-
313
- retry_key = f"{self.failed_queue}:retries:{key}"
314
- retries = await self._redis.incr(retry_key)
315
- await self._redis.expire(retry_key, 86400)
316
-
317
- if retries <= self.max_retries:
318
- await self.put(request, priority=request.priority + 1)
319
- get_module_logger().info(
320
- f"任务重试 [{retries}/{self.max_retries}] (Module: {self.module_name}): {request.url}")
321
- else:
322
- failed_data = {
323
- "url": request.url,
324
- "reason": reason,
325
- "retries": retries,
326
- "failed_at": time.time(),
327
- "request_pickle": pickle.dumps(request).hex(), # 可选:保存完整请求
328
- }
329
- await self._redis.lpush(self.failed_queue, pickle.dumps(failed_data))
330
- get_module_logger().error(f"任务彻底失败 [{retries}次] (Module: {self.module_name}): {request.url}")
331
- except Exception as e:
332
- get_module_error_handler().handle_error(
333
- e,
334
- context=f"标记任务失败失败 (Module: {self.module_name})",
335
- raise_error=False
336
- )
337
-
338
- def _get_request_key(self, request) -> str:
339
- """生成请求唯一键"""
340
- return f"{self.module_name}:url:{hash(request.url) & 0x7FFFFFFF}" # 确保正数
341
-
342
- async def qsize(self) -> int:
343
- """Get queue size"""
344
- try:
345
- await self._ensure_connection()
346
- return await self._redis.zcard(self.queue_name)
347
- except Exception as e:
348
- get_module_error_handler().handle_error(
349
- e,
350
- context=f"Failed to get queue size (Module: {self.module_name})",
351
- raise_error=False
352
- )
353
- return 0
354
-
355
- async def close(self):
356
- """关闭连接"""
357
- try:
358
- # 连接池会自动管理连接,这里不需要显式关闭单个连接
359
- self._redis = None
360
- self._redis_pool = None
361
- get_module_logger().debug(f"Redis 连接已释放 (Module: {self.module_name})")
362
- except Exception as e:
363
- get_module_error_handler().handle_error(
364
- e,
365
- context=f"释放 Redis 连接失败 (Module: {self.module_name})",
366
- raise_error=False
367
- )
1
+ import asyncio
2
+ import asyncio
3
+ import pickle
4
+ import time
5
+ import traceback
6
+ from typing import Optional, TYPE_CHECKING
7
+
8
+ import redis.asyncio as aioredis
9
+
10
+ # 使用 TYPE_CHECKING 避免运行时循环导入
11
+ if TYPE_CHECKING:
12
+ from crawlo import Request
13
+
14
+ from crawlo.utils.error_handler import ErrorHandler
15
+ from crawlo.utils.log import get_logger
16
+ from crawlo.utils.redis_connection_pool import get_redis_pool, OptimizedRedisConnectionPool
17
+ from crawlo.utils.request_serializer import RequestSerializer
18
+
19
+ # 延迟初始化避免循环依赖
20
+ _logger = None
21
+ _error_handler = None
22
+
23
+
24
+ def get_module_logger():
25
+ global _logger
26
+ if _logger is None:
27
+ _logger = get_logger(__name__)
28
+ return _logger
29
+
30
+
31
+ def get_module_error_handler():
32
+ global _error_handler
33
+ if _error_handler is None:
34
+ _error_handler = ErrorHandler(__name__)
35
+ return _error_handler
36
+
37
+
38
+ class RedisPriorityQueue:
39
+ """
40
+ 基于 Redis 的分布式异步优先级队列
41
+ """
42
+
43
+ def __init__(
44
+ self,
45
+ redis_url: str = None,
46
+ queue_name: str = None, # 修改默认值为 None
47
+ processing_queue: str = None, # 修改默认值为 None
48
+ failed_queue: str = None, # 修改默认值为 None
49
+ max_retries: int = 3,
50
+ timeout: int = 300, # 任务处理超时时间(秒)
51
+ max_connections: int = 10, # 连接池大小
52
+ module_name: str = "default" # 添加 module_name 参数
53
+ ):
54
+ # 移除直接使用 os.getenv(),要求通过参数传递 redis_url
55
+ if redis_url is None:
56
+ # 如果没有提供 redis_url,则抛出异常,要求在 settings 中配置
57
+ raise ValueError("redis_url must be provided. Configure it in settings instead of using os.getenv()")
58
+
59
+ self.redis_url = redis_url
60
+ self.module_name = module_name # 保存 module_name
61
+
62
+ # 如果未提供 queue_name,则根据 module_name 自动生成
63
+ if queue_name is None:
64
+ self.queue_name = f"crawlo:{module_name}:queue:requests"
65
+ else:
66
+ # 处理多重 crawlo 前缀,规范化队列名称
67
+ self.queue_name = self._normalize_queue_name(queue_name)
68
+
69
+ # 如果未提供 processing_queue,则根据 queue_name 自动生成
70
+ if processing_queue is None:
71
+ if ":queue:requests" in self.queue_name:
72
+ self.processing_queue = self.queue_name.replace(":queue:requests", ":queue:processing")
73
+ else:
74
+ self.processing_queue = f"{self.queue_name}:processing"
75
+ else:
76
+ self.processing_queue = processing_queue
77
+
78
+ # 如果未提供 failed_queue,则根据 queue_name 自动生成
79
+ if failed_queue is None:
80
+ if ":queue:requests" in self.queue_name:
81
+ self.failed_queue = self.queue_name.replace(":queue:requests", ":queue:failed")
82
+ else:
83
+ self.failed_queue = f"{self.queue_name}:failed"
84
+ else:
85
+ self.failed_queue = failed_queue
86
+
87
+ self.max_retries = max_retries
88
+ self.timeout = timeout
89
+ self.max_connections = max_connections
90
+ self._redis_pool: Optional[OptimizedRedisConnectionPool] = None
91
+ self._redis: Optional[aioredis.Redis] = None
92
+ self._lock = asyncio.Lock() # 用于连接初始化的锁
93
+ self.request_serializer = RequestSerializer() # 处理序列化
94
+
95
+ def _normalize_queue_name(self, queue_name: str) -> str:
96
+ """
97
+ 规范化队列名称,处理多重 crawlo 前缀
98
+
99
+ :param queue_name: 原始队列名称
100
+ :return: 规范化后的队列名称
101
+ """
102
+ # 如果队列名称已经符合规范(以 crawlo: 开头且不是 crawlo:crawlo:),则保持不变
103
+ if queue_name.startswith("crawlo:") and not queue_name.startswith("crawlo:crawlo:"):
104
+ return queue_name
105
+
106
+ # 处理三重 crawlo 前缀,简化为标准格式
107
+ if queue_name.startswith("crawlo:crawlo:crawlo:"):
108
+ # 三重 crawlo 前缀,简化为标准 crawlo: 格式
109
+ remaining = queue_name[21:] # 去掉 "crawlo:crawlo:crawlo:" 前缀
110
+ if remaining:
111
+ return f"crawlo:{remaining}"
112
+ else:
113
+ return "crawlo:requests" # 默认名称
114
+
115
+ # 处理双重 crawlo 前缀
116
+ elif queue_name.startswith("crawlo:crawlo:"):
117
+ # 双重 crawlo 前缀,简化为标准 crawlo: 格式
118
+ remaining = queue_name[14:] # 去掉 "crawlo:crawlo:" 前缀
119
+ if remaining:
120
+ return f"crawlo:{remaining}"
121
+ else:
122
+ return "crawlo:requests" # 默认名称
123
+
124
+ # 处理无 crawlo 前缀的情况
125
+ elif not queue_name.startswith("crawlo:"):
126
+ # 无 crawlo 前缀,添加 crawlo: 前缀
127
+ if queue_name:
128
+ return f"crawlo:{queue_name}"
129
+ else:
130
+ return "crawlo:requests" # 默认名称
131
+
132
+ # 其他情况,保持不变
133
+ else:
134
+ return queue_name
135
+
136
+ async def connect(self, max_retries=3, delay=1):
137
+ """异步连接 Redis,支持重试"""
138
+ async with self._lock:
139
+ if self._redis is not None:
140
+ # 如果已经连接,测试连接是否仍然有效
141
+ try:
142
+ await self._redis.ping()
143
+ return self._redis
144
+ except Exception:
145
+ # 连接失效,重新连接
146
+ self._redis = None
147
+
148
+ for attempt in range(max_retries):
149
+ try:
150
+ # 使用优化的连接池,确保 decode_responses=False 以避免编码问题
151
+ self._redis_pool = get_redis_pool(
152
+ self.redis_url,
153
+ max_connections=self.max_connections,
154
+ socket_connect_timeout=5,
155
+ socket_timeout=30,
156
+ health_check_interval=30,
157
+ retry_on_timeout=True,
158
+ decode_responses=False, # 确保不自动解码响应
159
+ encoding='utf-8'
160
+ )
161
+
162
+ self._redis = await self._redis_pool.get_connection()
163
+
164
+ # 测试连接
165
+ await self._redis.ping()
166
+ # 只在调试模式下输出详细连接信息
167
+ # get_module_logger().debug(f"Redis 连接成功 (Module: {self.module_name})") # 注释掉重复的日志
168
+ return self._redis
169
+ except Exception as e:
170
+ error_msg = f"Redis 连接失败 (尝试 {attempt + 1}/{max_retries}, Module: {self.module_name}): {e}"
171
+ get_module_logger().warning(error_msg)
172
+ get_module_logger().debug(f"详细错误信息:\n{traceback.format_exc()}")
173
+ if attempt < max_retries - 1:
174
+ await asyncio.sleep(delay)
175
+ else:
176
+ raise ConnectionError(f"无法连接 Redis (Module: {self.module_name}): {e}")
177
+
178
+ async def _ensure_connection(self):
179
+ """确保连接有效"""
180
+ if self._redis is None:
181
+ await self.connect()
182
+ try:
183
+ await self._redis.ping()
184
+ except Exception as e:
185
+ get_module_logger().warning(f"Redis 连接失效 (Module: {self.module_name}),尝试重连...: {e}")
186
+ self._redis = None
187
+ await self.connect()
188
+
189
+ async def put(self, request, priority: int = 0) -> bool:
190
+ """放入请求到队列"""
191
+ try:
192
+ await self._ensure_connection()
193
+ # 修复优先级行为一致性问题
194
+ # 原来: score = -priority (导致priority大的先出队)
195
+ # 现在: score = priority (确保priority小的先出队,与内存队列一致)
196
+ score = priority
197
+ key = self._get_request_key(request)
198
+
199
+ # 🔥 使用专用的序列化工具清理 Request
200
+ clean_request = self.request_serializer.prepare_for_serialization(request)
201
+
202
+ # 确保序列化后的数据可以被正确反序列化
203
+ try:
204
+ serialized = pickle.dumps(clean_request)
205
+ # 验证序列化数据可以被反序列化
206
+ pickle.loads(serialized)
207
+ except Exception as serialize_error:
208
+ get_module_logger().error(f"请求序列化验证失败 (Module: {self.module_name}): {serialize_error}")
209
+ return False
210
+
211
+ pipe = self._redis.pipeline()
212
+ pipe.zadd(self.queue_name, {key: score})
213
+ pipe.hset(f"{self.queue_name}:data", key, serialized)
214
+ result = await pipe.execute()
215
+
216
+ if result[0] > 0:
217
+ get_module_logger().debug(f"成功入队 (Module: {self.module_name}): {request.url}") # 注释掉重复的日志
218
+ return result[0] > 0
219
+ except Exception as e:
220
+ get_module_error_handler().handle_error(
221
+ e,
222
+ context=f"放入队列失败 (Module: {self.module_name})",
223
+ raise_error=False
224
+ )
225
+ return False
226
+
227
+ async def get(self, timeout: float = 5.0):
228
+ """
229
+ 获取请求(带超时)
230
+ :param timeout: 最大等待时间(秒),避免无限轮询
231
+ """
232
+ try:
233
+ await self._ensure_connection()
234
+ start_time = asyncio.get_event_loop().time()
235
+
236
+ while True:
237
+ # 尝试获取任务
238
+ result = await self._redis.zpopmin(self.queue_name, count=1)
239
+ if result:
240
+ key, score = result[0]
241
+ serialized = await self._redis.hget(f"{self.queue_name}:data", key)
242
+ if not serialized:
243
+ continue
244
+
245
+ # 移动到 processing
246
+ processing_key = f"{key}:{int(time.time())}"
247
+ pipe = self._redis.pipeline()
248
+ pipe.zadd(self.processing_queue, {processing_key: time.time() + self.timeout})
249
+ pipe.hset(f"{self.processing_queue}:data", processing_key, serialized)
250
+ pipe.hdel(f"{self.queue_name}:data", key)
251
+ await pipe.execute()
252
+
253
+ # 更安全的反序列化方式
254
+ try:
255
+ # 首先尝试标准的 pickle 反序列化
256
+ request = pickle.loads(serialized)
257
+ return request
258
+ except UnicodeDecodeError:
259
+ # 如果出现编码错误,尝试使用 latin1 解码
260
+ request = pickle.loads(serialized, encoding='latin1')
261
+ return request
262
+ except Exception as pickle_error:
263
+ # 如果pickle反序列化失败,记录错误并跳过这个任务
264
+ get_module_logger().error(f"无法反序列化请求数据 (Module: {self.module_name}): {pickle_error}")
265
+ # 从processing队列中移除这个无效的任务
266
+ await self._redis.zrem(self.processing_queue, processing_key)
267
+ await self._redis.hdel(f"{self.processing_queue}:data", processing_key)
268
+ # 继续尝试下一个任务
269
+ continue
270
+
271
+ # 检查是否超时
272
+ if asyncio.get_event_loop().time() - start_time > timeout:
273
+ return None
274
+
275
+ # 短暂等待,避免空轮询,但减少等待时间以提高响应速度
276
+ await asyncio.sleep(0.001) # 从0.01减少到0.001
277
+
278
+ except Exception as e:
279
+ get_module_error_handler().handle_error(
280
+ e,
281
+ context=f"获取队列任务失败 (Module: {self.module_name})",
282
+ raise_error=False
283
+ )
284
+ return None
285
+
286
+ async def ack(self, request: "Request"):
287
+ """确认任务完成"""
288
+ try:
289
+ await self._ensure_connection()
290
+ key = self._get_request_key(request)
291
+ cursor = 0
292
+ while True:
293
+ cursor, keys = await self._redis.zscan(self.processing_queue, cursor, match=f"{key}:*")
294
+ if keys:
295
+ pipe = self._redis.pipeline()
296
+ for k in keys:
297
+ pipe.zrem(self.processing_queue, k)
298
+ pipe.hdel(f"{self.processing_queue}:data", k)
299
+ await pipe.execute()
300
+ if cursor == 0:
301
+ break
302
+ except Exception as e:
303
+ get_module_error_handler().handle_error(
304
+ e,
305
+ context=f"确认任务完成失败 (Module: {self.module_name})",
306
+ raise_error=False
307
+ )
308
+
309
+ async def fail(self, request: "Request", reason: str = ""):
310
+ """标记任务失败"""
311
+ try:
312
+ await self._ensure_connection()
313
+ key = self._get_request_key(request)
314
+ await self.ack(request)
315
+
316
+ retry_key = f"{self.failed_queue}:retries:{key}"
317
+ retries = await self._redis.incr(retry_key)
318
+ await self._redis.expire(retry_key, 86400)
319
+
320
+ if retries <= self.max_retries:
321
+ await self.put(request, priority=request.priority + 1)
322
+ get_module_logger().info(
323
+ f"任务重试 [{retries}/{self.max_retries}] (Module: {self.module_name}): {request.url}")
324
+ else:
325
+ failed_data = {
326
+ "url": request.url,
327
+ "reason": reason,
328
+ "retries": retries,
329
+ "failed_at": time.time(),
330
+ "request_pickle": pickle.dumps(request).hex(), # 可选:保存完整请求
331
+ }
332
+ await self._redis.lpush(self.failed_queue, pickle.dumps(failed_data))
333
+ get_module_logger().error(f"任务彻底失败 [{retries}次] (Module: {self.module_name}): {request.url}")
334
+ except Exception as e:
335
+ get_module_error_handler().handle_error(
336
+ e,
337
+ context=f"标记任务失败失败 (Module: {self.module_name})",
338
+ raise_error=False
339
+ )
340
+
341
+ def _get_request_key(self, request) -> str:
342
+ """生成请求唯一键"""
343
+ return f"{self.module_name}:url:{hash(request.url) & 0x7FFFFFFF}" # 确保正数
344
+
345
+ async def qsize(self) -> int:
346
+ """Get queue size"""
347
+ try:
348
+ await self._ensure_connection()
349
+ return await self._redis.zcard(self.queue_name)
350
+ except Exception as e:
351
+ get_module_error_handler().handle_error(
352
+ e,
353
+ context=f"Failed to get queue size (Module: {self.module_name})",
354
+ raise_error=False
355
+ )
356
+ return 0
357
+
358
+ async def close(self):
359
+ """关闭连接"""
360
+ try:
361
+ # 连接池会自动管理连接,这里不需要显式关闭单个连接
362
+ self._redis = None
363
+ self._redis_pool = None
364
+ get_module_logger().debug(f"Redis 连接已释放 (Module: {self.module_name})")
365
+ except Exception as e:
366
+ get_module_error_handler().handle_error(
367
+ e,
368
+ context=f"释放 Redis 连接失败 (Module: {self.module_name})",
369
+ raise_error=False
370
+ )