Skip to content

Commit d9b7627

Browse files
ikesnowyikesnowy
committed
test: add prepend search result snapshot
1 parent b85aa44 commit d9b7627

File tree

7 files changed

+260
-4
lines changed

7 files changed

+260
-4
lines changed

‎sample/Cnblogs.DashScope.Sample/Text/ChatWebSearchSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task RunAsync(IDashScopeClient client)
4141
CitationFormat = "[ref_<number>]",
4242
EnableSource = true,
4343
EnableSearchExtension = true,
44-
ForcedSearch = true
44+
ForcedSearch = true,
4545
},
4646
IncrementalOutput = true
4747
}

‎test/Cnblogs.DashScope.Sdk.UnitTests/TextGenerationSerializationTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,13 @@ public async Task ConversationCompletion_MessageFormatSse_SuccessAsync(
177177
Snapshots.TextGeneration.MessageFormat.SingleMessageJson,
178178
Snapshots.TextGeneration.MessageFormat.SingleMessageLogprobs,
179179
Snapshots.TextGeneration.MessageFormat.SingleMessageTranslation,
180-
Snapshots.TextGeneration.MessageFormat.SingleMessageWebSearch);
180+
Snapshots.TextGeneration.MessageFormat.SingleMessageWebSearchNoSse);
181181

182182
public static readonly TheoryData<RequestSnapshot<ModelRequest<TextGenerationInput, ITextGenerationParameters>,
183183
ModelResponse<TextGenerationOutput, TextGenerationTokenUsage>>> SingleGenerationMessageSseFormatData = new(
184184
Snapshots.TextGeneration.MessageFormat.SingleMessageIncremental,
185-
Snapshots.TextGeneration.MessageFormat.SingleMessageReasoningIncremental);
185+
Snapshots.TextGeneration.MessageFormat.SingleMessageReasoningIncremental,
186+
Snapshots.TextGeneration.MessageFormat.SingleMessageWebSearchIncremental);
186187

187188
public static readonly TheoryData<RequestSnapshot<ModelRequest<TextGenerationInput, ITextGenerationParameters>,
188189
ModelResponse<TextGenerationOutput, TextGenerationTokenUsage>>> ConversationMessageFormatSseData = new(

‎test/Cnblogs.DashScope.Tests.Shared/RawHttpData/single-generation-message-search-sse.request.body.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"model": "qwen-plus",
3+
"input": {
4+
"messages": [
5+
{
6+
"role": "user",
7+
"content": "杭州明天的天气"
8+
}
9+
]
10+
},
11+
"parameters": {
12+
"result_format": "message",
13+
"enable_search": true,
14+
"search_options": {
15+
"enable_source": true,
16+
"forced_search": true,
17+
"prepend_search_result": true,
18+
"search_strategy": "standard"
19+
},
20+
"incremental_output": true
21+
}
22+
}

‎test/Cnblogs.DashScope.Tests.Shared/RawHttpData/single-generation-message-search-sse.request.header.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
POST /api/v1/services/aigc/text-generation/generation HTTP/1.1
2+
Accept: text/event-stream
3+
Content-Type: application/json
4+
User-Agent: PostmanRuntime/7.44.1
5+
Cache-Control: no-cache
6+
Host: dashscope.aliyuncs.com
7+
Accept-Encoding: gzip, deflate, br
8+
Connection: keep-alive
9+
Content-Length: 493

