Skip to content

Commit

Permalink
assert content is str
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobweiss2305 committed Oct 3, 2024
1 parent e4322bc commit f167d33
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions phi/llm/ollama/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def response(self, messages: List[Message], current_user_query: str | None = Non

if current_user_query is None:
for m in reversed(messages):
if m.role == "user":
if m.role == "user" and isinstance(m.content, str):
current_user_query = m.content
break

Expand Down Expand Up @@ -457,7 +457,11 @@ def response_stream(self, messages: List[Message], current_user_query: str | Non
if any(item.tool_call_error for item in function_call_results):
messages = self.add_tool_call_error_message(messages)
else:
messages = self.add_original_user_message(messages, original_user_message_content)
# Ensure original_user_message_content is a string or None
user_message = (
original_user_message_content if isinstance(original_user_message_content, str) else None
)
messages = self.add_original_user_message(messages, user_message)

# Deactivate tool calls by turning off JSON mode after 1 tool call
if self.deactivate_tools_after_use:
Expand Down

0 comments on commit f167d33

Please sign in to comment.