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
82 changes: 43 additions & 39 deletions ollama/__init__.py
Original file line number Diff line number Diff line change
@@ -1,44 +1,49 @@
from importlib.metadata import version as _pkg_version
from ollama._client import AsyncClient, Client
from ollama._types import (
ChatResponse,
EmbeddingsResponse,
EmbedResponse,
GenerateResponse,
Image,
ListResponse,
Message,
Options,
ProcessResponse,
ProgressResponse,
RequestError,
ResponseError,
ShowResponse,
StatusResponse,
Tool,
WebFetchResponse,
WebSearchResponse,
ChatResponse,
EmbeddingsResponse,
EmbedResponse,
GenerateResponse,
Image,
ListResponse,
Message,
Options,
ProcessResponse,
ProgressResponse,
RequestError,
ResponseError,
ShowResponse,
StatusResponse,
Tool,
WebFetchResponse,
WebSearchResponse,
)

__version__ = _pkg_version('ollama')

__all__ = [
'AsyncClient',
'ChatResponse',
'Client',
'EmbedResponse',
'EmbeddingsResponse',
'GenerateResponse',
'Image',
'ListResponse',
'Message',
'Options',
'ProcessResponse',
'ProgressResponse',
'RequestError',
'ResponseError',
'ShowResponse',
'StatusResponse',
'Tool',
'WebFetchResponse',
'WebSearchResponse',
'AsyncClient',
'ChatResponse',
'Client',
'EmbedResponse',
'EmbeddingsResponse',
'GenerateResponse',
'Image',
'ListResponse',
'Message',
'Options',
'ProcessResponse',
'ProgressResponse',
'RequestError',
'ResponseError',
'ShowResponse',
'StatusResponse',
'Tool',
'WebFetchResponse',
'WebSearchResponse',
'__version__',
'version',
]

_client = Client()
Expand All @@ -52,8 +57,7 @@
create = _client.create
delete = _client.delete
list = _client.list
copy = _client.copy
show = _client.show
copy = _client.copy
ps = _client.ps
web_search = _client.web_search
web_fetch = _client.web_fetch
version = _client.version # Expose the version method for users to check the Ollama version
6 changes: 6 additions & 0 deletions ollama/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,9 @@ def ps(self) -> ProcessResponse:
'GET',
'/api/ps',
)
def version(self) -> str:
response = self._request_raw('GET', '/api/version')
return response.json().get('version', '')

def web_search(self, query: str, max_results: int = 3) -> WebSearchResponse:
"""
Expand Down Expand Up @@ -1311,6 +1314,9 @@ async def ps(self) -> ProcessResponse:
'GET',
'/api/ps',
)
async def version(self) -> str:
response = await self._request_raw('GET', '/api/version')
return response.json().get('version', '')


def _copy_images(images: Optional[Sequence[Union[Image, Any]]]) -> Iterator[Image]:
Expand Down