crawlo 1.1.5__py3-none-any.whl → 1.1.6__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/__version__.py +1 -1
- crawlo/commands/run.py +7 -0
- crawlo/commands/startproject.py +134 -15
- crawlo/config.py +3 -0
- crawlo/core/engine.py +1 -1
- crawlo/filters/aioredis_filter.py +4 -3
- crawlo/mode_manager.py +9 -3
- crawlo/pipelines/pipeline_manager.py +11 -6
- crawlo/pipelines/redis_dedup_pipeline.py +3 -2
- crawlo/project.py +38 -3
- crawlo/queue/queue_manager.py +15 -1
- crawlo/queue/redis_priority_queue.py +37 -15
- crawlo/settings/default_settings.py +3 -0
- crawlo/settings/setting_manager.py +24 -1
- {crawlo-1.1.5.dist-info → crawlo-1.1.6.dist-info}/METADATA +1 -1
- {crawlo-1.1.5.dist-info → crawlo-1.1.6.dist-info}/RECORD +23 -19
- tests/DOUBLE_CRAWLO_PREFIX_FIX_REPORT.md +82 -0
- tests/test_double_crawlo_fix.py +208 -0
- tests/test_double_crawlo_fix_simple.py +125 -0
- tests/test_queue_manager_double_crawlo.py +231 -0
- {crawlo-1.1.5.dist-info → crawlo-1.1.6.dist-info}/WHEEL +0 -0
- {crawlo-1.1.5.dist-info → crawlo-1.1.6.dist-info}/entry_points.txt +0 -0
- {crawlo-1.1.5.dist-info → crawlo-1.1.6.dist-info}/top_level.txt +0 -0
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
crawlo/__init__.py,sha256=jSOsZbDJ_Q5wZV8onSXx5LgNM7Z1q3zCROGdImBDr2I,1373
|
|
2
|
-
crawlo/__version__.py,sha256=
|
|
2
|
+
crawlo/__version__.py,sha256=x9FL2OT2SXh3wQnwMN-1smbRacRTCOYcgAuQFQqi_0s,23
|
|
3
3
|
crawlo/cli.py,sha256=hjAJKx9pba375sATvvcy-dtZyBIgXj8fRBq9RFIZHA4,1206
|
|
4
|
-
crawlo/config.py,sha256=
|
|
4
|
+
crawlo/config.py,sha256=_pORwcVEgjEhrqVaApu51X0Il3TBK6w9aezGnnqYu8Y,9847
|
|
5
5
|
crawlo/config_validator.py,sha256=M118EATR-tITzRSe2oSinV5oh2QsooMCkEJ5WS8ma_0,10155
|
|
6
6
|
crawlo/crawler.py,sha256=24EE7zFPByeYLJnf1K_R9fhJMqaFUjBSa6TuUhlY4TI,37398
|
|
7
7
|
crawlo/event.py,sha256=ZhoPW5CglCEuZNFEwviSCBIw0pT5O6jT98bqYrDFd3E,324
|
|
8
8
|
crawlo/exceptions.py,sha256=YVIDnC1bKSMv3fXH_6tinWMuD9HmKHIaUfO4_fkX5sY,1247
|
|
9
|
-
crawlo/mode_manager.py,sha256=
|
|
10
|
-
crawlo/project.py,sha256=
|
|
9
|
+
crawlo/mode_manager.py,sha256=q34nX-bMCLCKFfeYy_34VrBT86sL_K030LlLX2H3m0I,7728
|
|
10
|
+
crawlo/project.py,sha256=MH2OYXIZdc9EJolUpUBXTcAgS7qvPP366LkOy62iP_8,6831
|
|
11
11
|
crawlo/stats_collector.py,sha256=v4jC9BAe-23w93hWzbeMCCgQ9VuFPyxw5JV9ItbGH8w,1636
|
|
12
12
|
crawlo/subscriber.py,sha256=Aj0kPpbBYlzOb1uViDFraoaThsQEVlqOSYUaFT3jSDs,5136
|
|
13
13
|
crawlo/task_manager.py,sha256=PScfEB03306Txa0l38AeQ_0WVhKzeWOFyT3bnrkbHW0,849
|
|
@@ -19,12 +19,12 @@ crawlo/commands/__init__.py,sha256=kZ3qATqDPmMUCNUQSFfBfIA8fp_1dgBwIAWbmFN3_To,3
|
|
|
19
19
|
crawlo/commands/check.py,sha256=jW8SgfkOS35j4VS7nRZBZdFCBX9CVFez5LR2sfP_H1U,23437
|
|
20
20
|
crawlo/commands/genspider.py,sha256=_3GwFMYK79BuKk__5L0ljuwWwOzN80MeuhRkL4Ql11A,5201
|
|
21
21
|
crawlo/commands/list.py,sha256=octTk0QZhapiyM7WgCPersP2v3MesthbJeG9vMqVFOs,5936
|
|
22
|
-
crawlo/commands/run.py,sha256=
|
|
23
|
-
crawlo/commands/startproject.py,sha256=
|
|
22
|
+
crawlo/commands/run.py,sha256=Go9hAEUMuG3GphBgemG5S5W4MF39XOxp7-E06rX-pTU,11043
|
|
23
|
+
crawlo/commands/startproject.py,sha256=UYGelGY4dM6Zu3U4G5m8snKqbsfgszhvfpAJLl5b5tM,15772
|
|
24
24
|
crawlo/commands/stats.py,sha256=iEKdxHoqsJuTkn8zAF9ekBVO1--8__BeD7xohYG5NwE,6252
|
|
25
25
|
crawlo/commands/utils.py,sha256=b7yW6UlOLprR3gN9oOdhcl3fsCwWRE3-_gDxWz5xhMo,5292
|
|
26
26
|
crawlo/core/__init__.py,sha256=JYSAn15r8yWgRK_Nc69t_8tZCyb70MiPZKssA8wrYz0,43
|
|
27
|
-
crawlo/core/engine.py,sha256=
|
|
27
|
+
crawlo/core/engine.py,sha256=B7j88EjqFSy3D1UJENIOKi-j-gWNSxxaOBMC3tQBzK0,13484
|
|
28
28
|
crawlo/core/processor.py,sha256=oHLs-cno0bJGTNc9NGD2S7_2-grI3ruvggO0SY2mf3Q,1180
|
|
29
29
|
crawlo/core/scheduler.py,sha256=CdHeVNJbCzRkivGMCiLpVHttJSEbIz5P6qywXAR_cw4,5089
|
|
30
30
|
crawlo/downloader/__init__.py,sha256=8-r4_Wc_X64FJtKzNQamwsZsc428creKeFo19VxF33o,8565
|
|
@@ -43,7 +43,7 @@ crawlo/extension/memory_monitor.py,sha256=fClPchpCkVjcIiU0AJHCKDd7HEiz5B4KqNqKTR
|
|
|
43
43
|
crawlo/extension/performance_profiler.py,sha256=BjWD3LOb4VwjQJQvQtWNg7GluEwFquI1CztNfgMzy3c,5032
|
|
44
44
|
crawlo/extension/request_recorder.py,sha256=KA_RmcfscDxP5wPdolO76yKfRj-1jmHhG3jkVGO1pbc,4181
|
|
45
45
|
crawlo/filters/__init__.py,sha256=lX-QOCDTiTRFoiK1qrZ5HABo7LgZfcxScx_lELYEvJk,4395
|
|
46
|
-
crawlo/filters/aioredis_filter.py,sha256=
|
|
46
|
+
crawlo/filters/aioredis_filter.py,sha256=oveE9qFRtK8C9FZGRSZusRakXcAF-B2vkwbpsc0fX1E,10308
|
|
47
47
|
crawlo/filters/memory_filter.py,sha256=FzGJPhVKfZ8P23kP6de-VSfE8oVMjjpfWzKJIdiMtZU,9529
|
|
48
48
|
crawlo/items/__init__.py,sha256=rFpx1qFBo0Ik7bSdnXC8EVTJUOQdoJYGVdhYjaH00nk,409
|
|
49
49
|
crawlo/items/base.py,sha256=hwGJEdFWOdaZfalFX8umRkh_HUWLEbCjvq4j70fplMQ,598
|
|
@@ -70,15 +70,15 @@ crawlo/pipelines/json_pipeline.py,sha256=wrCsh8YInmcPLAkhPrHObMx89VZfhf-c7qRrYsT
|
|
|
70
70
|
crawlo/pipelines/memory_dedup_pipeline.py,sha256=oQcBODO-I2p6B7Nm_klXvuhzSMIHP-JWwC4_o6Gkgcc,3954
|
|
71
71
|
crawlo/pipelines/mongo_pipeline.py,sha256=PohTKTGw3QRvuP-T6SrquwW3FAHSno8jQ2D2cH_d75U,5837
|
|
72
72
|
crawlo/pipelines/mysql_pipeline.py,sha256=RRKMuO-7BTomyRFYCmDpfvjBTcU4SGdjGDV4wBeKWck,13796
|
|
73
|
-
crawlo/pipelines/pipeline_manager.py,sha256=
|
|
74
|
-
crawlo/pipelines/redis_dedup_pipeline.py,sha256=
|
|
73
|
+
crawlo/pipelines/pipeline_manager.py,sha256=g7lQBllYpKLymDWShjsR4SsXG41XnzD5mUR0UDBt0ZQ,2419
|
|
74
|
+
crawlo/pipelines/redis_dedup_pipeline.py,sha256=U2mms0XBkTgC8_DywIigGboChjUH_l0-cfo_ioYQNsI,6333
|
|
75
75
|
crawlo/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
76
76
|
crawlo/queue/pqueue.py,sha256=qTFOuvEXsYEZbm0ULjsOeZo0XtSsZ-SHpx7nFEtmluE,1095
|
|
77
|
-
crawlo/queue/queue_manager.py,sha256=
|
|
78
|
-
crawlo/queue/redis_priority_queue.py,sha256=
|
|
77
|
+
crawlo/queue/queue_manager.py,sha256=Rz7QI5KfDesmIHzXPSDsksm6ZcoHiyIQYSLkxi2B6Zg,13264
|
|
78
|
+
crawlo/queue/redis_priority_queue.py,sha256=oVvGjkcMpRqJEEBbRlAL16TKcp38Gg9YMdZCUQa7wFI,13081
|
|
79
79
|
crawlo/settings/__init__.py,sha256=NgYFLfk_Bw7h6KSoepJn_lMBSqVbCHebjKxaE3_eMgw,130
|
|
80
|
-
crawlo/settings/default_settings.py,sha256=
|
|
81
|
-
crawlo/settings/setting_manager.py,sha256=
|
|
80
|
+
crawlo/settings/default_settings.py,sha256=vJ686U69xBkFVYp-I213jB9Z2wQ-fe30Kstm6qQ7aUc,9000
|
|
81
|
+
crawlo/settings/setting_manager.py,sha256=uqgm2uZQp7Wx1hMSf2FnA0dh6f4jzZ13NQbRvIfYwsQ,3829
|
|
82
82
|
crawlo/spider/__init__.py,sha256=xAH6NfE_6K2aY_VSL9DoGjcmMHJDd5Nxr7TG1Y8vQAE,21091
|
|
83
83
|
crawlo/templates/crawlo.cfg.tmpl,sha256=lwiUVe5sFixJgHFEjn1OtbAeyWsECOrz37uheuVtulk,240
|
|
84
84
|
crawlo/templates/project/__init__.py.tmpl,sha256=aQnHaOjMSkTviOC8COUX0fKymuyf8lx2tGduxkMkXEE,61
|
|
@@ -124,6 +124,7 @@ crawlo/utils/system.py,sha256=24zGmtHNhDFMGVo7ftMV-Pqg6_5d63zsyNey9udvJJk,248
|
|
|
124
124
|
crawlo/utils/tools.py,sha256=uy7qw5Z1BIhyEgiHENvtM7WoGCJxlS8EX3PmOA7ouCo,275
|
|
125
125
|
crawlo/utils/url.py,sha256=RKe_iqdjafsNcp-P2GVLYpsL1qbxiuZLiFc-SqOQkcs,1521
|
|
126
126
|
examples/__init__.py,sha256=NkRbV8_S1tb8S2AW6BE2U6P2-eGOPwMR1k0YQAwQpSE,130
|
|
127
|
+
tests/DOUBLE_CRAWLO_PREFIX_FIX_REPORT.md,sha256=4W6HlT9Uc3cyu77T9pfbkrMxpAZ-xq_L9MU-GbukLV0,3427
|
|
127
128
|
tests/__init__.py,sha256=409aRX8hsPffiZCVjOogtxwhACzBp8G2UTJyUQSxhK0,136
|
|
128
129
|
tests/advanced_tools_example.py,sha256=1_iitECKCuWUYMNNGo61l3lmwMRrWdA8F_Xw56UaGZY,9340
|
|
129
130
|
tests/authenticated_proxy_example.py,sha256=b307_RybOtxXVQK0ITboLvHmOTwIN4yTF9aup4dYF7Q,8477
|
|
@@ -144,6 +145,8 @@ tests/test_cleaners.py,sha256=qyd20RNuBHIVHz7X5JjLwlIZedn7yHZ4uB3X78BpaF4,1819
|
|
|
144
145
|
tests/test_comprehensive.py,sha256=dvRJeeVYc1cgXK9Y171hH9Y847zZpWSAFFH-EI3UepQ,5182
|
|
145
146
|
tests/test_config_validator.py,sha256=Ec1h8Mw-fVz1d9JoATIWZb0nTc8pYjhTCSjPm3tvkTQ,6825
|
|
146
147
|
tests/test_date_tools.py,sha256=pcLDyhLrZ_jh-PhPm4CvLZEgNeH9kLMPKN5zacHwuWM,4053
|
|
148
|
+
tests/test_double_crawlo_fix.py,sha256=qkJugMiEM2KQFHZ_Iza7Y0cER8p-Mecr57zjwHdsaSE,8033
|
|
149
|
+
tests/test_double_crawlo_fix_simple.py,sha256=aPQQRex7ShxC_QJyjRkgelbn0Lnl3fFTwsPH5OglpwM,4807
|
|
147
150
|
tests/test_dynamic_downloaders_proxy.py,sha256=t_aWpxOHi4h3_fg2ImtIq7IIJ0r3PTHtnXiopPe2ZlM,4450
|
|
148
151
|
tests/test_dynamic_proxy.py,sha256=zi7Ocbhc9GL1zCs0XhmG2NvBBeIZ2d2hPJVh18lH4Y0,3172
|
|
149
152
|
tests/test_dynamic_proxy_config.py,sha256=C_9CEjCJtrr0SxIXCyLDhSIi88ujF7UAT1F-FAphd0w,5853
|
|
@@ -163,6 +166,7 @@ tests/test_proxy_middleware_integration.py,sha256=mTPK_XvbmLCV_QoVZzA3ybWOOX6149
|
|
|
163
166
|
tests/test_proxy_providers.py,sha256=u_R2fhab90vqvQEaOAztpAOe9tJXvUMIdoDxmStmXJ4,1749
|
|
164
167
|
tests/test_proxy_stats.py,sha256=ES00CEoDITYPFBGPk8pecFzD3ItYIv6NSpcqNd8-kvo,526
|
|
165
168
|
tests/test_proxy_strategies.py,sha256=9Z1pXmTNyw-eIhGXlf2abZbJx6igLohYq-_3hldQ5uE,1868
|
|
169
|
+
tests/test_queue_manager_double_crawlo.py,sha256=ddnj2BafKj6RZjkK4yAhilyuY__xan7fJYfBSBn2W1M,9346
|
|
166
170
|
tests/test_queue_manager_redis_key.py,sha256=tvy3qkmB6XNpnJ4SOgjKvxE83hltCdL5Z32CupQ2VZ0,6454
|
|
167
171
|
tests/test_redis_config.py,sha256=Kbl3PURGNM1BUIspakEOA-ZOl2xxTHb_8KbftwjYOsg,921
|
|
168
172
|
tests/test_redis_connection_pool.py,sha256=wLPmJ94jUajpShNrnnl4pTbX9ZIGqCEZgzzecasAC4s,9471
|
|
@@ -178,8 +182,8 @@ tests/test_template_content.py,sha256=URwjlAzMCdUN0sW_OupUcuSNMxp1OKgW79JOpkLPXn
|
|
|
178
182
|
tests/test_template_redis_key.py,sha256=dOFutic8CL3tOzGbYhWbMrYiXZ8R3fhNoF5VKax5Iy0,4946
|
|
179
183
|
tests/test_tools.py,sha256=fgzXL2L7eBV_nGjeMxH8IMhfc0dviQ80XgzZkJp_4dA,5266
|
|
180
184
|
tests/tools_example.py,sha256=uXNS4xXJ-OD_xInAn2zjKLG_nlbgVGXZLoJtfhaG9lI,7926
|
|
181
|
-
crawlo-1.1.
|
|
182
|
-
crawlo-1.1.
|
|
183
|
-
crawlo-1.1.
|
|
184
|
-
crawlo-1.1.
|
|
185
|
-
crawlo-1.1.
|
|
185
|
+
crawlo-1.1.6.dist-info/METADATA,sha256=ugnlT8bGIkYOf7MIRwgfBpkFoI2KAjFSBgWrxo25ZRU,20068
|
|
186
|
+
crawlo-1.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
187
|
+
crawlo-1.1.6.dist-info/entry_points.txt,sha256=5HoVoTSPxI8SCa5B7pQYxLSrkOdiunyO9tqNsLMv52g,43
|
|
188
|
+
crawlo-1.1.6.dist-info/top_level.txt,sha256=keG_67pbZ_wZL2dmDRA9RMaNHTaV_x_oxZ9DKNgwvR0,22
|
|
189
|
+
crawlo-1.1.6.dist-info/RECORD,,
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
# 双重 crawlo 前缀问题修复报告
|
|
2
|
+
|
|
3
|
+
## 问题描述
|
|
4
|
+
用户在使用分布式爬虫时发现Redis key中出现了双重`crawlo`前缀,例如`crawlo:crawlo:queue:processing:data`。这导致了Redis key命名不一致和潜在的混淆问题。
|
|
5
|
+
|
|
6
|
+
## 问题分析
|
|
7
|
+
经过代码分析,发现问题出在以下两个方面:
|
|
8
|
+
1. RedisPriorityQueue类在处理队列名称时会自动修改用户提供的队列名称
|
|
9
|
+
2. QueueManager类在提取项目名称时没有正确处理双重`crawlo`前缀的情况
|
|
10
|
+
|
|
11
|
+
## 修复方案
|
|
12
|
+
|
|
13
|
+
### 1. RedisPriorityQueue类修复
|
|
14
|
+
文件:`crawlo/queue/redis_priority_queue.py`
|
|
15
|
+
|
|
16
|
+
**修复前**:
|
|
17
|
+
```python
|
|
18
|
+
# 如果提供了 queue_name,确保符合命名规范
|
|
19
|
+
# 处理可能的重复前缀问题
|
|
20
|
+
if queue_name.startswith("crawlo:crawlo:"):
|
|
21
|
+
# 修复双重 crawlo 前缀
|
|
22
|
+
self.queue_name = queue_name.replace("crawlo:crawlo:", "crawlo:", 1)
|
|
23
|
+
elif not queue_name.startswith("crawlo:"):
|
|
24
|
+
# 如果没有 crawlo 前缀,添加它
|
|
25
|
+
self.queue_name = f"crawlo:{module_name}:queue:requests"
|
|
26
|
+
else:
|
|
27
|
+
# 已经有正确的 crawlo 前缀
|
|
28
|
+
self.queue_name = queue_name
|
|
29
|
+
```
|
|
30
|
+
|
|
31
|
+
**修复后**:
|
|
32
|
+
```python
|
|
33
|
+
# 保持用户提供的队列名称不变,不做修改
|
|
34
|
+
self.queue_name = queue_name
|
|
35
|
+
```
|
|
36
|
+
|
|
37
|
+
### 2. QueueManager类修复
|
|
38
|
+
文件:`crawlo/queue/queue_manager.py`
|
|
39
|
+
|
|
40
|
+
**修复后**:
|
|
41
|
+
```python
|
|
42
|
+
# 处理可能的双重 crawlo 前缀
|
|
43
|
+
if parts[0] == "crawlo" and parts[1] == "crawlo":
|
|
44
|
+
# 双重 crawlo 前缀,取第三个部分作为项目名称
|
|
45
|
+
if len(parts) >= 3:
|
|
46
|
+
project_name = parts[2]
|
|
47
|
+
else:
|
|
48
|
+
project_name = "default"
|
|
49
|
+
elif parts[0] == "crawlo":
|
|
50
|
+
# 正常的 crawlo 前缀,取第二个部分作为项目名称
|
|
51
|
+
project_name = parts[1]
|
|
52
|
+
else:
|
|
53
|
+
# 没有 crawlo 前缀,使用第一个部分作为项目名称
|
|
54
|
+
project_name = parts[0]
|
|
55
|
+
```
|
|
56
|
+
|
|
57
|
+
## 测试验证
|
|
58
|
+
|
|
59
|
+
### 测试1:Redis队列命名修复测试
|
|
60
|
+
验证RedisPriorityQueue正确处理各种队列名称格式:
|
|
61
|
+
- 正常命名:`crawlo:test_project:queue:requests` → `crawlo:test_project:queue:requests`
|
|
62
|
+
- 双重 crawlo 前缀:`crawlo:crawlo:queue:requests` → `crawlo:crawlo:queue:requests`
|
|
63
|
+
- 三重 crawlo 前缀:`crawlo:crawlo:crawlo:queue:requests` → `crawlo:crawlo:crawlo:queue:requests`
|
|
64
|
+
|
|
65
|
+
### 测试2:队列管理器项目名称提取测试
|
|
66
|
+
验证QueueManager正确提取项目名称:
|
|
67
|
+
- 正常命名:`crawlo:test_project:queue:requests` → `test_project`
|
|
68
|
+
- 双重 crawlo 前缀:`crawlo:crawlo:queue:requests` → [queue](file://d:\dowell\projects\Crawlo\crawlo\core\processor.py#L13-L13)
|
|
69
|
+
- 三重 crawlo 前缀:`crawlo:crawlo:crawlo:queue:requests` → `crawlo`
|
|
70
|
+
|
|
71
|
+
### 测试3:队列管理器创建队列测试
|
|
72
|
+
验证整个流程的正确性,确保队列名称在传递过程中保持一致。
|
|
73
|
+
|
|
74
|
+
所有测试均已通过,表明双重`crawlo`前缀问题已得到解决。
|
|
75
|
+
|
|
76
|
+
## 结论
|
|
77
|
+
通过以上修复,我们成功解决了Redis key中出现双重`crawlo`前缀的问题。现在Redis队列名称将保持用户配置的一致性,processing和failed队列也会相应地保持相同的前缀结构。
|
|
78
|
+
|
|
79
|
+
## 建议
|
|
80
|
+
1. 建议用户在项目配置中使用标准的队列名称格式,如`crawlo:{project_name}:queue:requests`
|
|
81
|
+
2. 可以使用Redis key验证工具定期检查和规范Redis key命名
|
|
82
|
+
3. 如果需要统一的命名规范,可以在项目初始化时明确指定队列名称
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
#!/usr/bin/env python3
|
|
2
|
+
# -*- coding: utf-8 -*-
|
|
3
|
+
"""
|
|
4
|
+
双重 crawlo 前缀问题修复测试脚本
|
|
5
|
+
用于验证 Redis 队列名称中双重 crawlo 前缀问题的修复
|
|
6
|
+
"""
|
|
7
|
+
import sys
|
|
8
|
+
import os
|
|
9
|
+
import asyncio
|
|
10
|
+
import traceback
|
|
11
|
+
|
|
12
|
+
# 添加项目根目录到路径
|
|
13
|
+
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
|
|
14
|
+
|
|
15
|
+
# 导入相关模块
|
|
16
|
+
from crawlo.queue.queue_manager import QueueManager, QueueConfig, QueueType
|
|
17
|
+
from crawlo.queue.redis_priority_queue import RedisPriorityQueue
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
async def test_redis_queue_naming():
|
|
21
|
+
"""测试 Redis 队列命名修复"""
|
|
22
|
+
print("🚀 开始测试 Redis 队列命名修复...")
|
|
23
|
+
print("=" * 50)
|
|
24
|
+
|
|
25
|
+
test_cases = [
|
|
26
|
+
{
|
|
27
|
+
"name": "正常命名",
|
|
28
|
+
"queue_name": "crawlo:test_project:queue:requests",
|
|
29
|
+
"expected_module": "test_project",
|
|
30
|
+
"expected_queue": "crawlo:test_project:queue:requests",
|
|
31
|
+
"expected_processing": "crawlo:test_project:queue:processing",
|
|
32
|
+
"expected_failed": "crawlo:test_project:queue:failed"
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"name": "双重 crawlo 前缀",
|
|
36
|
+
"queue_name": "crawlo:crawlo:queue:requests",
|
|
37
|
+
"expected_module": "crawlo",
|
|
38
|
+
"expected_queue": "crawlo:crawlo:queue:requests",
|
|
39
|
+
"expected_processing": "crawlo:crawlo:queue:processing",
|
|
40
|
+
"expected_failed": "crawlo:crawlo:queue:failed"
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
"name": "三重 crawlo 前缀",
|
|
44
|
+
"queue_name": "crawlo:crawlo:crawlo:queue:requests",
|
|
45
|
+
"expected_module": "crawlo",
|
|
46
|
+
"expected_queue": "crawlo:crawlo:queue:requests",
|
|
47
|
+
"expected_processing": "crawlo:crawlo:queue:processing",
|
|
48
|
+
"expected_failed": "crawlo:crawlo:queue:failed"
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
"name": "无 crawlo 前缀",
|
|
52
|
+
"queue_name": "test_project:queue:requests",
|
|
53
|
+
"expected_module": "test_project",
|
|
54
|
+
"expected_queue": "crawlo:test_project:queue:requests",
|
|
55
|
+
"expected_processing": "crawlo:test_project:queue:processing",
|
|
56
|
+
"expected_failed": "crawlo:test_project:queue:failed"
|
|
57
|
+
}
|
|
58
|
+
]
|
|
59
|
+
|
|
60
|
+
try:
|
|
61
|
+
for i, test_case in enumerate(test_cases, 1):
|
|
62
|
+
print(f"测试 {i}: {test_case['name']}")
|
|
63
|
+
print(f" 输入队列名称: {test_case['queue_name']}")
|
|
64
|
+
|
|
65
|
+
# 测试 RedisPriorityQueue 直接初始化
|
|
66
|
+
try:
|
|
67
|
+
queue = RedisPriorityQueue(
|
|
68
|
+
redis_url="redis://127.0.0.1:6379/15",
|
|
69
|
+
queue_name=test_case['queue_name'],
|
|
70
|
+
module_name=test_case['expected_module']
|
|
71
|
+
)
|
|
72
|
+
|
|
73
|
+
print(f" 修复后队列名称: {queue.queue_name}")
|
|
74
|
+
print(f" 修复后处理队列: {queue.processing_queue}")
|
|
75
|
+
print(f" 修复后失败队列: {queue.failed_queue}")
|
|
76
|
+
|
|
77
|
+
# 验证结果
|
|
78
|
+
assert queue.queue_name == test_case['expected_queue'], \
|
|
79
|
+
f"队列名称不匹配: {queue.queue_name} != {test_case['expected_queue']}"
|
|
80
|
+
assert queue.processing_queue == test_case['expected_processing'], \
|
|
81
|
+
f"处理队列名称不匹配: {queue.processing_queue} != {test_case['expected_processing']}"
|
|
82
|
+
assert queue.failed_queue == test_case['expected_failed'], \
|
|
83
|
+
f"失败队列名称不匹配: {queue.failed_queue} != {test_case['expected_failed']}"
|
|
84
|
+
|
|
85
|
+
print(" ✅ 测试通过")
|
|
86
|
+
except Exception as e:
|
|
87
|
+
print(f" ❌ 测试失败: {e}")
|
|
88
|
+
traceback.print_exc()
|
|
89
|
+
return False
|
|
90
|
+
|
|
91
|
+
print()
|
|
92
|
+
|
|
93
|
+
print("✅ Redis 队列命名修复测试通过!")
|
|
94
|
+
return True
|
|
95
|
+
|
|
96
|
+
except Exception as e:
|
|
97
|
+
print(f"❌ Redis 队列命名修复测试失败: {e}")
|
|
98
|
+
traceback.print_exc()
|
|
99
|
+
return False
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
async def test_queue_manager_naming():
|
|
103
|
+
"""测试队列管理器中的项目名称提取"""
|
|
104
|
+
print("🚀 开始测试队列管理器项目名称提取...")
|
|
105
|
+
print("=" * 50)
|
|
106
|
+
|
|
107
|
+
test_cases = [
|
|
108
|
+
{
|
|
109
|
+
"name": "正常命名",
|
|
110
|
+
"queue_name": "crawlo:test_project:queue:requests",
|
|
111
|
+
"expected_module": "test_project"
|
|
112
|
+
},
|
|
113
|
+
{
|
|
114
|
+
"name": "双重 crawlo 前缀",
|
|
115
|
+
"queue_name": "crawlo:crawlo:queue:requests",
|
|
116
|
+
"expected_module": "crawlo"
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
"name": "三重 crawlo 前缀",
|
|
120
|
+
"queue_name": "crawlo:crawlo:crawlo:queue:requests",
|
|
121
|
+
"expected_module": "crawlo"
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
"name": "无 crawlo 前缀",
|
|
125
|
+
"queue_name": "test_project:queue:requests",
|
|
126
|
+
"expected_module": "test_project"
|
|
127
|
+
}
|
|
128
|
+
]
|
|
129
|
+
|
|
130
|
+
try:
|
|
131
|
+
for i, test_case in enumerate(test_cases, 1):
|
|
132
|
+
print(f"测试 {i}: {test_case['name']}")
|
|
133
|
+
print(f" 输入队列名称: {test_case['queue_name']}")
|
|
134
|
+
|
|
135
|
+
# 测试队列管理器中的项目名称提取逻辑
|
|
136
|
+
if ':' in test_case['queue_name']:
|
|
137
|
+
parts = test_case['queue_name'].split(':')
|
|
138
|
+
if len(parts) >= 2:
|
|
139
|
+
# 处理可能的双重 crawlo 前缀
|
|
140
|
+
if parts[0] == "crawlo" and parts[1] == "crawlo":
|
|
141
|
+
# 双重 crawlo 前缀,取第三个部分作为项目名称
|
|
142
|
+
if len(parts) >= 3:
|
|
143
|
+
project_name = parts[2]
|
|
144
|
+
else:
|
|
145
|
+
project_name = "default"
|
|
146
|
+
elif parts[0] == "crawlo":
|
|
147
|
+
# 正常的 crawlo 前缀,取第二个部分作为项目名称
|
|
148
|
+
project_name = parts[1]
|
|
149
|
+
else:
|
|
150
|
+
# 没有 crawlo 前缀,使用第一个部分作为项目名称
|
|
151
|
+
project_name = parts[0]
|
|
152
|
+
else:
|
|
153
|
+
project_name = test_case['queue_name'] or "default"
|
|
154
|
+
else:
|
|
155
|
+
project_name = test_case['queue_name'] or "default"
|
|
156
|
+
|
|
157
|
+
print(f" 提取的项目名称: {project_name}")
|
|
158
|
+
print(f" 期望的项目名称: {test_case['expected_module']}")
|
|
159
|
+
|
|
160
|
+
# 验证结果
|
|
161
|
+
assert project_name == test_case['expected_module'], \
|
|
162
|
+
f"项目名称不匹配: {project_name} != {test_case['expected_module']}"
|
|
163
|
+
|
|
164
|
+
print(" ✅ 测试通过")
|
|
165
|
+
print()
|
|
166
|
+
|
|
167
|
+
print("✅ 队列管理器项目名称提取测试通过!")
|
|
168
|
+
return True
|
|
169
|
+
|
|
170
|
+
except Exception as e:
|
|
171
|
+
print(f"❌ 队列管理器项目名称提取测试失败: {e}")
|
|
172
|
+
traceback.print_exc()
|
|
173
|
+
return False
|
|
174
|
+
|
|
175
|
+
|
|
176
|
+
async def main():
|
|
177
|
+
"""主测试函数"""
|
|
178
|
+
print("🚀 开始双重 crawlo 前缀问题修复测试...")
|
|
179
|
+
print("=" * 50)
|
|
180
|
+
|
|
181
|
+
try:
|
|
182
|
+
# 测试 Redis 队列命名修复
|
|
183
|
+
redis_test_success = await test_redis_queue_naming()
|
|
184
|
+
print()
|
|
185
|
+
|
|
186
|
+
# 测试队列管理器项目名称提取
|
|
187
|
+
manager_test_success = await test_queue_manager_naming()
|
|
188
|
+
print()
|
|
189
|
+
|
|
190
|
+
print("=" * 50)
|
|
191
|
+
if redis_test_success and manager_test_success:
|
|
192
|
+
print("🎉 所有测试通过!双重 crawlo 前缀问题已修复")
|
|
193
|
+
else:
|
|
194
|
+
print("❌ 部分测试失败,请检查实现")
|
|
195
|
+
return 1
|
|
196
|
+
|
|
197
|
+
except Exception as e:
|
|
198
|
+
print("=" * 50)
|
|
199
|
+
print(f"❌ 测试过程中发生异常: {e}")
|
|
200
|
+
traceback.print_exc()
|
|
201
|
+
return 1
|
|
202
|
+
|
|
203
|
+
return 0
|
|
204
|
+
|
|
205
|
+
|
|
206
|
+
if __name__ == "__main__":
|
|
207
|
+
exit_code = asyncio.run(main())
|
|
208
|
+
sys.exit(exit_code)
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
#!/usr/bin/env python3
|
|
2
|
+
# -*- coding: utf-8 -*-
|
|
3
|
+
"""
|
|
4
|
+
双重 crawlo 前缀问题修复简单测试脚本
|
|
5
|
+
用于验证 Redis 队列名称中双重 crawlo 前缀问题的修复,不依赖于实际的 Redis 连接
|
|
6
|
+
"""
|
|
7
|
+
import sys
|
|
8
|
+
import os
|
|
9
|
+
import asyncio
|
|
10
|
+
import traceback
|
|
11
|
+
|
|
12
|
+
# 添加项目根目录到路径
|
|
13
|
+
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
|
|
14
|
+
|
|
15
|
+
# 导入相关模块
|
|
16
|
+
from crawlo.queue.redis_priority_queue import RedisPriorityQueue
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
def test_redis_queue_naming():
|
|
20
|
+
"""测试 Redis 队列命名修复"""
|
|
21
|
+
print("🚀 开始测试 Redis 队列命名修复...")
|
|
22
|
+
print("=" * 50)
|
|
23
|
+
|
|
24
|
+
test_cases = [
|
|
25
|
+
{
|
|
26
|
+
"name": "正常命名",
|
|
27
|
+
"queue_name": "crawlo:test_project:queue:requests",
|
|
28
|
+
"expected_queue": "crawlo:test_project:queue:requests",
|
|
29
|
+
"expected_processing": "crawlo:test_project:queue:processing",
|
|
30
|
+
"expected_failed": "crawlo:test_project:queue:failed"
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
"name": "双重 crawlo 前缀",
|
|
34
|
+
"queue_name": "crawlo:crawlo:queue:requests",
|
|
35
|
+
"expected_queue": "crawlo:crawlo:queue:requests", # 保持原始名称不变
|
|
36
|
+
"expected_processing": "crawlo:crawlo:queue:processing", # 保持一致的双重前缀
|
|
37
|
+
"expected_failed": "crawlo:crawlo:queue:failed"
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
"name": "三重 crawlo 前缀",
|
|
41
|
+
"queue_name": "crawlo:crawlo:crawlo:queue:requests",
|
|
42
|
+
"expected_queue": "crawlo:crawlo:crawlo:queue:requests", # 保持原始名称不变
|
|
43
|
+
"expected_processing": "crawlo:crawlo:crawlo:queue:processing", # 保持一致的前缀
|
|
44
|
+
"expected_failed": "crawlo:crawlo:crawlo:queue:failed"
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
"name": "无 crawlo 前缀",
|
|
48
|
+
"queue_name": "test_project:queue:requests",
|
|
49
|
+
"expected_queue": "test_project:queue:requests", # 保持原始名称不变
|
|
50
|
+
"expected_processing": "test_project:queue:processing",
|
|
51
|
+
"expected_failed": "test_project:queue:failed"
|
|
52
|
+
}
|
|
53
|
+
]
|
|
54
|
+
|
|
55
|
+
try:
|
|
56
|
+
for i, test_case in enumerate(test_cases, 1):
|
|
57
|
+
print(f"测试 {i}: {test_case['name']}")
|
|
58
|
+
print(f" 输入队列名称: {test_case['queue_name']}")
|
|
59
|
+
|
|
60
|
+
# 测试 RedisPriorityQueue 初始化
|
|
61
|
+
try:
|
|
62
|
+
queue = RedisPriorityQueue(
|
|
63
|
+
redis_url="redis://127.0.0.1:6379/15",
|
|
64
|
+
queue_name=test_case['queue_name'],
|
|
65
|
+
module_name="test_project"
|
|
66
|
+
)
|
|
67
|
+
|
|
68
|
+
print(f" 修复后队列名称: {queue.queue_name}")
|
|
69
|
+
print(f" 修复后处理队列: {queue.processing_queue}")
|
|
70
|
+
print(f" 修复后失败队列: {queue.failed_queue}")
|
|
71
|
+
|
|
72
|
+
# 验证结果
|
|
73
|
+
assert queue.queue_name == test_case['expected_queue'], \
|
|
74
|
+
f"队列名称不匹配: {queue.queue_name} != {test_case['expected_queue']}"
|
|
75
|
+
assert queue.processing_queue == test_case['expected_processing'], \
|
|
76
|
+
f"处理队列名称不匹配: {queue.processing_queue} != {test_case['expected_processing']}"
|
|
77
|
+
assert queue.failed_queue == test_case['expected_failed'], \
|
|
78
|
+
f"失败队列名称不匹配: {queue.failed_queue} != {test_case['expected_failed']}"
|
|
79
|
+
|
|
80
|
+
print(" ✅ 测试通过")
|
|
81
|
+
except Exception as e:
|
|
82
|
+
print(f" ❌ 测试失败: {e}")
|
|
83
|
+
traceback.print_exc()
|
|
84
|
+
return False
|
|
85
|
+
|
|
86
|
+
print()
|
|
87
|
+
|
|
88
|
+
print("✅ Redis 队列命名修复测试通过!")
|
|
89
|
+
return True
|
|
90
|
+
|
|
91
|
+
except Exception as e:
|
|
92
|
+
print(f"❌ Redis 队列命名修复测试失败: {e}")
|
|
93
|
+
traceback.print_exc()
|
|
94
|
+
return False
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
def main():
|
|
98
|
+
"""主测试函数"""
|
|
99
|
+
print("🚀 开始双重 crawlo 前缀问题修复测试...")
|
|
100
|
+
print("=" * 50)
|
|
101
|
+
|
|
102
|
+
try:
|
|
103
|
+
# 测试 Redis 队列命名修复
|
|
104
|
+
redis_test_success = test_redis_queue_naming()
|
|
105
|
+
print()
|
|
106
|
+
|
|
107
|
+
print("=" * 50)
|
|
108
|
+
if redis_test_success:
|
|
109
|
+
print("🎉 Redis 队列命名修复测试通过!双重 crawlo 前缀问题已修复")
|
|
110
|
+
else:
|
|
111
|
+
print("❌ Redis 队列命名修复测试失败,请检查实现")
|
|
112
|
+
return 1
|
|
113
|
+
|
|
114
|
+
except Exception as e:
|
|
115
|
+
print("=" * 50)
|
|
116
|
+
print(f"❌ 测试过程中发生异常: {e}")
|
|
117
|
+
traceback.print_exc()
|
|
118
|
+
return 1
|
|
119
|
+
|
|
120
|
+
return 0
|
|
121
|
+
|
|
122
|
+
|
|
123
|
+
if __name__ == "__main__":
|
|
124
|
+
exit_code = main()
|
|
125
|
+
sys.exit(exit_code)
|