crawlo 1.4.6__py3-none-any.whl → 1.4.8__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 (162) hide show
  1. crawlo/__init__.py +2 -1
  2. crawlo/__version__.py +1 -1
  3. crawlo/cli.py +2 -2
  4. crawlo/commands/check.py +1 -1
  5. crawlo/commands/help.py +5 -3
  6. crawlo/commands/list.py +1 -1
  7. crawlo/commands/run.py +49 -11
  8. crawlo/commands/stats.py +1 -1
  9. crawlo/config.py +12 -4
  10. crawlo/config_validator.py +1 -1
  11. crawlo/core/engine.py +20 -7
  12. crawlo/core/processor.py +1 -1
  13. crawlo/core/scheduler.py +4 -5
  14. crawlo/crawler.py +51 -10
  15. crawlo/downloader/__init__.py +7 -3
  16. crawlo/downloader/aiohttp_downloader.py +18 -18
  17. crawlo/downloader/cffi_downloader.py +5 -2
  18. crawlo/downloader/httpx_downloader.py +9 -3
  19. crawlo/downloader/hybrid_downloader.py +2 -2
  20. crawlo/downloader/playwright_downloader.py +38 -15
  21. crawlo/downloader/selenium_downloader.py +16 -2
  22. crawlo/event.py +42 -8
  23. crawlo/exceptions.py +157 -24
  24. crawlo/extension/__init__.py +10 -9
  25. crawlo/extension/health_check.py +7 -7
  26. crawlo/extension/log_interval.py +6 -6
  27. crawlo/extension/log_stats.py +2 -2
  28. crawlo/extension/logging_extension.py +4 -12
  29. crawlo/extension/memory_monitor.py +5 -5
  30. crawlo/extension/performance_profiler.py +5 -5
  31. crawlo/extension/request_recorder.py +6 -6
  32. crawlo/factories/base.py +1 -1
  33. crawlo/factories/crawler.py +61 -60
  34. crawlo/factories/utils.py +135 -0
  35. crawlo/filters/__init__.py +19 -2
  36. crawlo/filters/aioredis_filter.py +133 -49
  37. crawlo/filters/memory_filter.py +6 -21
  38. crawlo/framework.py +22 -8
  39. crawlo/initialization/built_in.py +24 -67
  40. crawlo/initialization/core.py +65 -19
  41. crawlo/initialization/phases.py +83 -2
  42. crawlo/initialization/registry.py +5 -7
  43. crawlo/initialization/utils.py +49 -0
  44. crawlo/logging/__init__.py +6 -10
  45. crawlo/logging/config.py +106 -22
  46. crawlo/logging/factory.py +12 -8
  47. crawlo/logging/manager.py +19 -27
  48. crawlo/middleware/__init__.py +72 -9
  49. crawlo/middleware/default_header.py +2 -2
  50. crawlo/middleware/download_delay.py +2 -2
  51. crawlo/middleware/middleware_manager.py +6 -6
  52. crawlo/middleware/offsite.py +2 -2
  53. crawlo/middleware/proxy.py +2 -2
  54. crawlo/middleware/request_ignore.py +4 -4
  55. crawlo/middleware/response_code.py +2 -2
  56. crawlo/middleware/response_filter.py +2 -2
  57. crawlo/middleware/retry.py +1 -1
  58. crawlo/mode_manager.py +38 -4
  59. crawlo/network/request.py +54 -26
  60. crawlo/network/response.py +69 -135
  61. crawlo/pipelines/__init__.py +40 -9
  62. crawlo/pipelines/base_pipeline.py +452 -0
  63. crawlo/pipelines/bloom_dedup_pipeline.py +4 -5
  64. crawlo/pipelines/console_pipeline.py +2 -2
  65. crawlo/pipelines/csv_pipeline.py +4 -4
  66. crawlo/pipelines/database_dedup_pipeline.py +4 -5
  67. crawlo/pipelines/json_pipeline.py +4 -4
  68. crawlo/pipelines/memory_dedup_pipeline.py +4 -5
  69. crawlo/pipelines/mongo_pipeline.py +23 -14
  70. crawlo/pipelines/mysql_pipeline.py +31 -39
  71. crawlo/pipelines/pipeline_manager.py +8 -8
  72. crawlo/pipelines/redis_dedup_pipeline.py +13 -14
  73. crawlo/project.py +1 -1
  74. crawlo/queue/__init__.py +10 -0
  75. crawlo/queue/queue_manager.py +79 -13
  76. crawlo/queue/redis_priority_queue.py +196 -47
  77. crawlo/settings/default_settings.py +16 -6
  78. crawlo/spider/__init__.py +6 -5
  79. crawlo/stats_collector.py +2 -2
  80. crawlo/task_manager.py +1 -1
  81. crawlo/templates/crawlo.cfg.tmpl +3 -3
  82. crawlo/templates/project/__init__.py.tmpl +1 -3
  83. crawlo/templates/project/items.py.tmpl +2 -6
  84. crawlo/templates/project/middlewares.py.tmpl +1 -1
  85. crawlo/templates/project/pipelines.py.tmpl +1 -2
  86. crawlo/templates/project/settings.py.tmpl +12 -10
  87. crawlo/templates/project/settings_distributed.py.tmpl +14 -13
  88. crawlo/templates/project/settings_gentle.py.tmpl +21 -23
  89. crawlo/templates/project/settings_high_performance.py.tmpl +21 -23
  90. crawlo/templates/project/settings_minimal.py.tmpl +10 -8
  91. crawlo/templates/project/settings_simple.py.tmpl +21 -23
  92. crawlo/templates/run.py.tmpl +1 -1
  93. crawlo/templates/spider/spider.py.tmpl +4 -12
  94. crawlo/templates/spiders_init.py.tmpl +3 -8
  95. crawlo/tools/__init__.py +0 -103
  96. crawlo/tools/scenario_adapter.py +1 -1
  97. crawlo/utils/__init__.py +25 -1
  98. crawlo/utils/batch_processor.py +23 -6
  99. crawlo/utils/config_manager.py +442 -0
  100. crawlo/utils/controlled_spider_mixin.py +1 -1
  101. crawlo/utils/db_helper.py +1 -1
  102. crawlo/utils/encoding_helper.py +190 -0
  103. crawlo/utils/error_handler.py +2 -2
  104. crawlo/utils/large_scale_helper.py +1 -1
  105. crawlo/utils/leak_detector.py +335 -0
  106. crawlo/utils/mongo_connection_pool.py +157 -0
  107. crawlo/utils/mysql_connection_pool.py +197 -0
  108. crawlo/utils/performance_monitor.py +1 -1
  109. crawlo/utils/redis_checker.py +91 -0
  110. crawlo/utils/redis_connection_pool.py +260 -70
  111. crawlo/utils/redis_key_validator.py +1 -1
  112. crawlo/utils/request.py +24 -2
  113. crawlo/utils/request_serializer.py +1 -1
  114. crawlo/utils/resource_manager.py +337 -0
  115. crawlo/utils/response_helper.py +113 -0
  116. crawlo/utils/selector_helper.py +3 -2
  117. crawlo/utils/singleton.py +70 -0
  118. crawlo/utils/spider_loader.py +1 -1
  119. crawlo/utils/text_helper.py +1 -1
  120. crawlo-1.4.8.dist-info/METADATA +831 -0
  121. {crawlo-1.4.6.dist-info → crawlo-1.4.8.dist-info}/RECORD +131 -145
  122. tests/advanced_tools_example.py +10 -68
  123. tests/distributed_dedup_test.py +467 -0
  124. tests/monitor_redis_dedup.sh +72 -0
  125. tests/ofweek_scrapy/ofweek_scrapy/spiders/__init__.py +4 -4
  126. tests/simple_cli_test.py +55 -0
  127. tests/test_cli_arguments.py +119 -0
  128. tests/test_dedup_fix.py +10 -10
  129. crawlo/logging/async_handler.py +0 -181
  130. crawlo/logging/monitor.py +0 -153
  131. crawlo/logging/sampler.py +0 -167
  132. crawlo/tools/authenticated_proxy.py +0 -241
  133. crawlo/tools/data_formatter.py +0 -226
  134. crawlo/tools/data_validator.py +0 -181
  135. crawlo/tools/encoding_converter.py +0 -127
  136. crawlo/tools/network_diagnostic.py +0 -365
  137. crawlo/tools/request_tools.py +0 -83
  138. crawlo/tools/retry_mechanism.py +0 -224
  139. crawlo/utils/env_config.py +0 -143
  140. crawlo/utils/large_scale_config.py +0 -287
  141. crawlo/utils/log.py +0 -80
  142. crawlo/utils/system.py +0 -11
  143. crawlo/utils/tools.py +0 -5
  144. crawlo/utils/url.py +0 -40
  145. crawlo-1.4.6.dist-info/METADATA +0 -329
  146. tests/env_config_example.py +0 -134
  147. tests/ofweek_scrapy/ofweek_scrapy/spiders/ofweek_spider.py +0 -162
  148. tests/test_authenticated_proxy.py +0 -142
  149. tests/test_comprehensive.py +0 -147
  150. tests/test_dynamic_downloaders_proxy.py +0 -125
  151. tests/test_dynamic_proxy.py +0 -93
  152. tests/test_dynamic_proxy_config.py +0 -147
  153. tests/test_dynamic_proxy_real.py +0 -110
  154. tests/test_env_config.py +0 -122
  155. tests/test_framework_env_usage.py +0 -104
  156. tests/test_large_scale_config.py +0 -113
  157. tests/test_proxy_api.py +0 -265
  158. tests/test_real_scenario_proxy.py +0 -196
  159. tests/tools_example.py +0 -261
  160. {crawlo-1.4.6.dist-info → crawlo-1.4.8.dist-info}/WHEEL +0 -0
  161. {crawlo-1.4.6.dist-info → crawlo-1.4.8.dist-info}/entry_points.txt +0 -0
  162. {crawlo-1.4.6.dist-info → crawlo-1.4.8.dist-info}/top_level.txt +0 -0
