diff --git a/plugins/openai_plugin.py b/plugins/openai_plugin.py index 33c98d08..5b1a2285 100644 --- a/plugins/openai_plugin.py +++ b/plugins/openai_plugin.py @@ -227,10 +227,6 @@ def streaming_request_http(self, query: dict, user_id: int, test_end_time: float if message.get("usage"): result.output_tokens = message["usage"]["completion_tokens"] result.input_tokens = message["usage"]["prompt_tokens"] - # If test duration timeout didn't happen before the last token is received, - # total tokens before the timeout will be equal to the total tokens in the response. - if not result.output_tokens_before_timeout: - result.output_tokens_before_timeout = result.output_tokens result.stop_reason = message["choices"][0]["finish_reason"] @@ -249,5 +245,10 @@ def streaming_request_http(self, query: dict, user_id: int, test_end_time: float logger.warning("Output token count not found in response, length of token list") result.output_tokens = len(tokens) + # If test duration timeout didn't happen before the last token is received, + # total tokens before the timeout will be equal to the total tokens in the response. + if not result.output_tokens_before_timeout: + result.output_tokens_before_timeout = result.output_tokens + result.calculate_results() return result