obscura/ollama-python
1
0
Fork 0
mirror of https://github.com/ollama/ollama-python.git synced 2026-10-01 22:57:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #118 from DSLstandard/fix-content-check

Browse Source 
fix 'content' check on messages in chat()
This commit is contained in:
Michael Yang
2024-04-24 17:12:41 -07:00
committed by GitHub
parent d38fe129c3 dc9543ba5f
commit 5b94a8d872
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ollama/_client.py
+2 -2
View File
@@ -169,7 +169,7 @@ class Client(BaseClient):
raise TypeError('messages must be a list of Message or dict-like objects') raise TypeError('messages must be a list of Message or dict-like objects')
if not (role := message.get('role')) or role not in ['system', 'user', 'assistant']: if not (role := message.get('role')) or role not in ['system', 'user', 'assistant']:
raise RequestError('messages must contain a role and it must be one of "system", "user", or "assistant"') raise RequestError('messages must contain a role and it must be one of "system", "user", or "assistant"')
if not message.get('content'): if 'content' not in message:
raise RequestError('messages must contain content') raise RequestError('messages must contain content')
if images := message.get('images'): if images := message.get('images'):
message['images'] = [_encode_image(image) for image in images] message['images'] = [_encode_image(image) for image in images]
@@ -449,7 +449,7 @@ class AsyncClient(BaseClient):
raise TypeError('messages must be a list of strings') raise TypeError('messages must be a list of strings')
if not (role := message.get('role')) or role not in ['system', 'user', 'assistant']: if not (role := message.get('role')) or role not in ['system', 'user', 'assistant']:
raise RequestError('messages must contain a role and it must be one of "system", "user", or "assistant"') raise RequestError('messages must contain a role and it must be one of "system", "user", or "assistant"')
if not message.get('content'): if 'content' not in message:
raise RequestError('messages must contain content') raise RequestError('messages must contain content')
if images := message.get('images'): if images := message.get('images'):
message['images'] = [_encode_image(image) for image in images] message['images'] = [_encode_image(image) for image in images]