chore: bump ruff and ensure imports are sorted (#385)

* chore: upgrade ruff & sort imports

Author: akx

examples/async-chat.py

@@ -1,4 +1,5 @@
 import asyncio
+
 from ollama import AsyncClient
 
 

examples/async-generate.py

@@ -1,4 +1,5 @@
 import asyncio
+
 import ollama
 
 

examples/async-structured-outputs.py

@@ -1,6 +1,8 @@
+import asyncio
+
 from pydantic import BaseModel
+
 from ollama import AsyncClient
-import asyncio
 
 
 # Define the schema for the response

examples/async-tools.py

@@ -1,6 +1,7 @@
 import asyncio
-from ollama import ChatResponse
+
 import ollama
+from ollama import ChatResponse
 
 
 def add_two_numbers(a: int, b: int) -> int:

examples/chat-stream.py

@@ -1,6 +1,5 @@
 from ollama import chat
 
-
 messages = [
   {
     'role': 'user',

examples/chat-with-history.py

@@ -1,6 +1,5 @@
 from ollama import chat
 
-
 messages = [
   {
     'role': 'user',

examples/generate-stream.py

@@ -1,5 +1,4 @@
 from ollama import generate
 
-
 for part in generate('llama3.2', 'Why is the sky blue?', stream=True):
   print(part['response'], end='', flush=True)

examples/generate.py

@@ -1,5 +1,4 @@
 from ollama import generate
 
-
 response = generate('llama3.2', 'Why is the sky blue?')
 print(response['response'])

examples/list.py

@@ -1,5 +1,4 @@
-from ollama import list
-from ollama import ListResponse
+from ollama import ListResponse, list
 
 response: ListResponse = list()
 

examples/multimodal-chat.py

@@ -1,4 +1,5 @@
 from ollama import chat
+
 # from pathlib import Path
 
 # Pass in the path to the image

examples/multimodal-generate.py

@@ -1,10 +1,10 @@
-import sys
 import random
+import sys
+
 import httpx
 
 from ollama import generate
 
-
 latest = httpx.get('https://xkcd.com/info.0.json')
 latest.raise_for_status()
 

examples/ps.py

@@ -1,5 +1,4 @@
-from ollama import ps, pull, chat
-from ollama import ProcessResponse
+from ollama import ProcessResponse, chat, ps, pull
 
 # Ensure at least one model is loaded
 response = pull('llama3.2', stream=True)

examples/pull.py

@@ -1,6 +1,6 @@
 from tqdm import tqdm
-from ollama import pull
 
+from ollama import pull
 
 current_digest, bars = '', {}
 for progress in pull('llama3.2', stream=True):

examples/structured-outputs-image.py

@@ -1,6 +1,8 @@
 from pathlib import Path
-from pydantic import BaseModel
 from typing import Literal
+
+from pydantic import BaseModel
+
 from ollama import chat
 
 

examples/structured-outputs.py

@@ -1,6 +1,7 @@
-from ollama import chat
 from pydantic import BaseModel
 
+from ollama import chat
+
 
 # Define the schema for the response
 class FriendInfo(BaseModel):

examples/tools.py

@@ -1,5 +1,4 @@
-from ollama import chat
-from ollama import ChatResponse
+from ollama import ChatResponse, chat
 
 
 def add_two_numbers(a: int, b: int) -> int:

ollama/__init__.py

@@ -1,40 +1,40 @@
-from ollama._client import Client, AsyncClient
+from ollama._client import AsyncClient, Client
 from ollama._types import (
-  Options,
-  Message,
-  Image,
-  Tool,
-  GenerateResponse,
   ChatResponse,
-  EmbedResponse,
   EmbeddingsResponse,
-  StatusResponse,
-  ProgressResponse,
+  EmbedResponse,
+  GenerateResponse,
+  Image,
   ListResponse,
-  ShowResponse,
+  Message,
+  Options,
   ProcessResponse,
+  ProgressResponse,
   RequestError,
   ResponseError,
+  ShowResponse,
+  StatusResponse,
+  Tool,
 )
 
 __all__ = [
-  'Client',
   'AsyncClient',
-  'Options',
-  'Message',
-  'Image',
-  'Tool',
-  'GenerateResponse',
   'ChatResponse',
+  'Client',
   'EmbedResponse',
   'EmbeddingsResponse',
-  'StatusResponse',
-  'ProgressResponse',
+  'GenerateResponse',
+  'Image',
   'ListResponse',
-  'ShowResponse',
+  'Message',
+  'Options',
   'ProcessResponse',
+  'ProgressResponse',
   'RequestError',
   'ResponseError',
+  'ShowResponse',
+  'StatusResponse',
+  'Tool',
 ]
 
 _client = Client()

ollama/_client.py

@@ -1,15 +1,17 @@
-import os
+import ipaddress
 import json
+import os
 import platform
-import ipaddress
+import sys
 import urllib.parse
+from hashlib import sha256
 from os import PathLike
 from pathlib import Path
-from hashlib import sha256
-
 from typing import (
   Any,
   Callable,
+  Dict,
+  List,
   Literal,
   Mapping,
   Optional,
@@ -18,21 +20,16 @@
   TypeVar,
   Union,
   overload,
-  Dict,
-  List,
 )
 
-import sys
-
 from pydantic.json_schema import JsonSchemaValue
 
-
 from ollama._utils import convert_function_to_tool
 
 if sys.version_info < (3, 9):
-  from typing import Iterator, AsyncIterator
+  from typing import AsyncIterator, Iterator
 else:
-  from collections.abc import Iterator, AsyncIterator
+  from collections.abc import AsyncIterator, Iterator
 
 from importlib import metadata
 
@@ -46,13 +43,13 @@
 from ollama._types import (
   ChatRequest,
   ChatResponse,
-  CreateRequest,
   CopyRequest,
+  CreateRequest,
   DeleteRequest,
-  EmbedRequest,
-  EmbedResponse,
   EmbeddingsRequest,
   EmbeddingsResponse,
+  EmbedRequest,
+  EmbedResponse,
   GenerateRequest,
   GenerateResponse,
   Image,
@@ -70,7 +67,6 @@
   Tool,
 )
 
-
 T = TypeVar('T')
 
 

ollama/_types.py

@@ -1,11 +1,8 @@
 import json
 from base64 import b64decode, b64encode
-from pathlib import Path
 from datetime import datetime
-from typing import Any, Mapping, Optional, Union, Sequence, Dict, List
-
-from pydantic.json_schema import JsonSchemaValue
-from typing_extensions import Annotated, Literal
+from pathlib import Path
+from typing import Any, Dict, List, Mapping, Optional, Sequence, Union
 
 from pydantic import (
   BaseModel,
@@ -14,6 +11,8 @@
   Field,
   model_serializer,
 )
+from pydantic.json_schema import JsonSchemaValue
+from typing_extensions import Annotated, Literal
 
 
 class SubscriptableBaseModel(BaseModel):

ollama/_utils.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
-from collections import defaultdict
+
 import inspect
-from typing import Callable, Union
 import re
+from collections import defaultdict
+from typing import Callable, Union
 
 import pydantic
+
 from ollama._types import Tool
 
 

poetry.lock

@@ -21,7 +21,7 @@ pytest = ">=7.4.3,<9.0.0"
 pytest-asyncio = ">=0.23.2,<0.25.0"
 pytest-cov = ">=4.1,<6.0"
 pytest-httpserver = "^1.0.8"
-ruff = ">=0.1.8,<0.8.0"
+ruff = ">=0.9.1,<0.10.0"
 
 [build-system]
 requires = ["poetry-core"]
@@ -36,8 +36,16 @@ quote-style = "single"
 indent-style = "space"
 
 [tool.ruff.lint]
-select = ["E", "F", "B"]
-ignore = ["E501"]
+select = [
+  "E", # pycodestyle errors
+  "F", # pyflakes
+  "B", # bugbear (likely bugs)
+  "I", # sort imports
+  "RUF022", # sort __all__
+]
+ignore = [
+  "E501", # line too long
+]
 
 [tool.pytest.ini_options]
 addopts = '--doctest-modules --ignore examples'