Skip to content

Commit 2cad1f5

Browse files
pdevinepdevine
authored
Merge pull request #417 from ollama/pdevine/create-api
add create api changes
2 parents ee349ec + d9746ea commit 2cad1f5

File tree

6 files changed

+218
-302
lines changed

6 files changed

+218
-302
lines changed

‎ollama/_client.py‎

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
import io
32
import json
43
import platform
54
import ipaddress
@@ -19,6 +18,8 @@
1918
TypeVar,
2019
Union,
2120
overload,
21+
Dict,
22+
List,
2223
)
2324

2425
import sys
@@ -62,7 +63,6 @@
6263
ProgressResponse,
6364
PullRequest,
6465
PushRequest,
65-
RequestError,
6666
ResponseError,
6767
ShowRequest,
6868
ShowResponse,
@@ -476,77 +476,77 @@ def push(
476476
def create(
477477
self,
478478
model: str,
479-
path: Optional[Union[str, PathLike]] = None,
480-
modelfile: Optional[str] = None,
481-
*,
482479
quantize: Optional[str] = None,
480+
from_: Optional[str] = None,
481+
files: Optional[Dict[str, str]] = None,
482+
adapters: Optional[Dict[str, str]] = None,
483+
template: Optional[str] = None,
484+
license: Optional[Union[str, List[str]]] = None,
485+
system: Optional[str] = None,
486+
parameters: Optional[Union[Mapping[str, Any], Options]] = None,
487+
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,
488+
*,
483489
stream: Literal[False] = False,
484490
) -> ProgressResponse: ...
485491

486492
@overload
487493
def create(
488494
self,
489495
model: str,
490-
path: Optional[Union[str, PathLike]] = None,
491-
modelfile: Optional[str] = None,
492-
*,
493496
quantize: Optional[str] = None,
497+
from_: Optional[str] = None,
498+
files: Optional[Dict[str, str]] = None,
499+
adapters: Optional[Dict[str, str]] = None,
500+
template: Optional[str] = None,
501+
license: Optional[Union[str, List[str]]] = None,
502+
system: Optional[str] = None,
503+
parameters: Optional[Union[Mapping[str, Any], Options]] = None,
504+
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,
505+
*,
494506
stream: Literal[True] = True,
495507
) -> Iterator[ProgressResponse]: ...
496508

497509
def create(
498510
self,
499511
model: str,
500-
path: Optional[Union[str, PathLike]] = None,
501-
modelfile: Optional[str] = None,
502-
*,
503512
quantize: Optional[str] = None,
513+
from_: Optional[str] = None,
514+
files: Optional[Dict[str, str]] = None,
515+
adapters: Optional[Dict[str, str]] = None,
516+
template: Optional[str] = None,
517+
license: Optional[Union[str, List[str]]] = None,
518+
system: Optional[str] = None,
519+
parameters: Optional[Union[Mapping[str, Any], Options]] = None,
520+
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,
521+
*,
504522
stream: bool = False,
505523
) -> Union[ProgressResponse, Iterator[ProgressResponse]]:
506524
"""
507525
Raises `ResponseError` if the request could not be fulfilled.
508526
509527
Returns `ProgressResponse` if `stream` is `False`, otherwise returns a `ProgressResponse` generator.
510528
"""
511-
if (realpath := _as_path(path)) and realpath.exists():
512-
modelfile = self._parse_modelfile(realpath.read_text(), base=realpath.parent)
513-
elif modelfile:
514-
modelfile = self._parse_modelfile(modelfile)
515-
else:
516-
raise RequestError('must provide either path or modelfile')
517-
518529
return self._request(
519530
ProgressResponse,
520531
'POST',
521532
'/api/create',
522533
json=CreateRequest(
523534
model=model,
524-
modelfile=modelfile,
525535
stream=stream,
526536
quantize=quantize,
537+
from_=from_,
538+
files=files,
539+
adapters=adapters,
540+
license=license,
541+
template=template,
542+
system=system,
543+
parameters=parameters,
544+
messages=messages,
527545
).model_dump(exclude_none=True),
528546
stream=stream,
529547
)
530548

531-
def _parse_modelfile(self, modelfile: str, base: Optional[Path] = None) -> str:
532-
base = Path.cwd() if base is None else base
533-
534-
out = io.StringIO()
535-
for line in io.StringIO(modelfile):
536-
command, _, args = line.partition(' ')
537-
if command.upper() not in ['FROM', 'ADAPTER']:
538-
print(line, end='', file=out)
539-
continue
540-
541-
path = Path(args.strip()).expanduser()
542-
path = path if path.is_absolute() else base / path
543-
if path.exists():
544-
args = f'@{self._create_blob(path)}\n'
545-
print(command, args, end='', file=out)
546-
547-
return out.getvalue()
548-
549-
def _create_blob(self, path: Union[str, Path]) -> str:
549+
def create_blob(self, path: Union[str, Path]) -> str:
550550
sha256sum = sha256()
551551
with open(path, 'rb') as r:
552552
while True:
@@ -978,77 +978,78 @@ async def push(
978978
async def create(
979979
self,
980980
model: str,
981-
path: Optional[Union[str, PathLike]] = None,
982-
modelfile: Optional[str] = None,
983-
*,
984981
quantize: Optional[str] = None,
985-
stream: Literal[False] = False,
982+
from_: Optional[str] = None,
983+
files: Optional[Dict[str, str]] = None,
984+
adapters: Optional[Dict[str, str]] = None,
985+
template: Optional[str] = None,
986+
license: Optional[Union[str, List[str]]] = None,
987+
system: Optional[str] = None,
988+
parameters: Optional[Union[Mapping[str, Any], Options]] = None,
989+
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,
990+
*,
991+
stream: Literal[True] = True,
986992
) -> ProgressResponse: ...
987993

988994
@overload
989995
async def create(
990996
self,
991997
model: str,
992-
path: Optional[Union[str, PathLike]] = None,
993-
modelfile: Optional[str] = None,
994-
*,
995998
quantize: Optional[str] = None,
999+
from_: Optional[str] = None,
1000+
files: Optional[Dict[str, str]] = None,
1001+
adapters: Optional[Dict[str, str]] = None,
1002+
template: Optional[str] = None,
1003+
license: Optional[Union[str, List[str]]] = None,
1004+
system: Optional[str] = None,
1005+
parameters: Optional[Union[Mapping[str, Any], Options]] = None,
1006+
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,
1007+
*,
9961008
stream: Literal[True] = True,
9971009
) -> AsyncIterator[ProgressResponse]: ...
9981010

9991011
async def create(
10001012
self,
10011013
model: str,
1002-
path: Optional[Union[str, PathLike]] = None,
1003-
modelfile: Optional[str] = None,
1004-
*,
10051014
quantize: Optional[str] = None,
1015+
from_: Optional[str] = None,
1016+
files: Optional[Dict[str, str]] = None,
1017+
adapters: Optional[Dict[str, str]] = None,
1018+
template: Optional[str] = None,
1019+
license: Optional[Union[str, List[str]]] = None,
1020+
system: Optional[str] = None,
1021+
parameters: Optional[Union[Mapping[str, Any], Options]] = None,
1022+
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None,
1023+
*,
10061024
stream: bool = False,
10071025
) -> Union[ProgressResponse, AsyncIterator[ProgressResponse]]:
10081026
"""
10091027
Raises `ResponseError` if the request could not be fulfilled.
10101028
10111029
Returns `ProgressResponse` if `stream` is `False`, otherwise returns a `ProgressResponse` generator.
10121030
"""
1013-
if (realpath := _as_path(path)) and realpath.exists():
1014-
modelfile = await self._parse_modelfile(realpath.read_text(), base=realpath.parent)
1015-
elif modelfile:
1016-
modelfile = await self._parse_modelfile(modelfile)
1017-
else:
1018-
raise RequestError('must provide either path or modelfile')
10191031

10201032
return await self._request(
10211033
ProgressResponse,
10221034
'POST',
10231035
'/api/create',
10241036
json=CreateRequest(
10251037
model=model,
1026-
modelfile=modelfile,
10271038
stream=stream,
10281039
quantize=quantize,
1040+
from_=from_,
1041+
files=files,
1042+
adapters=adapters,
1043+
license=license,
1044+
template=template,
1045+
system=system,
1046+
parameters=parameters,
1047+
messages=messages,
10291048
).model_dump(exclude_none=True),
10301049
stream=stream,
10311050
)
10321051

1033-
async def _parse_modelfile(self, modelfile: str, base: Optional[Path] = None) -> str:
1034-
base = Path.cwd() if base is None else base
1035-
1036-
out = io.StringIO()
1037-
for line in io.StringIO(modelfile):
1038-
command, _, args = line.partition(' ')
1039-
if command.upper() not in ['FROM', 'ADAPTER']:
1040-
print(line, end='', file=out)
1041-
continue
1042-
1043-
path = Path(args.strip()).expanduser()
1044-
path = path if path.is_absolute() else base / path
1045-
if path.exists():
1046-
args = f'@{await self._create_blob(path)}\n'
1047-
print(command, args, end='', file=out)
1048-
1049-
return out.getvalue()
1050-
1051-
async def _create_blob(self, path: Union[str, Path]) -> str:
1052+
async def create_blob(self, path: Union[str, Path]) -> str:
10521053
sha256sum = sha256()
10531054
with open(path, 'rb') as r:
10541055
while True:

‎ollama/_types.py‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from base64 import b64decode, b64encode
33
from pathlib import Path
44
from datetime import datetime
5-
from typing import Any, Mapping, Optional, Union, Sequence
5+
from typing import Any, Mapping, Optional, Union, Sequence, Dict, List
66

77
from pydantic.json_schema import JsonSchemaValue
88
from typing_extensions import Annotated, Literal
@@ -401,13 +401,25 @@ class PushRequest(BaseStreamableRequest):
401401

402402

403403
class CreateRequest(BaseStreamableRequest):
404+
@model_serializer(mode='wrap')
405+
def serialize_model(self, nxt):
406+
output = nxt(self)
407+
if 'from_' in output:
408+
output['from'] = output.pop('from_')
409+
return output
410+
404411
"""
405412
Request to create a new model.
406413
"""
407-
408-
modelfile: Optional[str] = None
409-
410414
quantize: Optional[str] = None
415+
from_: Optional[str] = None
416+
files: Optional[Dict[str, str]] = None
417+
adapters: Optional[Dict[str, str]] = None
418+
template: Optional[str] = None
419+
license: Optional[Union[str, List[str]]] = None
420+
system: Optional[str] = None
421+
parameters: Optional[Union[Mapping[str, Any], Options]] = None
422+
messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None
411423

412424

413425
class ModelDetails(SubscriptableBaseModel):

0 commit comments

Comments
 (0)