mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-26 19:24:27 +00:00
fix merge conflict
This commit is contained in:
parent
e7b31bb7fc
commit
205cac5f26
4 changed files with 1 additions and 5 deletions
|
@ -2451,11 +2451,7 @@ class CustomStreamWrapper:
|
|||
|
||||
def __next__(self):
|
||||
try:
|
||||
<<<<<<< HEAD
|
||||
completion_obj = {"content": "", "role": ""} # default to role being assistant
|
||||
=======
|
||||
completion_obj = {"content": ""} # default to role being assistant
|
||||
>>>>>>> 31d771b (fix streaming error)
|
||||
if self.model in litellm.anthropic_models:
|
||||
chunk = next(self.completion_stream)
|
||||
completion_obj["content"] = self.handle_anthropic_chunk(chunk)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue