xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-08-13 06:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove print

Browse Source
This commit is contained in:
Junyan Qin
2025-08-17 13:52:40 +08:00
parent 4bbfa2f1d7
commit e931d5eb88
1 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/provider/modelmgr/requesters/anthropicmsgs.py
+29 -39
View File
@@ -91,9 +91,8 @@ class AnthropicMessages(requester.ProviderAPIRequester):
{ {
'type': 'tool_result', 'type': 'tool_result',
'tool_use_id': tool_call_id, 'tool_use_id': tool_call_id,
'is_error':False, 'is_error': False,
'content': [{"type": "text", 'content': [{'type': 'text', 'text': m.content}],
"text": m.content}],
} }
], ],
} }
@@ -138,10 +137,7 @@ class AnthropicMessages(requester.ProviderAPIRequester):
args['messages'] = req_messages args['messages'] = req_messages
if 'thinking' in args: if 'thinking' in args:
args['thinking'] = { args['thinking'] = {'type': 'enabled', 'budget_tokens': 10000}
"type": "enabled",
"budget_tokens": 10000
}
if funcs: if funcs:
tools = await self.ap.tool_mgr.generate_tools_for_anthropic(funcs) tools = await self.ap.tool_mgr.generate_tools_for_anthropic(funcs)
@@ -185,21 +181,20 @@ class AnthropicMessages(requester.ProviderAPIRequester):
else: else:
raise errors.RequesterError(f'请求地址无效: {e.message}') raise errors.RequesterError(f'请求地址无效: {e.message}')
async def invoke_llm_stream( async def invoke_llm_stream(
self, self,
query: core_entities.Query, query: core_entities.Query,
model: requester.RuntimeLLMModel, model: requester.RuntimeLLMModel,
messages: typing.List[llm_entities.Message], messages: typing.List[llm_entities.Message],
funcs: typing.List[tools_entities.LLMFunction] = None, funcs: typing.List[tools_entities.LLMFunction] = None,
extra_args: dict[str, typing.Any] = {}, extra_args: dict[str, typing.Any] = {},
remove_think: bool = False, remove_think: bool = False,
) -> llm_entities.Message: ) -> llm_entities.Message:
self.client.api_key = model.token_mgr.get_token() self.client.api_key = model.token_mgr.get_token()
args = extra_args.copy() args = extra_args.copy()
args['model'] = model.model_entity.name args['model'] = model.model_entity.name
args['stream'] = True args['stream'] = True
# 处理消息 # 处理消息
@@ -231,9 +226,10 @@ class AnthropicMessages(requester.ProviderAPIRequester):
{ {
'type': 'tool_result', 'type': 'tool_result',
'tool_use_id': tool_call_id, 'tool_use_id': tool_call_id,
'is_error':False, # 暂时直接写false 'is_error': False, # 暂时直接写false
'content': [{"type": "text", 'content': [
"text": m.content}], # 这里要是list包裹，应该是多个返回的情况？type类型好像也可以填其他的，暂时只写text {'type': 'text', 'text': m.content}
], # 这里要是list包裹，应该是多个返回的情况？type类型好像也可以填其他的，暂时只写text
} }
], ],
} }
@@ -276,10 +272,7 @@ class AnthropicMessages(requester.ProviderAPIRequester):
req_messages.append(msg_dict) req_messages.append(msg_dict)
if 'thinking' in args: if 'thinking' in args:
args['thinking'] = { args['thinking'] = {'type': 'enabled', 'budget_tokens': 10000}
"type": "enabled",
"budget_tokens": 10000
}
args['messages'] = req_messages args['messages'] = req_messages
@@ -298,18 +291,17 @@ class AnthropicMessages(requester.ProviderAPIRequester):
content = '' content = ''
tool_name = '' tool_name = ''
tool_id = '' tool_id = ''
tool_calls = []
async for chunk in await self.client.messages.create(**args): async for chunk in await self.client.messages.create(**args):
tool_call = {"id":None, 'function': {"name": None, "arguments": None},'type':'function'} tool_call = {'id': None, 'function': {'name': None, 'arguments': None}, 'type': 'function'}
if isinstance(chunk, anthropic.types.raw_content_block_start_event.RawContentBlockStartEvent): # 记录开始 if isinstance(
chunk, anthropic.types.raw_content_block_start_event.RawContentBlockStartEvent
): # 记录开始
if chunk.content_block.type == 'tool_use': if chunk.content_block.type == 'tool_use':
if chunk.content_block.name is not None: if chunk.content_block.name is not None:
tool_name = chunk.content_block.name tool_name = chunk.content_block.name
if chunk.content_block.id is not None: if chunk.content_block.id is not None:
tool_id = chunk.content_block.id tool_id = chunk.content_block.id
tool_call['function']['name'] = tool_name tool_call['function']['name'] = tool_name
tool_call['function']['arguments'] = '' tool_call['function']['arguments'] = ''
tool_call['id'] = tool_id tool_call['id'] = tool_id
@@ -321,7 +313,7 @@ class AnthropicMessages(requester.ProviderAPIRequester):
think_ended = True think_ended = True
continue continue
elif isinstance(chunk, anthropic.types.raw_content_block_delta_event.RawContentBlockDeltaEvent): elif isinstance(chunk, anthropic.types.raw_content_block_delta_event.RawContentBlockDeltaEvent):
if chunk.delta.type == "thinking_delta": if chunk.delta.type == 'thinking_delta':
if think_started: if think_started:
think_started = False think_started = False
content = '<think>\n' + chunk.delta.thinking content = '<think>\n' + chunk.delta.thinking
@@ -329,34 +321,33 @@ class AnthropicMessages(requester.ProviderAPIRequester):
continue continue
else: else:
content = chunk.delta.thinking content = chunk.delta.thinking
elif chunk.delta.type == "text_delta": elif chunk.delta.type == 'text_delta':
if think_ended: if think_ended:
think_ended = False think_ended = False
content = '\n</think>\n' + chunk.delta.text content = '\n</think>\n' + chunk.delta.text
else: else:
content = chunk.delta.text content = chunk.delta.text
elif chunk.delta.type == "input_json_delta": elif chunk.delta.type == 'input_json_delta':
tool_call['function']["arguments"] = chunk.delta.partial_json tool_call['function']['arguments'] = chunk.delta.partial_json
tool_call['function']['name'] = tool_name tool_call['function']['name'] = tool_name
tool_call['id'] = tool_id tool_call['id'] = tool_id
elif isinstance(chunk, anthropic.types.raw_content_block_stop_event.RawContentBlockStopEvent): elif isinstance(chunk, anthropic.types.raw_content_block_stop_event.RawContentBlockStopEvent):
continue # 记录raw_content_block结束的 continue # 记录raw_content_block结束的
elif isinstance(chunk, anthropic.types.raw_message_delta_event.RawMessageDeltaEvent): elif isinstance(chunk, anthropic.types.raw_message_delta_event.RawMessageDeltaEvent):
if chunk.delta.stop_reason == "end_turn": if chunk.delta.stop_reason == 'end_turn':
finish_reason = True finish_reason = True
elif isinstance(chunk, anthropic.types.raw_message_stop_event.RawMessageStopEvent): elif isinstance(chunk, anthropic.types.raw_message_stop_event.RawMessageStopEvent):
continue # 这个好像是完全结束 continue # 这个好像是完全结束
else: else:
print(chunk) # print(chunk)
self.ap.logger.debug(f'anthropic chunk: {chunk}')
continue continue
args = { args = {
'content': content, 'content': content,
'role': role, 'role': role,
"is_final": finish_reason, 'is_final': finish_reason,
'tool_calls': None if tool_call['id'] is None else [tool_call], 'tool_calls': None if tool_call['id'] is None else [tool_call],
} }
# if chunk_idx == 0: # if chunk_idx == 0:
@@ -365,7 +356,6 @@ class AnthropicMessages(requester.ProviderAPIRequester):
# assert type(chunk) is anthropic.types.message.Chunk # assert type(chunk) is anthropic.types.message.Chunk
yield llm_entities.MessageChunk(**args) yield llm_entities.MessageChunk(**args)
# return llm_entities.Message(**args) # return llm_entities.Message(**args)