Merge pull request #5 from jmorganca/mxyng

Mxyng
ollama · Jan 11, 2024 · efc7ea3 · efc7ea3
2 parents 0f9211d + 1f68bae
commit efc7ea3
Show file tree

Hide file tree

Showing 4 changed files with 319 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -68,3 +68,18 @@ async def chat():
 
 asyncio.run(chat())
 ```
+
+## Handling Errors
+
+Errors are raised if requests return an error status or if an error is detected while streaming.
+
+```python
+model = 'does-not-yet-exist'
+
+try:
+  ollama.chat(model)
+except ollama.ResponseError as e:
+  print('Error:', e.content)
+  if e.status_code == 404:
+    ollama.pull(model)
+```
diff --git a/ollama/__init__.py b/ollama/__init__.py
@@ -1,13 +1,27 @@
 from ollama._client import Client, AsyncClient
-from ollama._types import Message, Options
+from ollama._types import (
+  GenerateResponse,
+  ChatResponse,
+  ProgressResponse,
+  Message,
+  Options,
+  RequestError,
+  ResponseError,
+)
 
 __all__ = [
   'Client',
   'AsyncClient',
+  'GenerateResponse',
+  'ChatResponse',
+  'ProgressResponse',
   'Message',
   'Options',
+  'RequestError',
+  'ResponseError',
   'generate',
   'chat',
+  'embeddings',
   'pull',
   'push',
   'create',
@@ -21,6 +35,7 @@
 
 generate = _client.generate
 chat = _client.chat
+embeddings = _client.embeddings
 pull = _client.pull
 push = _client.push
 create = _client.create