Merge pull request #445 from ollama/mxyng/hatch

use hatch instead of poetry

Author: mxyng

.github/workflows/publish.yaml

@@ -14,14 +14,11 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - run: pipx install poetry
       - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v5
         with:
-          python-version: '3.x'
-          cache: poetry
-      - run: |
-          poetry version ${GITHUB_REF_NAME#v}
-          poetry build
+          enable-cache: true
+      - run: uv build
       - uses: pypa/gh-action-pypi-publish@release/v1
       - run: gh release upload $GITHUB_REF_NAME dist/*
         env:

.github/workflows/test.yaml

@@ -8,39 +8,29 @@ on:
 
 jobs:
   test:
-    strategy:
-      matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: pipx install poetry
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: poetry
-      - run: poetry install --with=dev
-      - run: poetry run pytest . --junitxml=junit/test-results-${{ matrix.python-version }}.xml --cov=ollama --cov-report=xml --cov-report=html
-      - uses: actions/upload-artifact@v4
+      - uses: astral-sh/setup-uv@v5
         with:
-          name: pytest-results-${{ matrix.python-version }}
-          path: junit/test-results-${{ matrix.python-version }}.xml
+          enable-cache: true
+      - run: uvx hatch test -acp
         if: ${{ always() }}
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: pipx install poetry
       - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v5
         with:
-          python-version: "3.13"
-          cache: poetry
-      - run: poetry install --with=dev
-      - run: poetry run ruff check --output-format=github .
-      - run: poetry run ruff format --check .
-      - name: check poetry.lock is up-to-date
-        run: poetry check --lock
+          enable-cache: true
+      - name: check formatting
+        run: uvx hatch fmt --check -f
+      - name: check linting
+        run: uvx hatch fmt --check -l --output-format=github
+      - name: check uv.lock is up-to-date
+        run: uv lock --check
       - name: check requirements.txt is up-to-date
         run: |
-          poetry export >requirements.txt
+          uv export >requirements.txt
           git diff --exit-code requirements.txt

examples/chat-with-history.py

@@ -23,10 +23,7 @@
   user_input = input('Chat with history: ')
   response = chat(
     'llama3.2',
-    messages=messages
-    + [
-      {'role': 'user', 'content': user_input},
-    ],
+    messages=[*messages, {'role': 'user', 'content': user_input}],
   )
 
   # Add the response to the messages to maintain the history

examples/multimodal-generate.py

@@ -8,10 +8,7 @@
 latest = httpx.get('https://xkcd.com/info.0.json')
 latest.raise_for_status()
 
-if len(sys.argv) > 1:
-  num = int(sys.argv[1])
-else:
-  num = random.randint(1, latest.json().get('num'))
+num = int(sys.argv[1]) if len(sys.argv) > 1 else random.randint(1, latest.json().get('num'))
 
 comic = httpx.get(f'https://xkcd.com/{num}/info.0.json')
 comic.raise_for_status()

ollama/_client.py

@@ -22,6 +22,7 @@
   overload,
 )
 
+import anyio
 from pydantic.json_schema import JsonSchemaValue
 
 from ollama._utils import convert_function_to_tool
@@ -75,6 +76,7 @@ def __init__(
     self,
     client,
     host: Optional[str] = None,
+    *,
     follow_redirects: bool = True,
     timeout: Any = None,
     headers: Optional[Mapping[str, str]] = None,
@@ -253,7 +255,7 @@ def generate(
         stream=stream,
         raw=raw,
         format=format,
-        images=[image for image in _copy_images(images)] if images else None,
+        images=list(_copy_images(images)) if images else None,
         options=options,
         keep_alive=keep_alive,
       ).model_dump(exclude_none=True),
@@ -336,8 +338,8 @@ def add_two_numbers(a: int, b: int) -> int:
       '/api/chat',
       json=ChatRequest(
         model=model,
-        messages=[message for message in _copy_messages(messages)],
-        tools=[tool for tool in _copy_tools(tools)],
+        messages=list(_copy_messages(messages)),
+        tools=list(_copy_tools(tools)),
         stream=stream,
         format=format,
         options=options,
@@ -756,7 +758,7 @@ async def generate(
         stream=stream,
         raw=raw,
         format=format,
-        images=[image for image in _copy_images(images)] if images else None,
+        images=list(_copy_images(images)) if images else None,
         options=options,
         keep_alive=keep_alive,
       ).model_dump(exclude_none=True),
@@ -840,8 +842,8 @@ def add_two_numbers(a: int, b: int) -> int:
       '/api/chat',
       json=ChatRequest(
         model=model,
-        messages=[message for message in _copy_messages(messages)],
-        tools=[tool for tool in _copy_tools(tools)],
+        messages=list(_copy_messages(messages)),
+        tools=list(_copy_tools(tools)),
         stream=stream,
         format=format,
         options=options,
@@ -991,7 +993,7 @@ async def create(
     parameters: Optional[Union[Mapping[str, Any], Options]] = None,
     messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,
     *,
-    stream: Literal[True] = True,
+    stream: Literal[False] = False,
   ) -> ProgressResponse: ...
 
   @overload
@@ -1054,19 +1056,19 @@ async def create(
 
   async def create_blob(self, path: Union[str, Path]) -> str:
     sha256sum = sha256()
-    with open(path, 'rb') as r:
+    async with await anyio.open_file(path, 'rb') as r:
       while True:
-        chunk = r.read(32 * 1024)
+        chunk = await r.read(32 * 1024)
         if not chunk:
           break
         sha256sum.update(chunk)
 
     digest = f'sha256:{sha256sum.hexdigest()}'
 
     async def upload_bytes():
-      with open(path, 'rb') as r:
+      async with await anyio.open_file(path, 'rb') as r:
         while True:
-          chunk = r.read(32 * 1024)
+          chunk = await r.read(32 * 1024)
           if not chunk:
             break
           yield chunk
@@ -1133,7 +1135,7 @@ def _copy_images(images: Optional[Sequence[Union[Image, Any]]]) -> Iterator[Imag
 def _copy_messages(messages: Optional[Sequence[Union[Mapping[str, Any], Message]]]) -> Iterator[Message]:
   for message in messages or []:
     yield Message.model_validate(
-      {k: [image for image in _copy_images(v)] if k == 'images' else v for k, v in dict(message).items() if v},
+      {k: list(_copy_images(v)) if k == 'images' else v for k, v in dict(message).items() if v},
     )
 
 
@@ -1143,7 +1145,7 @@ def _copy_tools(tools: Optional[Sequence[Union[Mapping[str, Any], Tool, Callable
 
 
 def _as_path(s: Optional[Union[str, PathLike]]) -> Union[Path, None]:
-  if isinstance(s, str) or isinstance(s, Path):
+  if isinstance(s, (str, Path)):
     try:
       if (p := Path(s)).exists():
         return p
@@ -1225,7 +1227,7 @@ def _parse_host(host: Optional[str]) -> str:
   elif scheme == 'https':
     port = 443
 
-  split = urllib.parse.urlsplit('://'.join([scheme, hostport]))
+  split = urllib.parse.urlsplit(f'{scheme}://{hostport}')
   host = split.hostname or '127.0.0.1'
   port = split.port or port
 

ollama/_types.py

@@ -1,3 +1,4 @@
+import contextlib
 import json
 from base64 import b64decode, b64encode
 from datetime import datetime
@@ -78,8 +79,8 @@ def __contains__(self, key: str) -> bool:
     if key in self.model_fields_set:
       return True
 
-    if key in self.model_fields:
-      return self.model_fields[key].default is not None
+    if value := self.model_fields.get(key):
+      return value.default is not None
 
     return False
 
@@ -97,7 +98,7 @@ def get(self, key: str, default: Any = None) -> Any:
     >>> msg.get('tool_calls')[0]['function']['name']
     'foo'
     """
-    return self[key] if key in self else default
+    return getattr(self, key) if hasattr(self, key) else default
 
 
 class Options(SubscriptableBaseModel):
@@ -332,7 +333,7 @@ class ChatRequest(BaseGenerateRequest):
   @model_serializer(mode='wrap')
   def serialize_model(self, nxt):
     output = nxt(self)
-    if 'tools' in output and output['tools']:
+    if output.get('tools'):
       for tool in output['tools']:
         if 'function' in tool and 'parameters' in tool['function'] and 'defs' in tool['function']['parameters']:
           tool['function']['parameters']['$defs'] = tool['function']['parameters'].pop('defs')
@@ -536,12 +537,10 @@ class ResponseError(Exception):
   """
 
   def __init__(self, error: str, status_code: int = -1):
-    try:
-      # try to parse content as JSON and extract 'error'
-      # fallback to raw content if JSON parsing fails
+    # try to parse content as JSON and extract 'error'
+    # fallback to raw content if JSON parsing fails
+    with contextlib.suppress(json.JSONDecodeError):
       error = json.loads(error).get('error', error)
-    except json.JSONDecodeError:
-      ...
 
     super().__init__(error)
     self.error = error

ollama/_utils.py

@@ -15,12 +15,12 @@ def _parse_docstring(doc_string: Union[str, None]) -> dict[str, str]:
   if not doc_string:
     return parsed_docstring
 
-  key = hash(doc_string)
+  key = str(hash(doc_string))
   for line in doc_string.splitlines():
     lowered_line = line.lower().strip()
     if lowered_line.startswith('args:'):
       key = 'args'
-    elif lowered_line.startswith('returns:') or lowered_line.startswith('yields:') or lowered_line.startswith('raises:'):
+    elif lowered_line.startswith(('returns:', 'yields:', 'raises:')):
       key = '_'
 
     else:
@@ -54,7 +54,7 @@ def _parse_docstring(doc_string: Union[str, None]) -> dict[str, str]:
 
 
 def convert_function_to_tool(func: Callable) -> Tool:
-  doc_string_hash = hash(inspect.getdoc(func))
+  doc_string_hash = str(hash(inspect.getdoc(func)))
   parsed_docstring = _parse_docstring(inspect.getdoc(func))
   schema = type(
     func.__name__,