Refactor response token counting in Prompt classes

- Simplify '_count_response_tokens' in 'OpenAIPrompt'.
- Move '_response_tokens' check to 'response_tokens' in 'Prompt'.
- Update '_hash' in 'Prompt' to use refactored property.

devchat/openai/openai_prompt.py

@@ -221,12 +221,7 @@ def append_response(self, delta_str: str) -> str:
         return delta_content
 
     def _count_response_tokens(self) -> int:
-        if self._response_tokens:
-            return self._response_tokens
-
-        total = sum(openai_response_tokens(resp.to_dict(), self.model) for resp in self.responses)
-        self._response_tokens = total
-        return total
+        return sum(openai_response_tokens(resp.to_dict(), self.model) for resp in self.responses)
 
     def _validate_model(self, response_data: dict):
         if not response_data['model'].startswith(self.model):

devchat/prompt.py

@@ -89,6 +89,8 @@ def request_tokens(self) -> int:
 
     @property
     def response_tokens(self) -> int:
+        if not self._response_tokens:
+            self._response_tokens = self._count_response_tokens()
         return self._response_tokens
 
     @abstractmethod
@@ -189,7 +191,7 @@ def finalize_hash(self) -> str:
         if self._hash:
             return self._hash
 
-        self._count_response_tokens()
+        self._response_tokens = self._count_response_tokens()
 
         data = asdict(self)
         data.pop('_hash')

devchat/utils.py

@@ -191,7 +191,8 @@ def openai_message_tokens(message: dict, model: str) -> int:
     for key, value in message.items():
         if key == 'function_call':
             value = json.dumps(value)
-        num_tokens += len(encoding.encode(value))
+        if value:
+            num_tokens += len(encoding.encode(value))
         if key == "name":
             num_tokens += tokens_per_name
     return num_tokens

tests/test_cli_prompt.py

@@ -24,7 +24,7 @@ def test_prompt_with_content(git_repo):  # pylint: disable=W0613
 
 def test_prompt_with_temp_config_file(git_repo):
     config_data = {
-        'model': 'gpt-3.5-turbo-0301',
+        'model': 'gpt-3.5-turbo',
         'provider': 'OpenAI',
         'tokens-per-prompt': 3000,
         'OpenAI': {
@@ -110,7 +110,8 @@ def test_prompt_with_functions(git_repo, functions_file):  # pylint: disable=W06
     # call with -f option
     result = runner.invoke(main, ['prompt', '-m', 'gpt-3.5-turbo', '-f', functions_file,
                                   "What is the weather like in Boston?"])
-    print(result.output)
+    if result.exit_code:
+        print(result.output)
     assert result.exit_code == 0
     content = get_content(result.output)
     assert 'finish_reason: function_call' in content
@@ -131,6 +132,8 @@ def test_prompt_log_with_functions(git_repo, functions_file):  # pylint: disable
     # call with -f option
     result = runner.invoke(main, ['prompt', '-m', 'gpt-3.5-turbo', '-f', functions_file,
                                   'What is the weather like in Boston?'])
+    if result.exit_code:
+        print(result.output)
     assert result.exit_code == 0
     prompt_hash = get_prompt_hash(result.output)
     result = runner.invoke(main, ['log', '-t', prompt_hash])