kanshan/ollama-python
1
0
Fork 0
mirror of https://github.com/ollama/ollama-python.git synced 2026-05-03 04:38:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix validation of format field to allow empty strings as it did previously (#369)

Browse Source
This commit is contained in:
Jeffrey Morgan 2024-12-07 19:37:55 -08:00 committed by GitHub
parent 4b10dee2b2
commit 1066246ab5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ollama/_client.py
View File

@ -188,7 +188,7 @@ class Client(BaseClient):
context: Optional[Sequence[int]] = None, context: Optional[Sequence[int]] = None,
stream: Literal[False] = False, stream: Literal[False] = False,
raw: bool = False, raw: bool = False,
format: Optional[Union[Literal['json'], JsonSchemaValue]] = None, format: Optional[Union[Literal['', 'json'], JsonSchemaValue]] = None,
images: Optional[Sequence[Union[str, bytes]]] = None, images: Optional[Sequence[Union[str, bytes]]] = None,
options: Optional[Union[Mapping[str, Any], Options]] = None, options: Optional[Union[Mapping[str, Any], Options]] = None,
keep_alive: Optional[Union[float, str]] = None, keep_alive: Optional[Union[float, str]] = None,
@ -206,7 +206,7 @@ class Client(BaseClient):
context: Optional[Sequence[int]] = None, context: Optional[Sequence[int]] = None,
stream: Literal[True] = True, stream: Literal[True] = True,
raw: bool = False, raw: bool = False,
format: Optional[Union[Literal['json'], JsonSchemaValue]] = None, format: Optional[Union[Literal['', 'json'], JsonSchemaValue]] = None,
images: Optional[Sequence[Union[str, bytes]]] = None, images: Optional[Sequence[Union[str, bytes]]] = None,
options: Optional[Union[Mapping[str, Any], Options]] = None, options: Optional[Union[Mapping[str, Any], Options]] = None,
keep_alive: Optional[Union[float, str]] = None, keep_alive: Optional[Union[float, str]] = None,
@ -223,7 +223,7 @@ class Client(BaseClient):
context: Optional[Sequence[int]] = None, context: Optional[Sequence[int]] = None,
stream: bool = False, stream: bool = False,
raw: Optional[bool] = None, raw: Optional[bool] = None,
format: Optional[Union[Literal['json'], JsonSchemaValue]] = None, format: Optional[Union[Literal['', 'json'], JsonSchemaValue]] = None,
images: Optional[Sequence[Union[str, bytes]]] = None, images: Optional[Sequence[Union[str, bytes]]] = None,
options: Optional[Union[Mapping[str, Any], Options]] = None, options: Optional[Union[Mapping[str, Any], Options]] = None,
keep_alive: Optional[Union[float, str]] = None, keep_alive: Optional[Union[float, str]] = None,
@ -267,7 +267,7 @@ class Client(BaseClient):
*, *,
tools: Optional[Sequence[Union[Mapping[str, Any], Tool, Callable]]] = None, tools: Optional[Sequence[Union[Mapping[str, Any], Tool, Callable]]] = None,
stream: Literal[False] = False, stream: Literal[False] = False,
format: Optional[Union[Literal['json'], JsonSchemaValue]] = None, format: Optional[Union[Literal['', 'json'], JsonSchemaValue]] = None,
options: Optional[Union[Mapping[str, Any], Options]] = None, options: Optional[Union[Mapping[str, Any], Options]] = None,
keep_alive: Optional[Union[float, str]] = None, keep_alive: Optional[Union[float, str]] = None,
) -> ChatResponse: ... ) -> ChatResponse: ...
@ -280,7 +280,7 @@ class Client(BaseClient):
*, *,
tools: Optional[Sequence[Union[Mapping[str, Any], Tool, Callable]]] = None, tools: Optional[Sequence[Union[Mapping[str, Any], Tool, Callable]]] = None,
stream: Literal[True] = True, stream: Literal[True] = True,
format: Optional[Union[Literal['json'], JsonSchemaValue]] = None, format: Optional[Union[Literal['', 'json'], JsonSchemaValue]] = None,
options: Optional[Union[Mapping[str, Any], Options]] = None, options: Optional[Union[Mapping[str, Any], Options]] = None,
keep_alive: Optional[Union[float, str]] = None, keep_alive: Optional[Union[float, str]] = None,
) -> Iterator[ChatResponse]: ... ) -> Iterator[ChatResponse]: ...
@ -292,7 +292,7 @@ class Client(BaseClient):
*, *,
tools: Optional[Sequence[Union[Mapping[str, Any], Tool, Callable]]] = None, tools: Optional[Sequence[Union[Mapping[str, Any], Tool, Callable]]] = None,
stream: bool = False, stream: bool = False,
format: Optional[Union[Literal['json'], JsonSchemaValue]] = None, format: Optional[Union[Literal['', 'json'], JsonSchemaValue]] = None,
options: Optional[Union[Mapping[str, Any], Options]] = None, options: Optional[Union[Mapping[str, Any], Options]] = None,
keep_alive: Optional[Union[float, str]] = None, keep_alive: Optional[Union[float, str]] = None,
) -> Union[ChatResponse, Iterator[ChatResponse]]: ) -> Union[ChatResponse, Iterator[ChatResponse]]:

2
ollama/_types.py
View File

@ -151,7 +151,7 @@ class BaseGenerateRequest(BaseStreamableRequest):
options: Optional[Union[Mapping[str, Any], Options]] = None options: Optional[Union[Mapping[str, Any], Options]] = None
'Options to use for the request.' 'Options to use for the request.'
format: Optional[Union[Literal['json'], JsonSchemaValue]] = None format: Optional[Union[Literal['', 'json'], JsonSchemaValue]] = None
'Format of the response.' 'Format of the response.'
keep_alive: Optional[Union[float, str]] = None keep_alive: Optional[Union[float, str]] = None