crawlo 1.4.2__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 -233
  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.2.dist-info/METADATA +0 -1199
  323. crawlo-1.4.2.dist-info/RECORD +0 -309
  324. {crawlo-1.4.2.dist-info → crawlo-1.4.3.dist-info}/WHEEL +0 -0
  325. {crawlo-1.4.2.dist-info → crawlo-1.4.3.dist-info}/entry_points.txt +0 -0
  326. {crawlo-1.4.2.dist-info → crawlo-1.4.3.dist-info}/top_level.txt +0 -0
@@ -1,389 +1,389 @@
1
- #!/usr/bin/python
2
- # -*- coding:UTF-8 -*-
3
- """
4
- Redis连接池优化工具
5
- 提供优化的Redis连接池管理和配置
6
- """
7
- from contextlib import asynccontextmanager
8
- from typing import Dict, Any, Optional
9
-
10
- import redis.asyncio as aioredis
11
-
12
- # 延迟导入避免循环依赖
13
- # from crawlo.utils.error_handler import ErrorHandler
14
- # from crawlo.utils.log import get_logger
15
-
16
-
17
- class OptimizedRedisConnectionPool:
18
- """优化的Redis连接池管理器"""
19
-
20
- # 默认连接池配置
21
- DEFAULT_CONFIG = {
22
- 'max_connections': 50,
23
- 'socket_connect_timeout': 5,
24
- 'socket_timeout': 30,
25
- 'socket_keepalive': True,
26
- 'health_check_interval': 30,
27
- 'retry_on_timeout': True,
28
- 'encoding': 'utf-8',
29
- 'decode_responses': False,
30
- }
31
-
32
- def __init__(self, redis_url: str, **kwargs):
33
- self.redis_url = redis_url
34
- self.config = {**self.DEFAULT_CONFIG, **kwargs}
35
-
36
- # 延迟初始化logger和error_handler
37
- self._logger = None
38
- self._error_handler = None
39
-
40
- # 连接池实例
41
- self._connection_pool: Optional[aioredis.ConnectionPool] = None
42
- self._redis_client: Optional[aioredis.Redis] = None
43
- self._connection_tested = False # 标记是否已测试连接
44
-
45
- # 连接池统计信息
46
- self._stats = {
47
- 'created_connections': 0,
48
- 'active_connections': 0,
49
- 'idle_connections': 0,
50
- 'errors': 0
51
- }
52
-
53
- # 初始化连接池
54
- self._initialize_pool()
55
-
56
- @property
57
- def logger(self):
58
- """延迟初始化logger"""
59
- if self._logger is None:
60
- from crawlo.utils.log import get_logger
61
- self._logger = get_logger(self.__class__.__name__)
62
- return self._logger
63
-
64
- @property
65
- def error_handler(self):
66
- """延迟初始化error_handler"""
67
- if self._error_handler is None:
68
- from crawlo.utils.error_handler import ErrorHandler
69
- self._error_handler = ErrorHandler(self.__class__.__name__)
70
- return self._error_handler
71
-
72
- def _initialize_pool(self):
73
- """初始化连接池"""
74
- try:
75
- self._connection_pool = aioredis.ConnectionPool.from_url(
76
- self.redis_url,
77
- **self.config
78
- )
79
-
80
- self._redis_client = aioredis.Redis(
81
- connection_pool=self._connection_pool
82
- )
83
-
84
- # 只在调试模式下输出详细连接池信息
85
- self.logger.debug(f"Redis连接池初始化成功: {self.redis_url}")
86
- self.logger.debug(f" 连接池配置: {self.config}")
87
-
88
- except Exception as e:
89
- self.error_handler.handle_error(
90
- e,
91
- context="Redis连接池初始化失败",
92
- raise_error=True
93
- )
94
-
95
- async def _test_connection(self):
96
- """测试Redis连接"""
97
- if self._redis_client and not self._connection_tested:
98
- try:
99
- await self._redis_client.ping()
100
- self._connection_tested = True
101
- # 只在调试模式下输出连接测试成功信息
102
- self.logger.debug(f"Redis连接测试成功: {self.redis_url}")
103
- except Exception as e:
104
- self.logger.error(f"Redis连接测试失败: {self.redis_url} - {e}")
105
- raise
106
-
107
- async def get_connection(self) -> aioredis.Redis:
108
- """
109
- 获取Redis连接实例
110
-
111
- Returns:
112
- Redis连接实例
113
- """
114
- if not self._redis_client:
115
- self._initialize_pool()
116
-
117
- # 确保连接有效
118
- await self._test_connection()
119
-
120
- self._stats['active_connections'] += 1
121
- return self._redis_client
122
-
123
- async def ping(self) -> bool:
124
- """
125
- 检查Redis连接是否正常
126
-
127
- Returns:
128
- 连接是否正常
129
- """
130
- try:
131
- if self._redis_client:
132
- await self._redis_client.ping()
133
- return True
134
- return False
135
- except Exception as e:
136
- self.logger.warning(f"Redis连接检查失败: {e}")
137
- return False
138
-
139
- async def close(self):
140
- """关闭连接池"""
141
- try:
142
- if self._redis_client:
143
- await self._redis_client.close()
144
- self._redis_client = None
145
-
146
- if self._connection_pool:
147
- await self._connection_pool.disconnect()
148
- self._connection_pool = None
149
-
150
- self.logger.info("Redis连接池已关闭")
151
- except Exception as e:
152
- self.error_handler.handle_error(
153
- e,
154
- context="关闭Redis连接池失败",
155
- raise_error=False
156
- )
157
-
158
- def get_stats(self) -> Dict[str, Any]:
159
- """
160
- 获取连接池统计信息
161
-
162
- Returns:
163
- 统计信息字典
164
- """
165
- if self._connection_pool:
166
- pool_stats = {
167
- 'max_connections': self._connection_pool.max_connections,
168
- 'created_connections': self._connection_pool.created_connections,
169
- 'available_connections': len(self._connection_pool._available_connections),
170
- 'in_use_connections': len(self._connection_pool._in_use_connections),
171
- }
172
- self._stats.update(pool_stats)
173
-
174
- return self._stats.copy()
175
-
176
- @asynccontextmanager
177
- async def connection_context(self):
178
- """
179
- 连接上下文管理器
180
-
181
- Yields:
182
- Redis连接实例
183
- """
184
- connection = await self.get_connection()
185
- try:
186
- yield connection
187
- finally:
188
- self._stats['active_connections'] -= 1
189
- self._stats['idle_connections'] += 1
190
-
191
-
192
- class RedisBatchOperationHelper:
193
- """Redis批量操作助手"""
194
-
195
- def __init__(self, redis_client: aioredis.Redis, batch_size: int = 100):
196
- self.redis_client = redis_client
197
- self.batch_size = batch_size
198
-
199
- # 延迟初始化logger和error_handler
200
- self._logger = None
201
- self._error_handler = None
202
-
203
- @property
204
- def logger(self):
205
- """延迟初始化logger"""
206
- if self._logger is None:
207
- from crawlo.utils.log import get_logger
208
- self._logger = get_logger(self.__class__.__name__)
209
- return self._logger
210
-
211
- @property
212
- def error_handler(self):
213
- """延迟初始化error_handler"""
214
- if self._error_handler is None:
215
- from crawlo.utils.error_handler import ErrorHandler
216
- self._error_handler = ErrorHandler(self.__class__.__name__)
217
- return self._error_handler
218
-
219
- async def batch_execute(self, operations: list, batch_size: Optional[int] = None) -> list:
220
- """
221
- 批量执行Redis操作
222
-
223
- Args:
224
- operations: 操作列表,每个操作是一个包含(command, *args)的元组
225
- batch_size: 批次大小(如果为None则使用实例的batch_size)
226
-
227
- Returns:
228
- 执行结果列表
229
- """
230
- actual_batch_size = batch_size or self.batch_size
231
- results = []
232
-
233
- try:
234
- for i in range(0, len(operations), actual_batch_size):
235
- batch = operations[i:i + actual_batch_size]
236
- self.logger.debug(f"执行批次 {i//actual_batch_size + 1}/{(len(operations)-1)//actual_batch_size + 1}")
237
-
238
- try:
239
- pipe = self.redis_client.pipeline()
240
- for operation in batch:
241
- command, *args = operation
242
- getattr(pipe, command)(*args)
243
-
244
- batch_results = await pipe.execute()
245
- results.extend(batch_results)
246
-
247
- except Exception as e:
248
- self.logger.error(f"执行批次失败: {e}")
249
- # 继续执行下一个批次而不是中断
250
-
251
- except Exception as e:
252
- self.error_handler.handle_error(
253
- e,
254
- context="Redis批量操作执行失败",
255
- raise_error=False
256
- )
257
-
258
- return results
259
-
260
- async def batch_set_hash(self, hash_key: str, items: Dict[str, Any]) -> int:
261
- """
262
- 批量设置Hash字段
263
-
264
- Args:
265
- hash_key: Hash键名
266
- items: 要设置的字段字典
267
-
268
- Returns:
269
- 成功设置的字段数量
270
- """
271
- try:
272
- if not items:
273
- return 0
274
-
275
- pipe = self.redis_client.pipeline()
276
- count = 0
277
-
278
- for key, value in items.items():
279
- pipe.hset(hash_key, key, value)
280
- count += 1
281
-
282
- # 每达到批次大小就执行一次
283
- if count % self.batch_size == 0:
284
- await pipe.execute()
285
- pipe = self.redis_client.pipeline()
286
-
287
- # 执行剩余的操作
288
- if count % self.batch_size != 0:
289
- await pipe.execute()
290
-
291
- self.logger.debug(f"批量设置Hash {count} 个字段")
292
- return count
293
-
294
- except Exception as e:
295
- self.error_handler.handle_error(
296
- e,
297
- context="Redis批量设置Hash失败",
298
- raise_error=False
299
- )
300
- return 0
301
-
302
- async def batch_get_hash(self, hash_key: str, fields: list) -> Dict[str, Any]:
303
- """
304
- 批量获取Hash字段值
305
-
306
- Args:
307
- hash_key: Hash键名
308
- fields: 要获取的字段列表
309
-
310
- Returns:
311
- 字段值字典
312
- """
313
- try:
314
- if not fields:
315
- return {}
316
-
317
- # 使用管道批量获取
318
- pipe = self.redis_client.pipeline()
319
- for field in fields:
320
- pipe.hget(hash_key, field)
321
-
322
- results = await pipe.execute()
323
-
324
- # 构建结果字典
325
- result_dict = {}
326
- for i, field in enumerate(fields):
327
- if results[i] is not None:
328
- result_dict[field] = results[i]
329
-
330
- self.logger.debug(f"批量获取Hash {len(result_dict)} 个字段")
331
- return result_dict
332
-
333
- except Exception as e:
334
- self.error_handler.handle_error(
335
- e,
336
- context="Redis批量获取Hash失败",
337
- raise_error=False
338
- )
339
- return {}
340
-
341
-
342
- # 全局连接池管理器
343
- _connection_pools: Dict[str, OptimizedRedisConnectionPool] = {}
344
-
345
-
346
- def get_redis_pool(redis_url: str, **kwargs) -> OptimizedRedisConnectionPool:
347
- """
348
- 获取Redis连接池实例(单例模式)
349
-
350
- Args:
351
- redis_url: Redis URL
352
- **kwargs: 连接池配置参数
353
-
354
- Returns:
355
- Redis连接池实例
356
- """
357
- if redis_url not in _connection_pools:
358
- _connection_pools[redis_url] = OptimizedRedisConnectionPool(redis_url, **kwargs)
359
-
360
- return _connection_pools[redis_url]
361
-
362
-
363
- async def close_all_pools():
364
- """关闭所有连接池"""
365
- global _connection_pools
366
-
367
- for pool in _connection_pools.values():
368
- await pool.close()
369
-
370
- _connection_pools.clear()
371
-
372
-
373
- # 便捷函数
374
- async def execute_redis_batch(redis_url: str, operations: list, batch_size: int = 100) -> list:
375
- """
376
- 便捷函数:执行Redis批量操作
377
-
378
- Args:
379
- redis_url: Redis URL
380
- operations: 操作列表
381
- batch_size: 批次大小
382
-
383
- Returns:
384
- 执行结果列表
385
- """
386
- pool = get_redis_pool(redis_url)
387
- redis_client = await pool.get_connection()
388
- helper = RedisBatchOperationHelper(redis_client, batch_size)
1
+ #!/usr/bin/python
2
+ # -*- coding:UTF-8 -*-
3
+ """
4
+ Redis连接池优化工具
5
+ 提供优化的Redis连接池管理和配置
6
+ """
7
+ from contextlib import asynccontextmanager
8
+ from typing import Dict, Any, Optional
9
+
10
+ import redis.asyncio as aioredis
11
+
12
+ # 延迟导入避免循环依赖
13
+ # from crawlo.utils.error_handler import ErrorHandler
14
+ # from crawlo.utils.log import get_logger
15
+
16
+
17
+ class OptimizedRedisConnectionPool:
18
+ """优化的Redis连接池管理器"""
19
+
20
+ # 默认连接池配置
21
+ DEFAULT_CONFIG = {
22
+ 'max_connections': 50,
23
+ 'socket_connect_timeout': 5,
24
+ 'socket_timeout': 30,
25
+ 'socket_keepalive': True,
26
+ 'health_check_interval': 30,
27
+ 'retry_on_timeout': True,
28
+ 'encoding': 'utf-8',
29
+ 'decode_responses': False,
30
+ }
31
+
32
+ def __init__(self, redis_url: str, **kwargs):
33
+ self.redis_url = redis_url
34
+ self.config = {**self.DEFAULT_CONFIG, **kwargs}
35
+
36
+ # 延迟初始化logger和error_handler
37
+ self._logger = None
38
+ self._error_handler = None
39
+
40
+ # 连接池实例
41
+ self._connection_pool: Optional[aioredis.ConnectionPool] = None
42
+ self._redis_client: Optional[aioredis.Redis] = None
43
+ self._connection_tested = False # 标记是否已测试连接
44
+
45
+ # 连接池统计信息
46
+ self._stats = {
47
+ 'created_connections': 0,
48
+ 'active_connections': 0,
49
+ 'idle_connections': 0,
50
+ 'errors': 0
51
+ }
52
+
53
+ # 初始化连接池
54
+ self._initialize_pool()
55
+
56
+ @property
57
+ def logger(self):
58
+ """延迟初始化logger"""
59
+ if self._logger is None:
60
+ from crawlo.utils.log import get_logger
61
+ self._logger = get_logger(self.__class__.__name__)
62
+ return self._logger
63
+
64
+ @property
65
+ def error_handler(self):
66
+ """延迟初始化error_handler"""
67
+ if self._error_handler is None:
68
+ from crawlo.utils.error_handler import ErrorHandler
69
+ self._error_handler = ErrorHandler(self.__class__.__name__)
70
+ return self._error_handler
71
+
72
+ def _initialize_pool(self):
73
+ """初始化连接池"""
74
+ try:
75
+ self._connection_pool = aioredis.ConnectionPool.from_url(
76
+ self.redis_url,
77
+ **self.config
78
+ )
79
+
80
+ self._redis_client = aioredis.Redis(
81
+ connection_pool=self._connection_pool
82
+ )
83
+
84
+ # 只在调试模式下输出详细连接池信息
85
+ self.logger.debug(f"Redis连接池初始化成功: {self.redis_url}")
86
+ self.logger.debug(f" 连接池配置: {self.config}")
87
+
88
+ except Exception as e:
89
+ self.error_handler.handle_error(
90
+ e,
91
+ context="Redis连接池初始化失败",
92
+ raise_error=True
93
+ )
94
+
95
+ async def _test_connection(self):
96
+ """测试Redis连接"""
97
+ if self._redis_client and not self._connection_tested:
98
+ try:
99
+ await self._redis_client.ping()
100
+ self._connection_tested = True
101
+ # 只在调试模式下输出连接测试成功信息
102
+ self.logger.debug(f"Redis连接测试成功: {self.redis_url}")
103
+ except Exception as e:
104
+ self.logger.error(f"Redis连接测试失败: {self.redis_url} - {e}")
105
+ raise
106
+
107
+ async def get_connection(self) -> aioredis.Redis:
108
+ """
109
+ 获取Redis连接实例
110
+
111
+ Returns:
112
+ Redis连接实例
113
+ """
114
+ if not self._redis_client:
115
+ self._initialize_pool()
116
+
117
+ # 确保连接有效
118
+ await self._test_connection()
119
+
120
+ self._stats['active_connections'] += 1
121
+ return self._redis_client
122
+
123
+ async def ping(self) -> bool:
124
+ """
125
+ 检查Redis连接是否正常
126
+
127
+ Returns:
128
+ 连接是否正常
129
+ """
130
+ try:
131
+ if self._redis_client:
132
+ await self._redis_client.ping()
133
+ return True
134
+ return False
135
+ except Exception as e:
136
+ self.logger.warning(f"Redis连接检查失败: {e}")
137
+ return False
138
+
139
+ async def close(self):
140
+ """关闭连接池"""
141
+ try:
142
+ if self._redis_client:
143
+ await self._redis_client.close()
144
+ self._redis_client = None
145
+
146
+ if self._connection_pool:
147
+ await self._connection_pool.disconnect()
148
+ self._connection_pool = None
149
+
150
+ self.logger.info("Redis连接池已关闭")
151
+ except Exception as e:
152
+ self.error_handler.handle_error(
153
+ e,
154
+ context="关闭Redis连接池失败",
155
+ raise_error=False
156
+ )
157
+
158
+ def get_stats(self) -> Dict[str, Any]:
159
+ """
160
+ 获取连接池统计信息
161
+
162
+ Returns:
163
+ 统计信息字典
164
+ """
165
+ if self._connection_pool:
166
+ pool_stats = {
167
+ 'max_connections': self._connection_pool.max_connections,
168
+ 'created_connections': self._connection_pool.created_connections,
169
+ 'available_connections': len(self._connection_pool._available_connections),
170
+ 'in_use_connections': len(self._connection_pool._in_use_connections),
171
+ }
172
+ self._stats.update(pool_stats)
173
+
174
+ return self._stats.copy()
175
+
176
+ @asynccontextmanager
177
+ async def connection_context(self):
178
+ """
179
+ 连接上下文管理器
180
+
181
+ Yields:
182
+ Redis连接实例
183
+ """
184
+ connection = await self.get_connection()
185
+ try:
186
+ yield connection
187
+ finally:
188
+ self._stats['active_connections'] -= 1
189
+ self._stats['idle_connections'] += 1
190
+
191
+
192
+ class RedisBatchOperationHelper:
193
+ """Redis批量操作助手"""
194
+
195
+ def __init__(self, redis_client: aioredis.Redis, batch_size: int = 100):
196
+ self.redis_client = redis_client
197
+ self.batch_size = batch_size
198
+
199
+ # 延迟初始化logger和error_handler
200
+ self._logger = None
201
+ self._error_handler = None
202
+
203
+ @property
204
+ def logger(self):
205
+ """延迟初始化logger"""
206
+ if self._logger is None:
207
+ from crawlo.utils.log import get_logger
208
+ self._logger = get_logger(self.__class__.__name__)
209
+ return self._logger
210
+
211
+ @property
212
+ def error_handler(self):
213
+ """延迟初始化error_handler"""
214
+ if self._error_handler is None:
215
+ from crawlo.utils.error_handler import ErrorHandler
216
+ self._error_handler = ErrorHandler(self.__class__.__name__)
217
+ return self._error_handler
218
+
219
+ async def batch_execute(self, operations: list, batch_size: Optional[int] = None) -> list:
220
+ """
221
+ 批量执行Redis操作
222
+
223
+ Args:
224
+ operations: 操作列表,每个操作是一个包含(command, *args)的元组
225
+ batch_size: 批次大小(如果为None则使用实例的batch_size)
226
+
227
+ Returns:
228
+ 执行结果列表
229
+ """
230
+ actual_batch_size = batch_size or self.batch_size
231
+ results = []
232
+
233
+ try:
234
+ for i in range(0, len(operations), actual_batch_size):
235
+ batch = operations[i:i + actual_batch_size]
236
+ self.logger.debug(f"执行批次 {i//actual_batch_size + 1}/{(len(operations)-1)//actual_batch_size + 1}")
237
+
238
+ try:
239
+ pipe = self.redis_client.pipeline()
240
+ for operation in batch:
241
+ command, *args = operation
242
+ getattr(pipe, command)(*args)
243
+
244
+ batch_results = await pipe.execute()
245
+ results.extend(batch_results)
246
+
247
+ except Exception as e:
248
+ self.logger.error(f"执行批次失败: {e}")
249
+ # 继续执行下一个批次而不是中断
250
+
251
+ except Exception as e:
252
+ self.error_handler.handle_error(
253
+ e,
254
+ context="Redis批量操作执行失败",
255
+ raise_error=False
256
+ )
257
+
258
+ return results
259
+
260
+ async def batch_set_hash(self, hash_key: str, items: Dict[str, Any]) -> int:
261
+ """
262
+ 批量设置Hash字段
263
+
264
+ Args:
265
+ hash_key: Hash键名
266
+ items: 要设置的字段字典
267
+
268
+ Returns:
269
+ 成功设置的字段数量
270
+ """
271
+ try:
272
+ if not items:
273
+ return 0
274
+
275
+ pipe = self.redis_client.pipeline()
276
+ count = 0
277
+
278
+ for key, value in items.items():
279
+ pipe.hset(hash_key, key, value)
280
+ count += 1
281
+
282
+ # 每达到批次大小就执行一次
283
+ if count % self.batch_size == 0:
284
+ await pipe.execute()
285
+ pipe = self.redis_client.pipeline()
286
+
287
+ # 执行剩余的操作
288
+ if count % self.batch_size != 0:
289
+ await pipe.execute()
290
+
291
+ self.logger.debug(f"批量设置Hash {count} 个字段")
292
+ return count
293
+
294
+ except Exception as e:
295
+ self.error_handler.handle_error(
296
+ e,
297
+ context="Redis批量设置Hash失败",
298
+ raise_error=False
299
+ )
300
+ return 0
301
+
302
+ async def batch_get_hash(self, hash_key: str, fields: list) -> Dict[str, Any]:
303
+ """
304
+ 批量获取Hash字段值
305
+
306
+ Args:
307
+ hash_key: Hash键名
308
+ fields: 要获取的字段列表
309
+
310
+ Returns:
311
+ 字段值字典
312
+ """
313
+ try:
314
+ if not fields:
315
+ return {}
316
+
317
+ # 使用管道批量获取
318
+ pipe = self.redis_client.pipeline()
319
+ for field in fields:
320
+ pipe.hget(hash_key, field)
321
+
322
+ results = await pipe.execute()
323
+
324
+ # 构建结果字典
325
+ result_dict = {}
326
+ for i, field in enumerate(fields):
327
+ if results[i] is not None:
328
+ result_dict[field] = results[i]
329
+
330
+ self.logger.debug(f"批量获取Hash {len(result_dict)} 个字段")
331
+ return result_dict
332
+
333
+ except Exception as e:
334
+ self.error_handler.handle_error(
335
+ e,
336
+ context="Redis批量获取Hash失败",
337
+ raise_error=False
338
+ )
339
+ return {}
340
+
341
+
342
+ # 全局连接池管理器
343
+ _connection_pools: Dict[str, OptimizedRedisConnectionPool] = {}
344
+
345
+
346
+ def get_redis_pool(redis_url: str, **kwargs) -> OptimizedRedisConnectionPool:
347
+ """
348
+ 获取Redis连接池实例(单例模式)
349
+
350
+ Args:
351
+ redis_url: Redis URL
352
+ **kwargs: 连接池配置参数
353
+
354
+ Returns:
355
+ Redis连接池实例
356
+ """
357
+ if redis_url not in _connection_pools:
358
+ _connection_pools[redis_url] = OptimizedRedisConnectionPool(redis_url, **kwargs)
359
+
360
+ return _connection_pools[redis_url]
361
+
362
+
363
+ async def close_all_pools():
364
+ """关闭所有连接池"""
365
+ global _connection_pools
366
+
367
+ for pool in _connection_pools.values():
368
+ await pool.close()
369
+
370
+ _connection_pools.clear()
371
+
372
+
373
+ # 便捷函数
374
+ async def execute_redis_batch(redis_url: str, operations: list, batch_size: int = 100) -> list:
375
+ """
376
+ 便捷函数:执行Redis批量操作
377
+
378
+ Args:
379
+ redis_url: Redis URL
380
+ operations: 操作列表
381
+ batch_size: 批次大小
382
+
383
+ Returns:
384
+ 执行结果列表
385
+ """
386
+ pool = get_redis_pool(redis_url)
387
+ redis_client = await pool.get_connection()
388
+ helper = RedisBatchOperationHelper(redis_client, batch_size)
389
389
  return await helper.batch_execute(operations)