Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 在压测中支持反思模型 #891

Merged
merged 1 commit into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions python/qianfan/dataset/stress_test/qianfan_llm_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ def _process_responses(
) -> _InnerResponseProcessRet:
last_resp: Optional[QfResponse] = None
merged_query = ""
merged_reasoning_content = ""
res_choices: Dict[int, Dict[str, Any]] = {}
first_flag, all_empty = True, True
clear_history = False
Expand Down Expand Up @@ -523,17 +524,25 @@ def _process_responses(
index = stream_json.get("index", -1)
if "delta" in stream_json:
content = stream_json["delta"].get("content", "")
merged_query += content
reasoning_content = stream_json["delta"].get(
"reasoning_content", ""
)
merged_query += content if content is not None else ""
merged_reasoning_content += (
reasoning_content if reasoning_content is not None else ""
)
if index not in res_choices:
res_choices[index] = {}
choice = res_choices[index]
choice.update(stream_json)
choice["delta"]["content"] = merged_query
choice["delta"]["reasoning_content"] = merged_reasoning_content
else:
self.exc = Exception("ERROR CODE 结果无法解析")
break
if len(content) != 0:
all_empty = False

if len(merged_query) != 0:
all_empty = False

assert last_resp is not None
if all_empty and not clear_history:
Expand Down Expand Up @@ -675,7 +684,9 @@ def _process_responses(
request_meta["output_tokens"] = 0

stream_json = resp["body"]
merged_query += stream_json["result"]
merged_query += (
stream_json["result"] if stream_json["result"] is not None else ""
)
if first_flag:
request_meta["first_token_latency"] = resp.statistic[
"first_token_latency"
Expand Down
4 changes: 4 additions & 0 deletions python/qianfan/resources/llm/chat_completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -2190,6 +2190,7 @@ def create(
assert isinstance(resp, QfResponse)
result = Completion.parse_obj(resp.body)
result.statistic = CompletionStatistic.parse_obj(resp.statistic)
result.raw = resp.body
return result
else:
assert isinstance(resp, Iterator)
Expand Down Expand Up @@ -2252,6 +2253,7 @@ async def acreate(
assert isinstance(resp, QfResponse)
result = Completion.parse_obj(resp.body)
result.statistic = CompletionStatistic.parse_obj(resp.statistic)
result.raw = resp.body
return result
else:
assert isinstance(resp, AsyncIterator)
Expand All @@ -2263,6 +2265,7 @@ def _create_completion_stream(
for r in resp:
result = CompletionChunk.parse_obj(r.body)
result.statistic = CompletionStatistic.parse_obj(r.statistic)
result.raw = r.body
yield result

async def _acreate_completion_stream(
Expand All @@ -2271,6 +2274,7 @@ async def _acreate_completion_stream(
async for r in resp:
result = CompletionChunk.parse_obj(r.body)
result.statistic = CompletionStatistic.parse_obj(r.statistic)
result.raw = r.body
yield result

def _convert_v2_request_to_v1(self, request: Any) -> Any:
Expand Down
10 changes: 9 additions & 1 deletion python/qianfan/resources/typing_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
client typing
"""

from typing import List, Optional
from typing import Any, List, Optional

from typing_extensions import Literal

Expand Down Expand Up @@ -46,6 +46,8 @@ class ChatCompletionMessage(BaseModel):
content: Optional[str] = None
"""The contents of the message."""

reasoning_content: Optional[str] = None

role: Literal["assistant"]
"""The role of the author of this message."""

Expand Down Expand Up @@ -128,11 +130,15 @@ class Completion(BaseModel):

statistic: Optional[CompletionStatistic] = None

raw: Any = None


class ChoiceDelta(BaseModel):
content: Optional[str] = None
"""The contents of the message."""

reasoning_content: Optional[str] = None

tool_calls: Optional[List[ToolCall]] = None


Expand Down Expand Up @@ -185,3 +191,5 @@ class CompletionChunk(BaseModel):
statistic: Optional[CompletionStatistic] = None

web_search: Optional[SearchResult] = None

raw: Any = None
Loading