@@ -1,127 +0,0 @@
1
- #!/usr/bin/python
2
- # -*- coding: UTF-8 -*-
3
- """
4
- # @Time : 2025-09-10 22:00
5
- # @Author : crawl-coder
6
- # @Desc : 编码转换工具
7
- """
8
- try:
9
- import chardet
10
-
11
- HAS_CHARDET = True
12
- except ImportError:
13
- HAS_CHARDET = False
14
- from typing import Optional, Union
15
-
16
-
17
- class EncodingConverter:
18
- """
19
- 编码转换工具类,提供各种编码转换功能。
20
- 特别适用于爬虫中处理不同编码的网页内容。
21
- """
22
-
23
- @staticmethod
24
- def detect_encoding(data: Union[str, bytes]) -> Optional[str]:
25
- """
26
- 检测数据编码
27
-
28
- :param data: 数据(字符串或字节)
29
- :return: 检测到的编码
30
- """
31
- if isinstance(data, str):
32
- # 如果是字符串,直接返回
33
- return 'utf-8'
34
-
35
- if not isinstance(data, bytes):
36
- return None
37
-
38
- if HAS_CHARDET:
39
- try:
40
- # 使用chardet检测编码
41
- result = chardet.detect(data)
42
- return result['encoding']
43
- except Exception:
44
- return None
45
- else:
46
- # 如果没有chardet,返回None
47
- return None
48
-
49
- @staticmethod
50
- def to_utf8(data: Union[str, bytes], source_encoding: Optional[str] = None) -> Optional[str]:
51
- """
52
- 转换为UTF-8编码的字符串
53
-
54
- :param data: 数据(字符串或字节)
55
- :param source_encoding: 源编码(如果为None则自动检测)
56
- :return: UTF-8编码的字符串
57
- """
58
- if isinstance(data, str):
59
- # 如果已经是字符串,假设它已经是UTF-8
60
- return data
61
-
62
- if not isinstance(data, bytes):
63
- return None
64
-
65
- try:
66
- if source_encoding is None:
67
- # 自动检测编码
68
- source_encoding = EncodingConverter.detect_encoding(data)
69
- if source_encoding is None:
70
- # 如果检测失败,尝试常见编码
71
- for encoding in ['utf-8', 'gbk', 'gb2312', 'latin1']:
72
- try:
73
- decoded = data.decode(encoding)
74
- return decoded
75
- except UnicodeDecodeError:
76
- continue
77
- return None
78
- else:
79
- # 使用指定编码
80
- return data.decode(source_encoding)
81
-
82
- # 使用检测到的编码解码
83
- return data.decode(source_encoding)
84
- except Exception:
85
- return None
86
-
87
- @staticmethod
88
- def convert_encoding(data: Union[str, bytes],
89
- source_encoding: Optional[str] = None,
90
- target_encoding: str = 'utf-8') -> Optional[bytes]:
91
- """
92
- 编码转换
93
-
94
- :param data: 数据(字符串或字节)
95
- :param source_encoding: 源编码(如果为None则自动检测)
96
- :param target_encoding: 目标编码
97
- :return: 转换后的字节数据
98
- """
99
- # 先转换为UTF-8字符串
100
- utf8_str = EncodingConverter.to_utf8(data, source_encoding)
101
- if utf8_str is None:
102
- return None
103
-
104
- try:
105
- # 再转换为目标编码
106
- return utf8_str.encode(target_encoding)
107
- except Exception:
108
- return None
109
-
110
-
111
- # =======================对外接口=======================
112
-
113
- def detect_encoding(data: Union[str, bytes]) -> Optional[str]:
114
- """检测数据编码"""
115
- return EncodingConverter.detect_encoding(data)
116
-
117
-
118
- def to_utf8(data: Union[str, bytes], source_encoding: Optional[str] = None) -> Optional[str]:
119
- """转换为UTF-8编码的字符串"""
120
- return EncodingConverter.to_utf8(data, source_encoding)
121
-
122
-
123
- def convert_encoding(data: Union[str, bytes],
124
- source_encoding: Optional[str] = None,
125
- target_encoding: str = 'utf-8') -> Optional[bytes]:
126
- """编码转换"""
127
- return EncodingConverter.convert_encoding(data, source_encoding, target_encoding)
@@ -1,365 +0,0 @@
1
- #!/usr/bin/python
2
- # -*- coding: UTF-8 -*-
3
- """
4
- 网络诊断工具
5
- 提供网络连接问题的诊断和解决方案
6
- """
7
-
8
- import asyncio
9
- import socket
10
- import time
11
- from typing import Dict, List, Optional, Tuple
12
- from urllib.parse import urlparse
13
-
14
- import aiohttp
15
- from crawlo.utils.log import get_logger
16
-
17
-
18
- class NetworkDiagnostic:
19
- """网络诊断工具类"""
20
-
21
- def __init__(self):
22
- self.logger = get_logger(self.__class__.__name__)
23
- self._dns_cache: Dict[str, str] = {}
24
-
25
- async def diagnose_url(self, url: str) -> Dict[str, any]:
26
- """
27
- 诊断URL的网络连接问题
28
-
29
- Args:
30
- url: 要诊断的URL
31
-
32
- Returns:
33
- 诊断结果字典
34
- """
35
- parsed = urlparse(url)
36
- hostname = parsed.hostname
37
- port = parsed.port or (443 if parsed.scheme == 'https' else 80)
38
-
39
- result = {
40
- 'url': url,
41
- 'hostname': hostname,
42
- 'port': port,
43
- 'dns_resolution': None,
44
- 'tcp_connection': None,
45
- 'http_response': None,
46
- 'recommendations': []
47
- }
48
-
49
- # DNS解析测试
50
- dns_result = await self._test_dns_resolution(hostname)
51
- result['dns_resolution'] = dns_result
52
-
53
- if dns_result['success']:
54
- # TCP连接测试
55
- tcp_result = await self._test_tcp_connection(hostname, port)
56
- result['tcp_connection'] = tcp_result
57
-
58
- if tcp_result['success']:
59
- # HTTP响应测试
60
- http_result = await self._test_http_response(url)
61
- result['http_response'] = http_result
62
-
63
- # 生成建议
64
- result['recommendations'] = self._generate_recommendations(result)
65
-
66
- return result
67
-
68
- async def _test_dns_resolution(self, hostname: str) -> Dict[str, any]:
69
- """测试DNS解析"""
70
- try:
71
- start_time = time.time()
72
-
73
- # 使用asyncio的DNS解析
74
- loop = asyncio.get_event_loop()
75
- addr_info = await loop.getaddrinfo(hostname, None)
76
-
77
- resolution_time = time.time() - start_time
78
- ip_addresses = list(set([addr[4][0] for addr in addr_info]))
79
-
80
- # 缓存DNS结果
81
- if ip_addresses:
82
- self._dns_cache[hostname] = ip_addresses[0]
83
-
84
- return {
85
- 'success': True,
86
- 'ip_addresses': ip_addresses,
87
- 'resolution_time': resolution_time,
88
- 'error': None
89
- }
90
-
91
- except socket.gaierror as e:
92
- return {
93
- 'success': False,
94
- 'ip_addresses': [],
95
- 'resolution_time': None,
96
- 'error': {
97
- 'type': 'DNSError',
98
- 'code': e.errno,
99
- 'message': str(e)
100
- }
101
- }
102
- except Exception as e:
103
- return {
104
- 'success': False,
105
- 'ip_addresses': [],
106
- 'resolution_time': None,
107
- 'error': {
108
- 'type': type(e).__name__,
109
- 'message': str(e)
110
- }
111
- }
112
-
113
- async def _test_tcp_connection(self, hostname: str, port: int) -> Dict[str, any]:
114
- """测试TCP连接"""
115
- try:
116
- start_time = time.time()
117
-
118
- # 尝试TCP连接
119
- reader, writer = await asyncio.wait_for(
120
- asyncio.open_connection(hostname, port),
121
- timeout=10.0
122
- )
123
-
124
- connection_time = time.time() - start_time
125
-
126
- # 关闭连接
127
- writer.close()
128
- await writer.wait_closed()
129
-
130
- return {
131
- 'success': True,
132
- 'connection_time': connection_time,
133
- 'error': None
134
- }
135
-
136
- except asyncio.TimeoutError:
137
- return {
138
- 'success': False,
139
- 'connection_time': None,
140
- 'error': {
141
- 'type': 'TimeoutError',
142
- 'message': 'Connection timeout'
143
- }
144
- }
145
- except Exception as e:
146
- return {
147
- 'success': False,
148
- 'connection_time': None,
149
- 'error': {
150
- 'type': type(e).__name__,
151
- 'message': str(e)
152
- }
153
- }
154
-
155
- async def _test_http_response(self, url: str) -> Dict[str, any]:
156
- """测试HTTP响应"""
157
- try:
158
- start_time = time.time()
159
-
160
- timeout = aiohttp.ClientTimeout(total=30, connect=10)
161
- async with aiohttp.ClientSession(timeout=timeout) as session:
162
- async with session.get(url) as response:
163
- response_time = time.time() - start_time
164
-
165
- return {
166
- 'success': True,
167
- 'url': url,
168
- 'status_code': response.status_code, # 修复:使用status_code而不是status
169
- 'response_time': response_time,
170
- 'content_length': len(response.body) if response.body else 0,
171
- 'headers': dict(response.headers)
172
- }
173
-
174
- except aiohttp.ClientError as e:
175
- return {
176
- 'success': False,
177
- 'status_code': None,
178
- 'response_time': None,
179
- 'headers': {},
180
- 'error': {
181
- 'type': type(e).__name__,
182
- 'message': str(e)
183
- }
184
- }
185
- except Exception as e:
186
- return {
187
- 'success': False,
188
- 'status_code': None,
189
- 'response_time': None,
190
- 'headers': {},
191
- 'error': {
192
- 'type': type(e).__name__,
193
- 'message': str(e)
194
- }
195
- }
196
-
197
- def _generate_recommendations(self, result: Dict[str, any]) -> List[str]:
198
- """根据诊断结果生成建议"""
199
- recommendations = []
200
-
201
- dns_result = result.get('dns_resolution', {})
202
- tcp_result = result.get('tcp_connection', {})
203
- http_result = result.get('http_response', {})
204
-
205
- # DNS问题建议
206
- if not dns_result.get('success'):
207
- error = dns_result.get('error', {})
208
- if error.get('code') == 8: # nodename nor servname provided, or not known
209
- recommendations.extend([
210
- "DNS解析失败 - 检查域名是否正确",
211
- "检查网络连接是否正常",
212
- "尝试使用不同的DNS服务器(如8.8.8.8或1.1.1.1)",
213
- "检查本地hosts文件是否有相关配置",
214
- "确认域名是否可以从外部访问"
215
- ])
216
- elif error.get('code') == 2: # Name or service not known
217
- recommendations.extend([
218
- "域名不存在或无法解析",
219
- "检查域名拼写是否正确",
220
- "确认域名是否已注册且配置了DNS记录"
221
- ])
222
-
223
- # TCP连接问题建议
224
- elif not tcp_result.get('success'):
225
- error = tcp_result.get('error', {})
226
- if error.get('type') == 'TimeoutError':
227
- recommendations.extend([
228
- "TCP连接超时 - 服务器可能无响应",
229
- "检查防火墙设置是否阻止了连接",
230
- "尝试增加连接超时时间",
231
- "检查代理设置"
232
- ])
233
-
234
- # HTTP问题建议
235
- elif not http_result.get('success'):
236
- error = http_result.get('error', {})
237
- recommendations.extend([
238
- f"HTTP请求失败: {error.get('message', 'Unknown error')}",
239
- "检查URL是否正确",
240
- "确认服务器是否正常运行"
241
- ])
242
-
243
- # 性能建议
244
- if dns_result.get('success') and dns_result.get('resolution_time', 0) > 1.0:
245
- recommendations.append("DNS解析时间较长,考虑使用DNS缓存或更快的DNS服务器")
246
-
247
- if tcp_result.get('success') and tcp_result.get('connection_time', 0) > 2.0:
248
- recommendations.append("TCP连接时间较长,可能存在网络延迟问题")
249
-
250
- if http_result.get('success') and http_result.get('response_time', 0) > 5.0:
251
- recommendations.append("HTTP响应时间较长,服务器可能负载较高")
252
-
253
- return recommendations
254
-
255
- async def batch_diagnose(self, urls: List[str]) -> Dict[str, Dict[str, any]]:
256
- """批量诊断多个URL"""
257
- tasks = []
258
- for url in urls:
259
- task = asyncio.create_task(self.diagnose_url(url))
260
- tasks.append((url, task))
261
-
262
- results = {}
263
- for url, task in tasks:
264
- try:
265
- result = await task
266
- results[url] = result
267
- except Exception as e:
268
- results[url] = {
269
- 'url': url,
270
- 'error': f"诊断过程出错: {e}",
271
- 'recommendations': ["诊断工具本身出现问题,请检查网络环境"]
272
- }
273
-
274
- return results
275
-
276
- def format_diagnostic_report(self, result: Dict[str, any]) -> str:
277
- """格式化诊断报告"""
278
- lines = [
279
- f"=== 网络诊断报告 ===",
280
- f"URL: {result['url']}",
281
- f"主机: {result['hostname']}:{result['port']}",
282
- ""
283
- ]
284
-
285
- # DNS解析结果
286
- dns = result.get('dns_resolution', {})
287
- if dns.get('success'):
288
- lines.extend([
289
- "✅ DNS解析: 成功",
290
- f" IP地址: {', '.join(dns['ip_addresses'])}",
291
- f" 解析时间: {dns['resolution_time']:.3f}秒"
292
- ])
293
- else:
294
- error = dns.get('error', {})
295
- lines.extend([
296
- "❌ DNS解析: 失败",
297
- f" 错误类型: {error.get('type', 'Unknown')}",
298
- f" 错误信息: {error.get('message', 'Unknown error')}"
299
- ])
300
-
301
- lines.append("")
302
-
303
- # TCP连接结果
304
- tcp = result.get('tcp_connection', {})
305
- if tcp and tcp.get('success'):
306
- lines.extend([
307
- "✅ TCP连接: 成功",
308
- f" 连接时间: {tcp['connection_time']:.3f}秒"
309
- ])
310
- elif tcp:
311
- error = tcp.get('error', {})
312
- lines.extend([
313
- "❌ TCP连接: 失败",
314
- f" 错误类型: {error.get('type', 'Unknown')}",
315
- f" 错误信息: {error.get('message', 'Unknown error')}"
316
- ])
317
-
318
- lines.append("")
319
-
320
- # HTTP响应结果
321
- http = result.get('http_response', {})
322
- if http and http.get('success'):
323
- lines.extend([
324
- "✅ HTTP响应: 成功",
325
- f" 状态码: {http['status_code']}",
326
- f" 响应时间: {http['response_time']:.3f}秒"
327
- ])
328
- elif http:
329
- error = http.get('error', {})
330
- lines.extend([
331
- "❌ HTTP响应: 失败",
332
- f" 错误类型: {error.get('type', 'Unknown')}",
333
- f" 错误信息: {error.get('message', 'Unknown error')}"
334
- ])
335
-
336
- # 建议
337
- recommendations = result.get('recommendations', [])
338
- if recommendations:
339
- lines.extend([
340
- "",
341
- "🔧 建议:",
342
- ])
343
- for i, rec in enumerate(recommendations, 1):
344
- lines.append(f" {i}. {rec}")
345
-
346
- return "\n".join(lines)
347
-
348
-
349
- # 便捷函数
350
- async def diagnose_url(url: str) -> Dict[str, any]:
351
- """诊断单个URL的网络问题"""
352
- diagnostic = NetworkDiagnostic()
353
- return await diagnostic.diagnose_url(url)
354
-
355
-
356
- async def diagnose_urls(urls: List[str]) -> Dict[str, Dict[str, any]]:
357
- """批量诊断URL的网络问题"""
358
- diagnostic = NetworkDiagnostic()
359
- return await diagnostic.batch_diagnose(urls)
360
-
361
-
362
- def format_report(result: Dict[str, any]) -> str:
363
- """格式化诊断报告"""
364
- diagnostic = NetworkDiagnostic()
365
- return diagnostic.format_diagnostic_report(result)
@@ -1,83 +0,0 @@
1
- #!/usr/bin/python
2
- # -*- coding: UTF-8 -*-
3
- """
4
- # @Time : 2025-09-20 10:00
5
- # @Author : crawl-coder
6
- # @Desc : 请求处理工具
7
- """
8
- from typing import Dict, Any, Optional
9
- from urllib.parse import urlparse, parse_qs, urlencode, urlunparse
10
- from copy import deepcopy
11
-
12
-
13
- def build_url(base_url: str, path: str = "", query_params: Optional[Dict[str, Any]] = None) -> str:
14
- """
15
- 构建完整的URL
16
-
17
- :param base_url: 基础URL
18
- :param path: 路径
19
- :param query_params: 查询参数字典
20
- :return: 完整的URL
21
- """
22
- # 解析基础URL
23
- parsed = urlparse(base_url)
24
-
25
- # 合并路径
26
- if path:
27
- # 确保路径以/开头
28
- if not path.startswith('/'):
29
- path = '/' + path
30
- # 合并路径
31
- new_path = parsed.path.rstrip('/') + path
32
- else:
33
- new_path = parsed.path
34
-
35
- # 处理查询参数
36
- if query_params:
37
- # 解析现有查询参数
38
- existing_params = parse_qs(parsed.query)
39
- # 合并新参数
40
- for key, value in query_params.items():
41
- existing_params[key] = [str(value)]
42
- # 编码查询参数
43
- new_query = urlencode(existing_params, doseq=True)
44
- else:
45
- new_query = parsed.query
46
-
47
- # 构建新的URL
48
- new_parsed = parsed._replace(path=new_path, query=new_query)
49
- return urlunparse(new_parsed)
50
-
51
-
52
- def add_query_params(url: str, params: Dict[str, Any]) -> str:
53
- """
54
- 向URL添加查询参数
55
-
56
- :param url: 原始URL
57
- :param params: 要添加的参数字典
58
- :return: 添加参数后的URL
59
- """
60
- parsed = urlparse(url)
61
- # 解析现有查询参数
62
- existing_params = parse_qs(parsed.query)
63
- # 添加新参数
64
- for key, value in params.items():
65
- existing_params[key] = [str(value)]
66
- # 编码查询参数
67
- new_query = urlencode(existing_params, doseq=True)
68
- # 构建新的URL
69
- new_parsed = parsed._replace(query=new_query)
70
- return urlunparse(new_parsed)
71
-
72
-
73
- def merge_headers(base_headers: Dict[str, str], additional_headers: Dict[str, str]) -> Dict[str, str]:
74
- """
75
- 合并请求头
76
-
77
- :param base_headers: 基础请求头
78
- :param additional_headers: 要添加的请求头
79
- :return: 合并后的请求头
80
- """
81
- merged = deepcopy(base_headers)
82
- merged.update(additional_headers)
83
- return merged