zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Calling the model using non stream cannot obtain the token (#3826)

Browse Source
This commit is contained in:
shaohuzhang1 2025-08-06 11:00:43 +08:00 committed by GitHub
parent ca3815e6fe
commit bd589e50e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/models_provider/impl/base_chat_open_ai.py
View File

@ -99,7 +99,7 @@ class BaseChatOpenAI(ChatOpenAI):
except Exception as e: except Exception as e:
tokenizer = TokenizerManage.get_tokenizer() tokenizer = TokenizerManage.get_tokenizer()
return sum([len(tokenizer.encode(get_buffer_string([m]))) for m in messages]) return sum([len(tokenizer.encode(get_buffer_string([m]))) for m in messages])
return self.usage_metadata.get('input_tokens', 0) return self.usage_metadata.get('input_tokens', self.usage_metadata.get('prompt_tokens', 0))
def get_num_tokens(self, text: str) -> int: def get_num_tokens(self, text: str) -> int:
if self.usage_metadata is None or self.usage_metadata == {}: if self.usage_metadata is None or self.usage_metadata == {}:
@ -108,7 +108,8 @@ class BaseChatOpenAI(ChatOpenAI):
except Exception as e: except Exception as e:
tokenizer = TokenizerManage.get_tokenizer() tokenizer = TokenizerManage.get_tokenizer()
return len(tokenizer.encode(text)) return len(tokenizer.encode(text))
return self.get_last_generation_info().get('output_tokens', 0) return self.get_last_generation_info().get('output_tokens',
self.get_last_generation_info().get('completion_tokens', 0))
def _stream(self, *args: Any, **kwargs: Any) -> Iterator[ChatGenerationChunk]: def _stream(self, *args: Any, **kwargs: Any) -> Iterator[ChatGenerationChunk]:
kwargs['stream_usage'] = True kwargs['stream_usage'] = True
@ -133,7 +134,7 @@ class BaseChatOpenAI(ChatOpenAI):
) )
usage_metadata: Optional[UsageMetadata] = ( usage_metadata: Optional[UsageMetadata] = (
_create_usage_metadata(token_usage) if token_usage else None _create_usage_metadata(token_usage) if token_usage and token_usage.get("prompt_tokens") else None
) )
if len(choices) == 0: if len(choices) == 0:
# logprobs is implicitly None # logprobs is implicitly None