crawlo 1.1.3__py3-none-any.whl → 1.1.5__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.
- crawlo/__init__.py +28 -1
- crawlo/__version__.py +1 -1
- crawlo/cleaners/__init__.py +61 -0
- crawlo/cleaners/data_formatter.py +226 -0
- crawlo/cleaners/encoding_converter.py +126 -0
- crawlo/cleaners/text_cleaner.py +233 -0
- crawlo/commands/startproject.py +117 -13
- crawlo/config.py +30 -0
- crawlo/config_validator.py +253 -0
- crawlo/core/engine.py +185 -11
- crawlo/core/scheduler.py +49 -78
- crawlo/crawler.py +6 -6
- crawlo/downloader/__init__.py +24 -0
- crawlo/downloader/aiohttp_downloader.py +8 -0
- crawlo/downloader/cffi_downloader.py +5 -0
- crawlo/downloader/hybrid_downloader.py +214 -0
- crawlo/downloader/playwright_downloader.py +403 -0
- crawlo/downloader/selenium_downloader.py +473 -0
- crawlo/extension/__init__.py +17 -10
- crawlo/extension/health_check.py +142 -0
- crawlo/extension/log_interval.py +27 -18
- crawlo/extension/log_stats.py +62 -24
- crawlo/extension/logging_extension.py +18 -9
- crawlo/extension/memory_monitor.py +105 -0
- crawlo/extension/performance_profiler.py +134 -0
- crawlo/extension/request_recorder.py +108 -0
- crawlo/filters/aioredis_filter.py +50 -12
- crawlo/middleware/proxy.py +26 -2
- crawlo/mode_manager.py +24 -19
- crawlo/network/request.py +30 -3
- crawlo/network/response.py +114 -25
- crawlo/pipelines/mongo_pipeline.py +81 -66
- crawlo/pipelines/mysql_pipeline.py +165 -43
- crawlo/pipelines/redis_dedup_pipeline.py +7 -3
- crawlo/queue/queue_manager.py +15 -2
- crawlo/queue/redis_priority_queue.py +144 -76
- crawlo/settings/default_settings.py +93 -121
- crawlo/subscriber.py +62 -37
- crawlo/templates/project/items.py.tmpl +1 -1
- crawlo/templates/project/middlewares.py.tmpl +73 -49
- crawlo/templates/project/pipelines.py.tmpl +51 -295
- crawlo/templates/project/settings.py.tmpl +93 -17
- crawlo/templates/project/settings_distributed.py.tmpl +120 -0
- crawlo/templates/project/settings_gentle.py.tmpl +95 -0
- crawlo/templates/project/settings_high_performance.py.tmpl +152 -0
- crawlo/templates/project/settings_simple.py.tmpl +69 -0
- crawlo/templates/spider/spider.py.tmpl +2 -38
- crawlo/tools/__init__.py +183 -0
- crawlo/tools/anti_crawler.py +269 -0
- crawlo/tools/authenticated_proxy.py +241 -0
- crawlo/tools/data_validator.py +181 -0
- crawlo/tools/date_tools.py +36 -0
- crawlo/tools/distributed_coordinator.py +387 -0
- crawlo/tools/retry_mechanism.py +221 -0
- crawlo/tools/scenario_adapter.py +263 -0
- crawlo/utils/__init__.py +29 -1
- crawlo/utils/batch_processor.py +261 -0
- crawlo/utils/date_tools.py +58 -1
- crawlo/utils/enhanced_error_handler.py +360 -0
- crawlo/utils/env_config.py +106 -0
- crawlo/utils/error_handler.py +126 -0
- crawlo/utils/performance_monitor.py +285 -0
- crawlo/utils/redis_connection_pool.py +335 -0
- crawlo/utils/redis_key_validator.py +200 -0
- crawlo-1.1.5.dist-info/METADATA +401 -0
- crawlo-1.1.5.dist-info/RECORD +185 -0
- tests/advanced_tools_example.py +276 -0
- tests/authenticated_proxy_example.py +237 -0
- tests/cleaners_example.py +161 -0
- tests/config_validation_demo.py +103 -0
- tests/date_tools_example.py +181 -0
- tests/dynamic_loading_example.py +524 -0
- tests/dynamic_loading_test.py +105 -0
- tests/env_config_example.py +134 -0
- tests/error_handling_example.py +172 -0
- tests/redis_key_validation_demo.py +131 -0
- tests/response_improvements_example.py +145 -0
- tests/test_advanced_tools.py +149 -0
- tests/test_all_redis_key_configs.py +146 -0
- tests/test_authenticated_proxy.py +142 -0
- tests/test_cleaners.py +55 -0
- tests/test_comprehensive.py +147 -0
- tests/test_config_validator.py +194 -0
- tests/test_date_tools.py +124 -0
- tests/test_dynamic_downloaders_proxy.py +125 -0
- tests/test_dynamic_proxy.py +93 -0
- tests/test_dynamic_proxy_config.py +147 -0
- tests/test_dynamic_proxy_real.py +110 -0
- tests/test_edge_cases.py +304 -0
- tests/test_enhanced_error_handler.py +271 -0
- tests/test_env_config.py +122 -0
- tests/test_error_handler_compatibility.py +113 -0
- tests/test_framework_env_usage.py +104 -0
- tests/test_integration.py +357 -0
- tests/test_item_dedup_redis_key.py +123 -0
- tests/test_parsel.py +30 -0
- tests/test_performance.py +328 -0
- tests/test_queue_manager_redis_key.py +177 -0
- tests/test_redis_connection_pool.py +295 -0
- tests/test_redis_key_naming.py +182 -0
- tests/test_redis_key_validator.py +124 -0
- tests/test_response_improvements.py +153 -0
- tests/test_simple_response.py +62 -0
- tests/test_telecom_spider_redis_key.py +206 -0
- tests/test_template_content.py +88 -0
- tests/test_template_redis_key.py +135 -0
- tests/test_tools.py +154 -0
- tests/tools_example.py +258 -0
- crawlo/core/enhanced_engine.py +0 -190
- crawlo-1.1.3.dist-info/METADATA +0 -635
- crawlo-1.1.3.dist-info/RECORD +0 -113
- {crawlo-1.1.3.dist-info → crawlo-1.1.5.dist-info}/WHEEL +0 -0
- {crawlo-1.1.3.dist-info → crawlo-1.1.5.dist-info}/entry_points.txt +0 -0
- {crawlo-1.1.3.dist-info → crawlo-1.1.5.dist-info}/top_level.txt +0 -0
- {examples → tests}/controlled_spider_example.py +0 -0
|
@@ -0,0 +1,360 @@
|
|
|
1
|
+
#!/usr/bin/python
|
|
2
|
+
# -*- coding:UTF-8 -*-
|
|
3
|
+
"""
|
|
4
|
+
增强版错误处理工具
|
|
5
|
+
提供更详细、更一致的错误处理和日志记录机制
|
|
6
|
+
"""
|
|
7
|
+
import traceback
|
|
8
|
+
import logging
|
|
9
|
+
import sys
|
|
10
|
+
import os
|
|
11
|
+
from typing import Optional, Callable, Any, Dict, List
|
|
12
|
+
from functools import wraps
|
|
13
|
+
from datetime import datetime
|
|
14
|
+
|
|
15
|
+
from crawlo.utils.log import get_logger
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
class ErrorContext:
|
|
19
|
+
"""错误上下文信息"""
|
|
20
|
+
|
|
21
|
+
def __init__(self, context: str = "", module: str = "", function: str = ""):
|
|
22
|
+
self.context = context
|
|
23
|
+
self.module = module
|
|
24
|
+
self.function = function
|
|
25
|
+
self.timestamp = datetime.now()
|
|
26
|
+
|
|
27
|
+
def __str__(self):
|
|
28
|
+
parts = []
|
|
29
|
+
if self.module:
|
|
30
|
+
parts.append(f"Module: {self.module}")
|
|
31
|
+
if self.function:
|
|
32
|
+
parts.append(f"Function: {self.function}")
|
|
33
|
+
if self.context:
|
|
34
|
+
parts.append(f"Context: {self.context}")
|
|
35
|
+
parts.append(f"Time: {self.timestamp.strftime('%Y-%m-%d %H:%M:%S')}")
|
|
36
|
+
return " | ".join(parts)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
class DetailedException(Exception):
|
|
40
|
+
"""带有详细信息的异常基类"""
|
|
41
|
+
|
|
42
|
+
def __init__(self, message: str, context: Optional[ErrorContext] = None,
|
|
43
|
+
error_code: Optional[str] = None, **kwargs):
|
|
44
|
+
super().__init__(message)
|
|
45
|
+
self.context = context
|
|
46
|
+
self.error_code = error_code
|
|
47
|
+
self.details = kwargs
|
|
48
|
+
self.timestamp = datetime.now()
|
|
49
|
+
|
|
50
|
+
def __str__(self):
|
|
51
|
+
base_msg = super().__str__()
|
|
52
|
+
if self.context:
|
|
53
|
+
return f"{base_msg} ({self.context})"
|
|
54
|
+
return base_msg
|
|
55
|
+
|
|
56
|
+
def get_full_details(self) -> Dict:
|
|
57
|
+
"""获取完整的错误详情"""
|
|
58
|
+
return {
|
|
59
|
+
"message": str(self),
|
|
60
|
+
"error_code": self.error_code,
|
|
61
|
+
"context": str(self.context) if self.context else None,
|
|
62
|
+
"details": self.details,
|
|
63
|
+
"timestamp": self.timestamp.isoformat(),
|
|
64
|
+
"exception_type": self.__class__.__name__
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
class EnhancedErrorHandler:
|
|
69
|
+
"""增强版错误处理器"""
|
|
70
|
+
|
|
71
|
+
def __init__(self, logger_name: str = __name__, log_level: str = 'ERROR'):
|
|
72
|
+
self.logger = get_logger(logger_name, log_level)
|
|
73
|
+
self.error_history: List[Dict] = [] # 错误历史记录
|
|
74
|
+
self.max_history_size = 100 # 最大历史记录数
|
|
75
|
+
|
|
76
|
+
def handle_error(self, exception: Exception, context: Optional[ErrorContext] = None,
|
|
77
|
+
raise_error: bool = True, log_error: bool = True,
|
|
78
|
+
extra_info: Optional[Dict] = None) -> Dict:
|
|
79
|
+
"""
|
|
80
|
+
增强版错误处理
|
|
81
|
+
|
|
82
|
+
Args:
|
|
83
|
+
exception: 异常对象
|
|
84
|
+
context: 错误上下文信息
|
|
85
|
+
raise_error: 是否重新抛出异常
|
|
86
|
+
log_error: 是否记录错误日志
|
|
87
|
+
extra_info: 额外的错误信息
|
|
88
|
+
|
|
89
|
+
Returns:
|
|
90
|
+
包含错误详情的字典
|
|
91
|
+
"""
|
|
92
|
+
# 构建错误详情
|
|
93
|
+
error_details = {
|
|
94
|
+
"exception": exception,
|
|
95
|
+
"exception_type": type(exception).__name__,
|
|
96
|
+
"message": str(exception),
|
|
97
|
+
"context": str(context) if context else None,
|
|
98
|
+
"timestamp": datetime.now().isoformat(),
|
|
99
|
+
"traceback": traceback.format_exc() if log_error else None,
|
|
100
|
+
"extra_info": extra_info or {}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
# 记录到历史
|
|
104
|
+
self._record_error(error_details)
|
|
105
|
+
|
|
106
|
+
# 记录日志
|
|
107
|
+
if log_error:
|
|
108
|
+
self._log_error(error_details)
|
|
109
|
+
|
|
110
|
+
# 重新抛出异常
|
|
111
|
+
if raise_error:
|
|
112
|
+
raise exception
|
|
113
|
+
|
|
114
|
+
return error_details
|
|
115
|
+
|
|
116
|
+
def _log_error(self, error_details: Dict):
|
|
117
|
+
"""记录错误日志"""
|
|
118
|
+
# 基本错误信息
|
|
119
|
+
context_info = error_details.get("context", "")
|
|
120
|
+
message = error_details["message"]
|
|
121
|
+
error_msg = f"{message} [{context_info}]" if context_info else message
|
|
122
|
+
|
|
123
|
+
# 记录错误
|
|
124
|
+
self.logger.error(error_msg)
|
|
125
|
+
|
|
126
|
+
# 记录详细信息
|
|
127
|
+
if error_details.get("traceback"):
|
|
128
|
+
self.logger.debug(f"详细错误信息:\n{error_details['traceback']}")
|
|
129
|
+
|
|
130
|
+
# 记录额外信息
|
|
131
|
+
if error_details.get("extra_info"):
|
|
132
|
+
self.logger.debug(f"额外信息: {error_details['extra_info']}")
|
|
133
|
+
|
|
134
|
+
def _record_error(self, error_details: Dict):
|
|
135
|
+
"""记录错误到历史"""
|
|
136
|
+
self.error_history.append(error_details)
|
|
137
|
+
# 限制历史记录大小
|
|
138
|
+
if len(self.error_history) > self.max_history_size:
|
|
139
|
+
self.error_history.pop(0)
|
|
140
|
+
|
|
141
|
+
def safe_call(self, func: Callable, *args, default_return=None,
|
|
142
|
+
context: Optional[ErrorContext] = None, **kwargs) -> Any:
|
|
143
|
+
"""
|
|
144
|
+
安全调用函数,捕获并处理异常
|
|
145
|
+
|
|
146
|
+
Args:
|
|
147
|
+
func: 要调用的函数
|
|
148
|
+
*args: 函数参数
|
|
149
|
+
default_return: 默认返回值
|
|
150
|
+
context: 错误上下文
|
|
151
|
+
**kwargs: 函数关键字参数
|
|
152
|
+
|
|
153
|
+
Returns:
|
|
154
|
+
函数返回值或默认值
|
|
155
|
+
"""
|
|
156
|
+
try:
|
|
157
|
+
return func(*args, **kwargs)
|
|
158
|
+
except Exception as e:
|
|
159
|
+
self.handle_error(e, context=context, raise_error=False)
|
|
160
|
+
return default_return
|
|
161
|
+
|
|
162
|
+
def retry_on_failure(self, max_retries: int = 3, delay: float = 1.0,
|
|
163
|
+
exceptions: tuple = (Exception,), backoff_factor: float = 1.0,
|
|
164
|
+
context: Optional[ErrorContext] = None):
|
|
165
|
+
"""
|
|
166
|
+
装饰器:失败时重试(增强版)
|
|
167
|
+
|
|
168
|
+
Args:
|
|
169
|
+
max_retries: 最大重试次数
|
|
170
|
+
delay: 初始重试间隔(秒)
|
|
171
|
+
exceptions: 需要重试的异常类型
|
|
172
|
+
backoff_factor: 退避因子(每次重试间隔乘以此因子)
|
|
173
|
+
context: 错误上下文
|
|
174
|
+
"""
|
|
175
|
+
def decorator(func):
|
|
176
|
+
@wraps(func)
|
|
177
|
+
async def async_wrapper(*args, **kwargs):
|
|
178
|
+
last_exception = None
|
|
179
|
+
current_delay = delay
|
|
180
|
+
|
|
181
|
+
for attempt in range(max_retries + 1):
|
|
182
|
+
try:
|
|
183
|
+
return await func(*args, **kwargs)
|
|
184
|
+
except exceptions as e:
|
|
185
|
+
last_exception = e
|
|
186
|
+
if attempt < max_retries:
|
|
187
|
+
# 记录重试信息
|
|
188
|
+
retry_context = ErrorContext(
|
|
189
|
+
context=f"函数 {func.__name__} 执行失败 (尝试 {attempt + 1}/{max_retries + 1})",
|
|
190
|
+
module=context.module if context else "",
|
|
191
|
+
function=func.__name__
|
|
192
|
+
) if context else None
|
|
193
|
+
|
|
194
|
+
self.logger.warning(
|
|
195
|
+
f"函数 {func.__name__} 执行失败 (尝试 {attempt + 1}/{max_retries + 1}): {e}"
|
|
196
|
+
)
|
|
197
|
+
|
|
198
|
+
import asyncio
|
|
199
|
+
await asyncio.sleep(current_delay)
|
|
200
|
+
current_delay *= backoff_factor # 指数退避
|
|
201
|
+
else:
|
|
202
|
+
# 最后一次尝试失败
|
|
203
|
+
final_context = ErrorContext(
|
|
204
|
+
context=f"函数 {func.__name__} 执行失败,已达到最大重试次数",
|
|
205
|
+
module=context.module if context else "",
|
|
206
|
+
function=func.__name__
|
|
207
|
+
) if context else None
|
|
208
|
+
|
|
209
|
+
self.logger.error(
|
|
210
|
+
f"函数 {func.__name__} 执行失败,已达到最大重试次数: {e}"
|
|
211
|
+
)
|
|
212
|
+
raise last_exception
|
|
213
|
+
|
|
214
|
+
@wraps(func)
|
|
215
|
+
def sync_wrapper(*args, **kwargs):
|
|
216
|
+
last_exception = None
|
|
217
|
+
current_delay = delay
|
|
218
|
+
|
|
219
|
+
for attempt in range(max_retries + 1):
|
|
220
|
+
try:
|
|
221
|
+
return func(*args, **kwargs)
|
|
222
|
+
except exceptions as e:
|
|
223
|
+
last_exception = e
|
|
224
|
+
if attempt < max_retries:
|
|
225
|
+
# 记录重试信息
|
|
226
|
+
retry_context = ErrorContext(
|
|
227
|
+
context=f"函数 {func.__name__} 执行失败 (尝试 {attempt + 1}/{max_retries + 1})",
|
|
228
|
+
module=context.module if context else "",
|
|
229
|
+
function=func.__name__
|
|
230
|
+
) if context else None
|
|
231
|
+
|
|
232
|
+
self.logger.warning(
|
|
233
|
+
f"函数 {func.__name__} 执行失败 (尝试 {attempt + 1}/{max_retries + 1}): {e}"
|
|
234
|
+
)
|
|
235
|
+
|
|
236
|
+
import time
|
|
237
|
+
time.sleep(current_delay)
|
|
238
|
+
current_delay *= backoff_factor # 指数退避
|
|
239
|
+
else:
|
|
240
|
+
# 最后一次尝试失败
|
|
241
|
+
final_context = ErrorContext(
|
|
242
|
+
context=f"函数 {func.__name__} 执行失败,已达到最大重试次数",
|
|
243
|
+
module=context.module if context else "",
|
|
244
|
+
function=func.__name__
|
|
245
|
+
) if context else None
|
|
246
|
+
|
|
247
|
+
self.logger.error(
|
|
248
|
+
f"函数 {func.__name__} 执行失败,已达到最大重试次数: {e}"
|
|
249
|
+
)
|
|
250
|
+
raise last_exception
|
|
251
|
+
|
|
252
|
+
# 根据函数是否为异步函数返回相应的包装器
|
|
253
|
+
import inspect
|
|
254
|
+
if inspect.iscoroutinefunction(func):
|
|
255
|
+
return async_wrapper
|
|
256
|
+
else:
|
|
257
|
+
return sync_wrapper
|
|
258
|
+
|
|
259
|
+
return decorator
|
|
260
|
+
|
|
261
|
+
def get_error_history(self) -> List[Dict]:
|
|
262
|
+
"""获取错误历史记录"""
|
|
263
|
+
return self.error_history.copy()
|
|
264
|
+
|
|
265
|
+
def clear_error_history(self):
|
|
266
|
+
"""清空错误历史记录"""
|
|
267
|
+
self.error_history.clear()
|
|
268
|
+
|
|
269
|
+
|
|
270
|
+
# 全局增强错误处理器实例
|
|
271
|
+
enhanced_error_handler = EnhancedErrorHandler()
|
|
272
|
+
|
|
273
|
+
|
|
274
|
+
def handle_exception(context: str = "", module: str = "", function: str = "",
|
|
275
|
+
raise_error: bool = True, log_error: bool = True,
|
|
276
|
+
error_code: Optional[str] = None):
|
|
277
|
+
"""
|
|
278
|
+
装饰器:处理函数异常(增强版)
|
|
279
|
+
|
|
280
|
+
Args:
|
|
281
|
+
context: 错误上下文描述
|
|
282
|
+
module: 模块名称
|
|
283
|
+
function: 函数名称
|
|
284
|
+
raise_error: 是否重新抛出异常
|
|
285
|
+
log_error: 是否记录错误日志
|
|
286
|
+
error_code: 错误代码
|
|
287
|
+
"""
|
|
288
|
+
def decorator(func):
|
|
289
|
+
@wraps(func)
|
|
290
|
+
async def async_wrapper(*args, **kwargs):
|
|
291
|
+
try:
|
|
292
|
+
return await func(*args, **kwargs)
|
|
293
|
+
except Exception as e:
|
|
294
|
+
error_context = ErrorContext(
|
|
295
|
+
context=f"{context} - {func.__name__}",
|
|
296
|
+
module=module,
|
|
297
|
+
function=func.__name__
|
|
298
|
+
)
|
|
299
|
+
|
|
300
|
+
# 如果是详细异常,保留原有信息
|
|
301
|
+
if isinstance(e, DetailedException):
|
|
302
|
+
# 确保上下文信息完整
|
|
303
|
+
if not e.context:
|
|
304
|
+
e.context = error_context
|
|
305
|
+
enhanced_error_handler.handle_error(
|
|
306
|
+
e, context=e.context,
|
|
307
|
+
raise_error=raise_error, log_error=log_error
|
|
308
|
+
)
|
|
309
|
+
else:
|
|
310
|
+
# 包装为详细异常
|
|
311
|
+
detailed_e = DetailedException(
|
|
312
|
+
str(e), context=error_context, error_code=error_code
|
|
313
|
+
)
|
|
314
|
+
enhanced_error_handler.handle_error(
|
|
315
|
+
detailed_e, context=error_context,
|
|
316
|
+
raise_error=raise_error, log_error=log_error
|
|
317
|
+
)
|
|
318
|
+
if not raise_error:
|
|
319
|
+
return None
|
|
320
|
+
|
|
321
|
+
@wraps(func)
|
|
322
|
+
def sync_wrapper(*args, **kwargs):
|
|
323
|
+
try:
|
|
324
|
+
return func(*args, **kwargs)
|
|
325
|
+
except Exception as e:
|
|
326
|
+
error_context = ErrorContext(
|
|
327
|
+
context=f"{context} - {func.__name__}",
|
|
328
|
+
module=module,
|
|
329
|
+
function=func.__name__
|
|
330
|
+
)
|
|
331
|
+
|
|
332
|
+
# 如果是详细异常,保留原有信息
|
|
333
|
+
if isinstance(e, DetailedException):
|
|
334
|
+
# 确保上下文信息完整
|
|
335
|
+
if not e.context:
|
|
336
|
+
e.context = error_context
|
|
337
|
+
enhanced_error_handler.handle_error(
|
|
338
|
+
e, context=e.context,
|
|
339
|
+
raise_error=raise_error, log_error=log_error
|
|
340
|
+
)
|
|
341
|
+
else:
|
|
342
|
+
# 包装为详细异常
|
|
343
|
+
detailed_e = DetailedException(
|
|
344
|
+
str(e), context=error_context, error_code=error_code
|
|
345
|
+
)
|
|
346
|
+
enhanced_error_handler.handle_error(
|
|
347
|
+
detailed_e, context=error_context,
|
|
348
|
+
raise_error=raise_error, log_error=log_error
|
|
349
|
+
)
|
|
350
|
+
if not raise_error:
|
|
351
|
+
return None
|
|
352
|
+
|
|
353
|
+
# 根据函数是否为异步函数返回相应的包装器
|
|
354
|
+
import inspect
|
|
355
|
+
if inspect.iscoroutinefunction(func):
|
|
356
|
+
return async_wrapper
|
|
357
|
+
else:
|
|
358
|
+
return sync_wrapper
|
|
359
|
+
|
|
360
|
+
return decorator
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
#!/usr/bin/python
|
|
2
|
+
# -*- coding:UTF-8 -*-
|
|
3
|
+
"""
|
|
4
|
+
环境变量配置工具
|
|
5
|
+
提供统一的环境变量读取和配置管理机制
|
|
6
|
+
"""
|
|
7
|
+
import os
|
|
8
|
+
from typing import Optional, Union, Any
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
class EnvConfigManager:
|
|
12
|
+
"""环境变量配置管理器"""
|
|
13
|
+
|
|
14
|
+
@staticmethod
|
|
15
|
+
def get_env_var(var_name: str, default: Any = None, var_type: type = str) -> Any:
|
|
16
|
+
"""
|
|
17
|
+
获取环境变量值
|
|
18
|
+
|
|
19
|
+
Args:
|
|
20
|
+
var_name: 环境变量名称
|
|
21
|
+
default: 默认值
|
|
22
|
+
var_type: 变量类型 (str, int, float, bool)
|
|
23
|
+
|
|
24
|
+
Returns:
|
|
25
|
+
环境变量值或默认值
|
|
26
|
+
"""
|
|
27
|
+
value = os.getenv(var_name)
|
|
28
|
+
if value is None:
|
|
29
|
+
return default
|
|
30
|
+
|
|
31
|
+
try:
|
|
32
|
+
if var_type == bool:
|
|
33
|
+
return value.lower() in ('1', 'true', 'yes', 'on')
|
|
34
|
+
elif var_type == int:
|
|
35
|
+
return int(value)
|
|
36
|
+
elif var_type == float:
|
|
37
|
+
return float(value)
|
|
38
|
+
else:
|
|
39
|
+
return value
|
|
40
|
+
except (ValueError, TypeError):
|
|
41
|
+
return default
|
|
42
|
+
|
|
43
|
+
@staticmethod
|
|
44
|
+
def get_redis_config() -> dict:
|
|
45
|
+
"""
|
|
46
|
+
获取 Redis 配置
|
|
47
|
+
|
|
48
|
+
Returns:
|
|
49
|
+
Redis 配置字典
|
|
50
|
+
"""
|
|
51
|
+
return {
|
|
52
|
+
'REDIS_HOST': EnvConfigManager.get_env_var('REDIS_HOST', '127.0.0.1', str),
|
|
53
|
+
'REDIS_PORT': EnvConfigManager.get_env_var('REDIS_PORT', 6379, int),
|
|
54
|
+
'REDIS_PASSWORD': EnvConfigManager.get_env_var('REDIS_PASSWORD', '', str),
|
|
55
|
+
'REDIS_DB': EnvConfigManager.get_env_var('REDIS_DB', 0, int),
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
@staticmethod
|
|
59
|
+
def get_runtime_config() -> dict:
|
|
60
|
+
"""
|
|
61
|
+
获取运行时配置
|
|
62
|
+
|
|
63
|
+
Returns:
|
|
64
|
+
运行时配置字典
|
|
65
|
+
"""
|
|
66
|
+
return {
|
|
67
|
+
'CRAWLO_MODE': EnvConfigManager.get_env_var('CRAWLO_MODE', 'standalone', str),
|
|
68
|
+
'PROJECT_NAME': EnvConfigManager.get_env_var('PROJECT_NAME', 'crawlo', str),
|
|
69
|
+
'CONCURRENCY': EnvConfigManager.get_env_var('CONCURRENCY', 8, int),
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
# 便捷函数
|
|
74
|
+
def get_env_var(var_name: str, default: Any = None, var_type: type = str) -> Any:
|
|
75
|
+
"""
|
|
76
|
+
便捷函数:获取环境变量值
|
|
77
|
+
|
|
78
|
+
Args:
|
|
79
|
+
var_name: 环境变量名称
|
|
80
|
+
default: 默认值
|
|
81
|
+
var_type: 变量类型 (str, int, float, bool)
|
|
82
|
+
|
|
83
|
+
Returns:
|
|
84
|
+
环境变量值或默认值
|
|
85
|
+
"""
|
|
86
|
+
return EnvConfigManager.get_env_var(var_name, default, var_type)
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
def get_redis_config() -> dict:
|
|
90
|
+
"""
|
|
91
|
+
便捷函数:获取 Redis 配置
|
|
92
|
+
|
|
93
|
+
Returns:
|
|
94
|
+
Redis 配置字典
|
|
95
|
+
"""
|
|
96
|
+
return EnvConfigManager.get_redis_config()
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
def get_runtime_config() -> dict:
|
|
100
|
+
"""
|
|
101
|
+
便捷函数:获取运行时配置
|
|
102
|
+
|
|
103
|
+
Returns:
|
|
104
|
+
运行时配置字典
|
|
105
|
+
"""
|
|
106
|
+
return EnvConfigManager.get_runtime_config()
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
#!/usr/bin/python
|
|
2
|
+
# -*- coding:UTF-8 -*-
|
|
3
|
+
"""
|
|
4
|
+
统一错误处理工具
|
|
5
|
+
提供一致的错误处理和日志记录机制
|
|
6
|
+
"""
|
|
7
|
+
import traceback
|
|
8
|
+
import logging
|
|
9
|
+
from typing import Optional, Callable, Any
|
|
10
|
+
from functools import wraps
|
|
11
|
+
|
|
12
|
+
from crawlo.utils.log import get_logger
|
|
13
|
+
from crawlo.utils.enhanced_error_handler import EnhancedErrorHandler, ErrorContext
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
class ErrorHandler:
|
|
17
|
+
"""统一错误处理器(简化版,使用增强版作为后端实现)"""
|
|
18
|
+
|
|
19
|
+
def __init__(self, logger_name: str = __name__, log_level: str = 'ERROR'):
|
|
20
|
+
self.logger = get_logger(logger_name, log_level)
|
|
21
|
+
# 使用增强版错误处理器作为后端
|
|
22
|
+
self._enhanced_handler = EnhancedErrorHandler(logger_name, log_level)
|
|
23
|
+
|
|
24
|
+
def handle_error(self, exception: Exception, context: str = "",
|
|
25
|
+
raise_error: bool = True, log_error: bool = True) -> None:
|
|
26
|
+
"""
|
|
27
|
+
统一处理错误
|
|
28
|
+
|
|
29
|
+
Args:
|
|
30
|
+
exception: 异常对象
|
|
31
|
+
context: 错误上下文描述
|
|
32
|
+
raise_error: 是否重新抛出异常
|
|
33
|
+
log_error: 是否记录错误日志
|
|
34
|
+
"""
|
|
35
|
+
# 转换为增强版错误上下文
|
|
36
|
+
error_context = ErrorContext(context=context) if context else None
|
|
37
|
+
self._enhanced_handler.handle_error(
|
|
38
|
+
exception, context=error_context,
|
|
39
|
+
raise_error=raise_error, log_error=log_error
|
|
40
|
+
)
|
|
41
|
+
|
|
42
|
+
def safe_call(self, func: Callable, *args, default_return=None,
|
|
43
|
+
context: str = "", **kwargs) -> Any:
|
|
44
|
+
"""
|
|
45
|
+
安全调用函数,捕获并处理异常
|
|
46
|
+
|
|
47
|
+
Args:
|
|
48
|
+
func: 要调用的函数
|
|
49
|
+
*args: 函数参数
|
|
50
|
+
default_return: 默认返回值
|
|
51
|
+
context: 错误上下文描述
|
|
52
|
+
**kwargs: 函数关键字参数
|
|
53
|
+
|
|
54
|
+
Returns:
|
|
55
|
+
函数返回值或默认值
|
|
56
|
+
"""
|
|
57
|
+
error_context = ErrorContext(context=context) if context else None
|
|
58
|
+
return self._enhanced_handler.safe_call(
|
|
59
|
+
func, *args, default_return=default_return,
|
|
60
|
+
context=error_context, **kwargs
|
|
61
|
+
)
|
|
62
|
+
|
|
63
|
+
def retry_on_failure(self, max_retries: int = 3, delay: float = 1.0,
|
|
64
|
+
exceptions: tuple = (Exception,)):
|
|
65
|
+
"""
|
|
66
|
+
装饰器:失败时重试
|
|
67
|
+
|
|
68
|
+
Args:
|
|
69
|
+
max_retries: 最大重试次数
|
|
70
|
+
delay: 重试间隔(秒)
|
|
71
|
+
exceptions: 需要重试的异常类型
|
|
72
|
+
"""
|
|
73
|
+
def decorator(func):
|
|
74
|
+
# 直接使用增强版处理器的重试装饰器
|
|
75
|
+
return self._enhanced_handler.retry_on_failure(
|
|
76
|
+
max_retries=max_retries, delay=delay, exceptions=exceptions
|
|
77
|
+
)(func)
|
|
78
|
+
return decorator
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
# 全局错误处理器实例
|
|
82
|
+
default_error_handler = ErrorHandler()
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
def handle_exception(context: str = "", raise_error: bool = True, log_error: bool = True):
|
|
86
|
+
"""
|
|
87
|
+
装饰器:处理函数异常
|
|
88
|
+
|
|
89
|
+
Args:
|
|
90
|
+
context: 错误上下文描述
|
|
91
|
+
raise_error: 是否重新抛出异常
|
|
92
|
+
log_error: 是否记录错误日志
|
|
93
|
+
"""
|
|
94
|
+
def decorator(func):
|
|
95
|
+
@wraps(func)
|
|
96
|
+
async def async_wrapper(*args, **kwargs):
|
|
97
|
+
try:
|
|
98
|
+
return await func(*args, **kwargs)
|
|
99
|
+
except Exception as e:
|
|
100
|
+
default_error_handler.handle_error(
|
|
101
|
+
e, context=f"{context} - {func.__name__}",
|
|
102
|
+
raise_error=raise_error, log_error=log_error
|
|
103
|
+
)
|
|
104
|
+
if not raise_error:
|
|
105
|
+
return None
|
|
106
|
+
|
|
107
|
+
@wraps(func)
|
|
108
|
+
def sync_wrapper(*args, **kwargs):
|
|
109
|
+
try:
|
|
110
|
+
return func(*args, **kwargs)
|
|
111
|
+
except Exception as e:
|
|
112
|
+
default_error_handler.handle_error(
|
|
113
|
+
e, context=f"{context} - {func.__name__}",
|
|
114
|
+
raise_error=raise_error, log_error=log_error
|
|
115
|
+
)
|
|
116
|
+
if not raise_error:
|
|
117
|
+
return None
|
|
118
|
+
|
|
119
|
+
# 根据函数是否为异步函数返回相应的包装器
|
|
120
|
+
import inspect
|
|
121
|
+
if inspect.iscoroutinefunction(func):
|
|
122
|
+
return async_wrapper
|
|
123
|
+
else:
|
|
124
|
+
return sync_wrapper
|
|
125
|
+
|
|
126
|
+
return decorator
|