Merge remote-tracking branch 'origin/main' into fix-research-bugs

This commit is contained in:
shenchucheng 2024-02-07 17:51:21 +08:00
commit a3b7b5c9e3

View file

@ -236,7 +236,7 @@ class OpenAILLM(BaseLLM):
usage.prompt_tokens = count_message_tokens(messages, self.model)
usage.completion_tokens = count_string_tokens(rsp, self.model)
except Exception as e:
logger.error(f"usage calculation failed: {e}")
logger.warning(f"usage calculation failed: {e}")
return usage
@ -255,7 +255,7 @@ class OpenAILLM(BaseLLM):
return self.config.max_token
# FIXME
# https://community.openai.com/t/why-is-gpt-3-5-turbo-1106-max-tokens-limited-to-4096/494973/3
return min(get_max_completion_tokens(messages, self.model, self.config.max_tokens), 4096)
return min(get_max_completion_tokens(messages, self.model, self.config.max_token), 4096)
@handle_exception
async def amoderation(self, content: Union[str, list[str]]):