Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ollama/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ollama._client import AsyncClient, Client
from ollama._client import AsyncClient, Client, __version__
from ollama._types import (
ChatResponse,
EmbeddingsResponse,
Expand All @@ -23,6 +23,8 @@
'AsyncClient',
'ChatResponse',
'Client',
'__version__',
'version',
'EmbedResponse',
'EmbeddingsResponse',
'GenerateResponse',
Expand Down Expand Up @@ -55,5 +57,6 @@
copy = _client.copy
show = _client.show
ps = _client.ps
version = _client.version
web_search = _client.web_search
web_fetch = _client.web_fetch
15 changes: 15 additions & 0 deletions ollama/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,13 @@ def list(self) -> ListResponse:
'GET',
'/api/tags',
)

def version(self) -> str:
r = self._request_raw(
'GET',
'/api/version'
)
return r.json().get('version', '')

def delete(self, model: str) -> StatusResponse:
r = self._request_raw(
Expand Down Expand Up @@ -1270,6 +1277,14 @@ async def list(self) -> ListResponse:
'/api/tags',
)

async def version(self) -> str:
r = await self._request_raw(
'GET',
'/api/version',
)
return r.json().get('version', '')


async def delete(self, model: str) -> StatusResponse:
r = await self._request_raw(
'DELETE',
Expand Down
46 changes: 45 additions & 1 deletion tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import tempfile
from pathlib import Path
from typing import Any

import ollama
import pytest
from httpx import Response as httpxResponse
from pydantic import BaseModel
Expand Down Expand Up @@ -99,6 +99,50 @@ def test_client_chat_with_logprobs(httpserver: HTTPServer):
assert response['logprobs'][0]['top_logprobs'][1]['token'] == 'Hi'


def test_package_version():
assert hasattr(ollama, '__version__')
assert isinstance(ollama.__version__, str)
assert ollama.__version__ != ''
assert callable(ollama.version)
assert hasattr(ollama, 'version')


def test_client_version_missing_field(httpserver: HTTPServer):
httpserver.expect_ordered_request(
'/api/version',
method='GET',
).respond_with_json({})

client = Client(httpserver.url_for('/'))
response = client.version()
assert response == ''


async def test_async_client_version(httpserver: HTTPServer):
httpserver.expect_ordered_request(
'/api/version',
method='GET',
).respond_with_json(
{
'version': '0.1.0',
}
)

client = AsyncClient(httpserver.url_for('/'))
response = await client.version()
assert response == '0.1.0'
assert isinstance(response, str)

async def test_async_client_version_missing_field(httpserver: HTTPServer):
httpserver.expect_ordered_request(
'/api/version',
method='GET',
).respond_with_json({})

client = AsyncClient(httpserver.url_for('/'))
response = await client.version()
assert response == ''

def test_client_chat_stream(httpserver: HTTPServer):
def stream_handler(_: Request):
def generate():
Expand Down