From c7d4f1674ac30a01e94e6adb22fb292df1196571 Mon Sep 17 00:00:00 2001 From: ParthSareen Date: Mon, 13 Jan 2025 17:23:38 -0800 Subject: [PATCH] Revert "make 3.8 happy" This reverts commit ba27e71a20c42a0804cdb874498d4265f5d914db. --- ollama/_client.py | 48 ++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/ollama/_client.py b/ollama/_client.py index 50e7ec4..0bd8598 100644 --- a/ollama/_client.py +++ b/ollama/_client.py @@ -18,8 +18,6 @@ from typing import ( TypeVar, Union, overload, - Dict, - List, ) import sys @@ -478,10 +476,10 @@ class Client(BaseClient): model: str, quantize: Optional[str] = None, from_: Optional[str] = None, - files: Optional[Dict[str, str]] = None, - adapters: Optional[Dict[str, str]] = None, + files: Optional[dict[str, str]] = None, + adapters: Optional[dict[str, str]] = None, template: Optional[str] = None, - license: Optional[Union[str, List[str]]] = None, + license: Optional[Union[str, list[str]]] = None, system: Optional[str] = None, parameters: Optional[Union[Mapping[str, Any], Options]] = None, messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None, @@ -495,10 +493,26 @@ class Client(BaseClient): model: str, quantize: Optional[str] = None, from_: Optional[str] = None, - files: Optional[Dict[str, str]] = None, - adapters: Optional[Dict[str, str]] = None, + files: Optional[dict[str, str]] = None, + adapters: Optional[dict[str, str]] = None, template: Optional[str] = None, - license: Optional[Union[str, List[str]]] = None, + license: Optional[Union[str, list[str]]] = None, + system: Optional[str] = None, + parameters: Optional[Union[Mapping[str, Any], Options]] = None, + messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None, + *, + stream: Literal[True] = True, + ) -> Iterator[ProgressResponse]: ... + + def create( + self, + model: str, + quantize: Optional[str] = None, + from_: Optional[str] = None, + files: Optional[dict[str, str]] = None, + adapters: Optional[dict[str, str]] = None, + template: Optional[str] = None, + license: Optional[Union[str, list[str]]] = None, system: Optional[str] = None, parameters: Optional[Union[Mapping[str, Any], Options]] = None, messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None, @@ -964,10 +978,10 @@ class AsyncClient(BaseClient): model: str, quantize: Optional[str] = None, from_: Optional[str] = None, - files: Optional[Dict[str, str]] = None, - adapters: Optional[Dict[str, str]] = None, + files: Optional[dict[str, str]] = None, + adapters: Optional[dict[str, str]] = None, template: Optional[str] = None, - license: Optional[Union[str, List[str]]] = None, + license: Optional[Union[str, list[str]]] = None, system: Optional[str] = None, parameters: Optional[Union[Mapping[str, Any], Options]] = None, messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None, @@ -981,10 +995,10 @@ class AsyncClient(BaseClient): model: str, quantize: Optional[str] = None, from_: Optional[str] = None, - files: Optional[Dict[str, str]] = None, - adapters: Optional[Dict[str, str]] = None, + files: Optional[dict[str, str]] = None, + adapters: Optional[dict[str, str]] = None, template: Optional[str] = None, - license: Optional[Union[str, List[str]]] = None, + license: Optional[Union[str, list[str]]] = None, system: Optional[str] = None, parameters: Optional[Union[Mapping[str, Any], Options]] = None, messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None, @@ -997,10 +1011,10 @@ class AsyncClient(BaseClient): model: str, quantize: Optional[str] = None, from_: Optional[str] = None, - files: Optional[Dict[str, str]] = None, - adapters: Optional[Dict[str, str]] = None, + files: Optional[dict[str, str]] = None, + adapters: Optional[dict[str, str]] = None, template: Optional[str] = None, - license: Optional[Union[str, List[str]]] = None, + license: Optional[Union[str, list[str]]] = None, system: Optional[str] = None, parameters: Optional[Union[Mapping[str, Any], Options]] = None, messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,