crawlo 1.3.6__py3-none-any.whl → 1.3.7__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 (291) hide show
  1. crawlo/__init__.py +87 -87
  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 +45 -45
  16. crawlo/core/engine.py +439 -439
  17. crawlo/core/processor.py +40 -40
  18. crawlo/core/scheduler.py +257 -257
  19. crawlo/crawler.py +638 -638
  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 +228 -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 +39 -39
  32. crawlo/extension/health_check.py +141 -141
  33. crawlo/extension/log_interval.py +57 -57
  34. crawlo/extension/log_stats.py +81 -81
  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 +39 -39
  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 +37 -37
  58. crawlo/logging/config.py +96 -96
  59. crawlo/logging/factory.py +128 -128
  60. crawlo/logging/manager.py +111 -111
  61. crawlo/middleware/__init__.py +21 -21
  62. crawlo/middleware/default_header.py +132 -132
  63. crawlo/middleware/download_delay.py +104 -104
  64. crawlo/middleware/middleware_manager.py +135 -135
  65. crawlo/middleware/offsite.py +123 -123
  66. crawlo/middleware/proxy.py +386 -386
  67. crawlo/middleware/request_ignore.py +86 -86
  68. crawlo/middleware/response_code.py +163 -163
  69. crawlo/middleware/response_filter.py +136 -136
  70. crawlo/middleware/retry.py +124 -124
  71. crawlo/middleware/simple_proxy.py +65 -65
  72. crawlo/mode_manager.py +212 -212
  73. crawlo/network/__init__.py +21 -21
  74. crawlo/network/request.py +379 -379
  75. crawlo/network/response.py +359 -359
  76. crawlo/pipelines/__init__.py +21 -21
  77. crawlo/pipelines/bloom_dedup_pipeline.py +156 -156
  78. crawlo/pipelines/console_pipeline.py +39 -39
  79. crawlo/pipelines/csv_pipeline.py +316 -316
  80. crawlo/pipelines/database_dedup_pipeline.py +222 -222
  81. crawlo/pipelines/json_pipeline.py +218 -218
  82. crawlo/pipelines/memory_dedup_pipeline.py +115 -115
  83. crawlo/pipelines/mongo_pipeline.py +131 -131
  84. crawlo/pipelines/mysql_pipeline.py +325 -325
  85. crawlo/pipelines/pipeline_manager.py +76 -76
  86. crawlo/pipelines/redis_dedup_pipeline.py +166 -166
  87. crawlo/project.py +327 -327
  88. crawlo/queue/pqueue.py +42 -42
  89. crawlo/queue/queue_manager.py +522 -503
  90. crawlo/queue/redis_priority_queue.py +367 -326
  91. crawlo/settings/__init__.py +7 -7
  92. crawlo/settings/default_settings.py +321 -321
  93. crawlo/settings/setting_manager.py +214 -214
  94. crawlo/spider/__init__.py +657 -657
  95. crawlo/stats_collector.py +73 -73
  96. crawlo/subscriber.py +129 -129
  97. crawlo/task_manager.py +138 -138
  98. crawlo/templates/crawlo.cfg.tmpl +10 -10
  99. crawlo/templates/project/__init__.py.tmpl +3 -3
  100. crawlo/templates/project/items.py.tmpl +17 -17
  101. crawlo/templates/project/middlewares.py.tmpl +118 -118
  102. crawlo/templates/project/pipelines.py.tmpl +96 -96
  103. crawlo/templates/project/settings.py.tmpl +170 -167
  104. crawlo/templates/project/settings_distributed.py.tmpl +169 -166
  105. crawlo/templates/project/settings_gentle.py.tmpl +166 -166
  106. crawlo/templates/project/settings_high_performance.py.tmpl +167 -167
  107. crawlo/templates/project/settings_minimal.py.tmpl +65 -65
  108. crawlo/templates/project/settings_simple.py.tmpl +164 -164
  109. crawlo/templates/project/spiders/__init__.py.tmpl +9 -9
  110. crawlo/templates/run.py.tmpl +34 -34
  111. crawlo/templates/spider/spider.py.tmpl +143 -143
  112. crawlo/templates/spiders_init.py.tmpl +9 -9
  113. crawlo/tools/__init__.py +200 -200
  114. crawlo/tools/anti_crawler.py +268 -268
  115. crawlo/tools/authenticated_proxy.py +240 -240
  116. crawlo/tools/data_formatter.py +225 -225
  117. crawlo/tools/data_validator.py +180 -180
  118. crawlo/tools/date_tools.py +289 -289
  119. crawlo/tools/distributed_coordinator.py +388 -388
  120. crawlo/tools/encoding_converter.py +127 -127
  121. crawlo/tools/network_diagnostic.py +364 -364
  122. crawlo/tools/request_tools.py +82 -82
  123. crawlo/tools/retry_mechanism.py +224 -224
  124. crawlo/tools/scenario_adapter.py +262 -262
  125. crawlo/tools/text_cleaner.py +232 -232
  126. crawlo/utils/__init__.py +34 -34
  127. crawlo/utils/batch_processor.py +259 -259
  128. crawlo/utils/class_loader.py +25 -25
  129. crawlo/utils/controlled_spider_mixin.py +439 -439
  130. crawlo/utils/db_helper.py +343 -343
  131. crawlo/utils/enhanced_error_handler.py +356 -356
  132. crawlo/utils/env_config.py +142 -142
  133. crawlo/utils/error_handler.py +165 -165
  134. crawlo/utils/func_tools.py +82 -82
  135. crawlo/utils/large_scale_config.py +286 -286
  136. crawlo/utils/large_scale_helper.py +344 -344
  137. crawlo/utils/log.py +79 -79
  138. crawlo/utils/performance_monitor.py +285 -285
  139. crawlo/utils/queue_helper.py +175 -175
  140. crawlo/utils/redis_connection_pool.py +388 -388
  141. crawlo/utils/redis_key_validator.py +198 -198
  142. crawlo/utils/request.py +267 -267
  143. crawlo/utils/request_serializer.py +225 -225
  144. crawlo/utils/spider_loader.py +61 -61
  145. crawlo/utils/system.py +11 -11
  146. crawlo/utils/tools.py +4 -4
  147. crawlo/utils/url.py +39 -39
  148. {crawlo-1.3.6.dist-info → crawlo-1.3.7.dist-info}/METADATA +1199 -1126
  149. crawlo-1.3.7.dist-info/RECORD +292 -0
  150. examples/__init__.py +7 -7
  151. tests/__init__.py +7 -7
  152. tests/advanced_tools_example.py +275 -275
  153. tests/authenticated_proxy_example.py +106 -106
  154. tests/baidu_performance_test.py +108 -108
  155. tests/baidu_test.py +59 -59
  156. tests/cleaners_example.py +160 -160
  157. tests/comprehensive_framework_test.py +212 -212
  158. tests/comprehensive_test.py +81 -81
  159. tests/comprehensive_testing_summary.md +186 -186
  160. tests/config_validation_demo.py +142 -142
  161. tests/controlled_spider_example.py +205 -205
  162. tests/date_tools_example.py +180 -180
  163. tests/debug_configure.py +69 -69
  164. tests/debug_framework_logger.py +84 -84
  165. tests/debug_log_config.py +126 -126
  166. tests/debug_log_levels.py +63 -63
  167. tests/debug_pipelines.py +66 -66
  168. tests/detailed_log_test.py +233 -233
  169. tests/distributed_test.py +66 -66
  170. tests/distributed_test_debug.py +76 -76
  171. tests/dynamic_loading_example.py +523 -523
  172. tests/dynamic_loading_test.py +104 -104
  173. tests/env_config_example.py +133 -133
  174. tests/error_handling_example.py +171 -171
  175. tests/final_comprehensive_test.py +151 -151
  176. tests/final_log_test.py +260 -260
  177. tests/final_validation_test.py +182 -182
  178. tests/fix_log_test.py +142 -142
  179. tests/framework_performance_test.py +202 -202
  180. tests/log_buffering_test.py +111 -111
  181. tests/log_generation_timing_test.py +153 -153
  182. tests/optimized_performance_test.py +211 -211
  183. tests/performance_comparison.py +245 -245
  184. tests/queue_blocking_test.py +113 -113
  185. tests/queue_test.py +89 -89
  186. tests/redis_key_validation_demo.py +130 -130
  187. tests/request_params_example.py +150 -150
  188. tests/response_improvements_example.py +144 -144
  189. tests/scrapy_comparison/ofweek_scrapy.py +138 -138
  190. tests/scrapy_comparison/scrapy_test.py +133 -133
  191. tests/simple_command_test.py +119 -119
  192. tests/simple_crawlo_test.py +127 -127
  193. tests/simple_log_test.py +57 -57
  194. tests/simple_log_test2.py +137 -137
  195. tests/simple_optimization_test.py +128 -128
  196. tests/simple_queue_type_test.py +41 -41
  197. tests/simple_spider_test.py +49 -49
  198. tests/simple_test.py +47 -47
  199. tests/spider_log_timing_test.py +177 -177
  200. tests/test_advanced_tools.py +148 -148
  201. tests/test_all_commands.py +230 -230
  202. tests/test_all_redis_key_configs.py +145 -145
  203. tests/test_authenticated_proxy.py +141 -141
  204. tests/test_batch_processor.py +178 -178
  205. tests/test_cleaners.py +54 -54
  206. tests/test_component_factory.py +174 -174
  207. tests/test_comprehensive.py +146 -146
  208. tests/test_config_consistency.py +80 -80
  209. tests/test_config_merge.py +152 -152
  210. tests/test_config_validator.py +182 -182
  211. tests/test_controlled_spider_mixin.py +79 -79
  212. tests/test_crawlo_proxy_integration.py +108 -108
  213. tests/test_date_tools.py +123 -123
  214. tests/test_default_header_middleware.py +158 -158
  215. tests/test_distributed.py +65 -65
  216. tests/test_double_crawlo_fix.py +204 -207
  217. tests/test_double_crawlo_fix_simple.py +124 -124
  218. tests/test_download_delay_middleware.py +221 -221
  219. tests/test_downloader_proxy_compatibility.py +268 -268
  220. tests/test_dynamic_downloaders_proxy.py +124 -124
  221. tests/test_dynamic_proxy.py +92 -92
  222. tests/test_dynamic_proxy_config.py +146 -146
  223. tests/test_dynamic_proxy_real.py +109 -109
  224. tests/test_edge_cases.py +303 -303
  225. tests/test_enhanced_error_handler.py +270 -270
  226. tests/test_enhanced_error_handler_comprehensive.py +245 -245
  227. tests/test_env_config.py +121 -121
  228. tests/test_error_handler_compatibility.py +112 -112
  229. tests/test_factories.py +252 -252
  230. tests/test_final_validation.py +153 -153
  231. tests/test_framework_env_usage.py +103 -103
  232. tests/test_framework_logger.py +66 -66
  233. tests/test_framework_startup.py +64 -64
  234. tests/test_get_component_logger.py +83 -83
  235. tests/test_integration.py +169 -169
  236. tests/test_item_dedup_redis_key.py +122 -122
  237. tests/test_large_scale_config.py +112 -112
  238. tests/test_large_scale_helper.py +235 -235
  239. tests/test_logging_system.py +282 -282
  240. tests/test_mode_change.py +72 -72
  241. tests/test_mode_consistency.py +51 -51
  242. tests/test_offsite_middleware.py +221 -221
  243. tests/test_parsel.py +29 -29
  244. tests/test_performance.py +327 -327
  245. tests/test_performance_monitor.py +115 -115
  246. tests/test_proxy_api.py +264 -264
  247. tests/test_proxy_health_check.py +32 -32
  248. tests/test_proxy_middleware.py +121 -121
  249. tests/test_proxy_middleware_enhanced.py +216 -216
  250. tests/test_proxy_middleware_integration.py +136 -136
  251. tests/test_proxy_middleware_refactored.py +184 -184
  252. tests/test_proxy_providers.py +56 -56
  253. tests/test_proxy_stats.py +19 -19
  254. tests/test_proxy_strategies.py +59 -59
  255. tests/test_queue_empty_check.py +41 -41
  256. tests/test_queue_manager_double_crawlo.py +173 -173
  257. tests/test_queue_manager_redis_key.py +179 -176
  258. tests/test_queue_naming.py +155 -0
  259. tests/test_queue_type.py +106 -106
  260. tests/test_random_user_agent.py +72 -72
  261. tests/test_real_scenario_proxy.py +195 -195
  262. tests/test_redis_config.py +28 -28
  263. tests/test_redis_connection_pool.py +294 -294
  264. tests/test_redis_key_naming.py +181 -181
  265. tests/test_redis_key_validator.py +123 -123
  266. tests/test_redis_queue.py +224 -224
  267. tests/test_redis_queue_name_fix.py +176 -0
  268. tests/test_request_ignore_middleware.py +182 -182
  269. tests/test_request_params.py +111 -111
  270. tests/test_request_serialization.py +70 -70
  271. tests/test_response_code_middleware.py +349 -349
  272. tests/test_response_filter_middleware.py +427 -427
  273. tests/test_response_improvements.py +152 -152
  274. tests/test_retry_middleware.py +241 -241
  275. tests/test_scheduler.py +252 -252
  276. tests/test_scheduler_config_update.py +133 -133
  277. tests/test_simple_response.py +61 -61
  278. tests/test_telecom_spider_redis_key.py +205 -205
  279. tests/test_template_content.py +87 -87
  280. tests/test_template_redis_key.py +134 -134
  281. tests/test_tools.py +159 -159
  282. tests/test_user_agents.py +96 -96
  283. tests/tools_example.py +260 -260
  284. tests/untested_features_report.md +138 -138
  285. tests/verify_debug.py +51 -51
  286. tests/verify_distributed.py +117 -117
  287. tests/verify_log_fix.py +111 -111
  288. crawlo-1.3.6.dist-info/RECORD +0 -290
  289. {crawlo-1.3.6.dist-info → crawlo-1.3.7.dist-info}/WHEEL +0 -0
  290. {crawlo-1.3.6.dist-info → crawlo-1.3.7.dist-info}/entry_points.txt +0 -0
  291. {crawlo-1.3.6.dist-info → crawlo-1.3.7.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)