‎test/Cnblogs.DashScope.Tests.Shared/RawHttpData/single-generation-message-search-sse.response.body.txt‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
id:1
2+
event:result
3+
:HTTP_STATUS/200
4+
data:{"output":{"choices":[{"message":{"content":"","role":"assistant"},"finish_reason":"null"}],"search_info":{"search_results":[{"icon":"http://www.ip.cn/favicon.ico","site_name":"厦门时空科技有限公司","index":1,"title":"杭州市15天天气查询","url":"https://www.ip.cn/tianqi/zhejiang/hangzhou/15day.html"},{"icon":"https://img.alicdn.com/imgextra/i3/O1CN01kr9teP1wlRD8OH6TO_!!6000000006348-73-tps-16-16.ico","site_name":"eastday","index":2,"title":"杭州天气预报杭州2025年10月20日天气","url":"https://tianqi.eastday.com/tianqi/hangzhou/20251020.html"},{"icon":"http://www.ip.cn/favicon.ico","site_name":"厦门时空科技有限公司","index":3,"title":"杭州市2025年10月份天气查询","url":"https://www.ip.cn/tianqi/zhejiang/hangzhou/202510.html"},{"icon":"","site_name":"无","index":4,"title":"杭州","url":"http://www.suzhoutianqi114.com/hangzhou/10yuefen.html"},{"icon":"https://img.alicdn.com/imgextra/i3/O1CN01kr9teP1wlRD8OH6TO_!!6000000006348-73-tps-16-16.ico","site_name":"eastday","index":5,"title":">杭州历史天气 ","url":"https://tianqi.eastday.com/lishi/hangzhou.html"}]}},"usage":{},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
5+
6+
id:2
7+
event:result
8+
:HTTP_STATUS/200
9+
data:{"output":{"choices":[{"message":{"content":"根据","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":710,"output_tokens":1,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
10+
11+
id:3
12+
event:result
13+
:HTTP_STATUS/200
14+
data:{"output":{"choices":[{"message":{"content":"杭州市","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":711,"output_tokens":2,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
15+
16+
id:4
17+
event:result
18+
:HTTP_STATUS/200
19+
data:{"output":{"choices":[{"message":{"content":"气象","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":712,"output_tokens":3,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
20+
21+
id:5
22+
event:result
23+
:HTTP_STATUS/200
24+
data:{"output":{"choices":[{"message":{"content":"台","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":713,"output_tokens":4,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
25+
26+
id:6
27+
event:result
28+
:HTTP_STATUS/200
29+
data:{"output":{"choices":[{"message":{"content":"2025","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":717,"output_tokens":8,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
30+
31+
id:7
32+
event:result
33+
:HTTP_STATUS/200
34+
data:{"output":{"choices":[{"message":{"content":"年10月1","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":722,"output_tokens":13,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
35+
36+
id:8
37+
event:result
38+
:HTTP_STATUS/200
39+
data:{"output":{"choices":[{"message":{"content":"9日发布的天气预报，","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":728,"output_tokens":19,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
40+
41+
id:9
42+
event:result
43+
:HTTP_STATUS/200
44+
data:{"output":{"choices":[{"message":{"content":"杭州明天（1","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":732,"output_tokens":23,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
45+
46+
id:10
47+
event:result
48+
:HTTP_STATUS/200
49+
data:{"output":{"choices":[{"message":{"content":"0月20日）","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":738,"output_tokens":29,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
50+
51+
id:11
52+
event:result
53+
:HTTP_STATUS/200
54+
data:{"output":{"choices":[{"message":{"content":"的天气情况如下：\n\n*","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":744,"output_tokens":35,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
55+
56+
id:12
57+
event:result
58+
:HTTP_STATUS/200
59+
data:{"output":{"choices":[{"message":{"content":" **天气**：阴","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":750,"output_tokens":41,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
60+
61+
id:13
62+
event:result
63+
:HTTP_STATUS/200
64+
data:{"output":{"choices":[{"message":{"content":"转多云\n* ","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":756,"output_tokens":47,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
65+
66+
id:14
67+
event:result
68+
:HTTP_STATUS/200
69+
data:{"output":{"choices":[{"message":{"content":" **气温**：最高气温","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":762,"output_tokens":53,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
70+
71+
id:15
72+
event:result
73+
:HTTP_STATUS/200
74+
data:{"output":{"choices":[{"message":{"content":"20℃，最低","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":767,"output_tokens":58,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
75+
76+
id:16
77+
event:result
78+
:HTTP_STATUS/200
79+
data:{"output":{"choices":[{"message":{"content":"气温18℃\n*","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":773,"output_tokens":64,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
80+
81+
id:17
82+
event:result
83+
:HTTP_STATUS/200
84+
data:{"output":{"choices":[{"message":{"content":" **风力","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":777,"output_tokens":68,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
85+
86+
id:18
87+
event:result
88+
:HTTP_STATUS/200
89+
data:{"output":{"choices":[{"message":{"content":"**：北风3级","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":783,"output_tokens":74,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
90+
91+
id:19
92+
event:result
93+
:HTTP_STATUS/200
94+
data:{"output":{"choices":[{"message":{"content":"\n* **空气质量**","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":789,"output_tokens":80,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
95+
96+
id:20
97+
event:result
98+
:HTTP_STATUS/200
99+
data:{"output":{"choices":[{"message":{"content":"：优\n\n建议","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":793,"output_tokens":84,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
100+
101+
id:21
102+
event:result
103+
:HTTP_STATUS/200
104+
data:{"output":{"choices":[{"message":{"content":"穿着单层棉麻","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":798,"output_tokens":89,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
105+
106+
id:22
107+
event:result
108+
:HTTP_STATUS/200
109+
data:{"output":{"choices":[{"message":{"content":"面料的短套装","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":802,"output_tokens":93,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
110+
111+
id:23
112+
event:result
113+
:HTTP_STATUS/200
114+
data:{"output":{"choices":[{"message":{"content":"、T恤衫等舒适的","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":808,"output_tokens":99,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
115+
116+
id:24
117+
event:result
118+
:HTTP_STATUS/200
119+
data:{"output":{"choices":[{"message":{"content":"衣物。","role":"assistant"},"finish_reason":"null"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":810,"output_tokens":101,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
120+
121+
id:25
122+
event:result
123+
:HTTP_STATUS/200
124+
data:{"output":{"choices":[{"message":{"content":"","role":"assistant"},"finish_reason":"stop"}],"search_info":{"extra_tool_info":[],"search_results":[]}},"usage":{"total_tokens":810,"output_tokens":101,"input_tokens":709,"plugins":{"search":{"count":1,"strategy":"standard"}},"prompt_tokens_details":{"cached_tokens":0}},"request_id":"ed54a8da-a598-4a20-a849-3e0bc0ea3d4b"}
125+

‎test/Cnblogs.DashScope.Tests.Shared/RawHttpData/single-generation-message-search-sse.response.header.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
HTTP/1.1 200 OK
2+
vary: Origin,Access-Control-Request-Method,Access-Control-Request-Headers
3+
x-request-id: ed54a8da-a598-4a20-a849-3e0bc0ea3d4b
4+
content-type: text/event-stream;charset=UTF-8
5+
x-dashscope-call-gateway: true
6+
x-dashscope-timeout: 298
7+
x-dashscope-finished: false
8+
req-cost-time: 826
9+
req-arrive-time: 1760879893898
10+
resp-start-time: 1760879894724
11+
x-envoy-upstream-service-time: 818
12+
date: Sun, 19 Oct 2025 13:18:14 GMT
13+
server: istio-envoy
14+
transfer-encoding: chunked

0 commit comments

Comments
 (0)