kanshan/ollama-python
1
0
Fork 0
mirror of https://github.com/ollama/ollama-python.git synced 2026-01-14 06:07:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from jmorganca/brucemacd/remote-create

Browse Source 
fix: remote create new file
This commit is contained in:
Michael Yang 2024-01-12 09:22:52 -08:00 committed by GitHub
commit fc60bd74e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ollama/_client.py
View File

@ -262,7 +262,7 @@ class Client(BaseClient):
for line in io.StringIO(modelfile):
command, _, args = line.partition(' ')
if command.upper() in ['FROM', 'ADAPTER']:
path = Path(args).expanduser()
path = Path(args.strip()).expanduser()
path = path if path.is_absolute() else base / path
if path.exists():
args = f'@{self._create_blob(path)}'
@ -288,7 +288,7 @@ class Client(BaseClient):
raise
with open(path, 'rb') as r:
self._request('PUT', f'/api/blobs/{digest}', content=r)
self._request('POST', f'/api/blobs/{digest}', content=r)
return digest
@ -563,7 +563,7 @@ class AsyncClient(BaseClient):
break
yield chunk
await self._request('PUT', f'/api/blobs/{digest}', content=upload_bytes())
await self._request('POST', f'/api/blobs/{digest}', content=upload_bytes())
return digest

4
tests/test_client.py
View File

@ -418,7 +418,7 @@ def test_client_create_from_library(httpserver: HTTPServer):
def test_client_create_blob(httpserver: HTTPServer):
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='HEAD').respond_with_response(Response(status=404))
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='PUT').respond_with_response(Response(status=201))
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='POST').respond_with_response(Response(status=201))
client = Client(httpserver.url_for('/'))
@ -759,7 +759,7 @@ async def test_async_client_create_from_library(httpserver: HTTPServer):
@pytest.mark.asyncio
async def test_async_client_create_blob(httpserver: HTTPServer):
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='HEAD').respond_with_response(Response(status=404))
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='PUT').respond_with_response(Response(status=201))
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='POST').respond_with_response(Response(status=201))
client = AsyncClient(httpserver.url_for('/'))