Merge pull request #41 from rachfop/patch-1

Update README.md

.github/workflows/test.yaml

@@ -17,7 +17,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: poetry
       - run: poetry install --with=dev
-      - run: poetry run ruff --output-format=github .
+      - run: poetry run ruff check --output-format=github .
+      - run: poetry run ruff format --check .
       - run: poetry run pytest . --junitxml=junit/test-results-${{ matrix.python-version }}.xml --cov=ollama --cov-report=xml --cov-report=html
       - name: check poetry.lock is up-to-date
         run: poetry check --lock

README.md

@@ -138,7 +138,7 @@ async def chat():
 asyncio.run(chat())
 ```
 
-Setting `stream=True`` modifies functions to return a Python asynchronous generator:
+Setting `stream=True` modifies functions to return a Python asynchronous generator:
 
 ```python
 import asyncio
@@ -162,7 +162,7 @@ model = 'does-not-yet-exist'
 try:
   ollama.chat(model)
 except ollama.ResponseError as e:
-  print('Error:', e.content)
+  print('Error:', e.error)
   if e.status_code == 404:
     ollama.pull(model)
 ```

ollama/_client.py

@@ -259,13 +259,16 @@ class Client(BaseClient):
     out = io.StringIO()
     for line in io.StringIO(modelfile):
       command, _, args = line.partition(' ')
-      if command.upper() in ['FROM', 'ADAPTER']:
-        path = Path(args.strip()).expanduser()
-        path = path if path.is_absolute() else base / path
-        if path.exists():
-          args = f'@{self._create_blob(path)}'
+      if command.upper() not in ['FROM', 'ADAPTER']:
+        print(line, end='', file=out)
+        continue
+
+      path = Path(args.strip()).expanduser()
+      path = path if path.is_absolute() else base / path
+      if path.exists():
+        args = f'@{self._create_blob(path)}\n'
+      print(command, args, end='', file=out)
 
-      print(command, args, file=out)
     return out.getvalue()
 
   def _create_blob(self, path: Union[str, Path]) -> str:
@@ -527,13 +530,16 @@ class AsyncClient(BaseClient):
     out = io.StringIO()
     for line in io.StringIO(modelfile):
       command, _, args = line.partition(' ')
-      if command.upper() in ['FROM', 'ADAPTER']:
-        path = Path(args).expanduser()
-        path = path if path.is_absolute() else base / path
-        if path.exists():
-          args = f'@{await self._create_blob(path)}'
+      if command.upper() not in ['FROM', 'ADAPTER']:
+        print(line, end='', file=out)
+        continue
+
+      path = Path(args.strip()).expanduser()
+      path = path if path.is_absolute() else base / path
+      if path.exists():
+        args = f'@{await self._create_blob(path)}\n'
+      print(command, args, end='', file=out)
 
-      print(command, args, file=out)
     return out.getvalue()
 
   async def _create_blob(self, path: Union[str, Path]) -> str:

tests/test_client.py

@@ -416,13 +416,61 @@ def test_client_create_modelfile(httpserver: HTTPServer):
     assert isinstance(response, dict)
 
 
+def test_client_create_modelfile_roundtrip(httpserver: HTTPServer):
+  httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='HEAD').respond_with_response(Response(status=200))
+  httpserver.expect_ordered_request(
+    '/api/create',
+    method='POST',
+    json={
+      'name': 'dummy',
+      'modelfile': '''FROM @sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+TEMPLATE """[INST] <<SYS>>{{.System}}<</SYS>>
+{{.Prompt}} [/INST]"""
+SYSTEM """
+Use
+multiline
+strings.
+"""
+PARAMETER stop [INST]
+PARAMETER stop [/INST]
+PARAMETER stop <<SYS>>
+PARAMETER stop <</SYS>>''',
+      'stream': False,
+    },
+  ).respond_with_json({})
+
+  client = Client(httpserver.url_for('/'))
+
+  with tempfile.NamedTemporaryFile() as blob:
+    response = client.create(
+      'dummy',
+      modelfile='\n'.join(
+        [
+          f'FROM {blob.name}',
+          'TEMPLATE """[INST] <<SYS>>{{.System}}<</SYS>>',
+          '{{.Prompt}} [/INST]"""',
+          'SYSTEM """',
+          'Use',
+          'multiline',
+          'strings.',
+          '"""',
+          'PARAMETER stop [INST]',
+          'PARAMETER stop [/INST]',
+          'PARAMETER stop <<SYS>>',
+          'PARAMETER stop <</SYS>>',
+        ]
+      ),
+    )
+    assert isinstance(response, dict)
+
+
 def test_client_create_from_library(httpserver: HTTPServer):
   httpserver.expect_ordered_request(
     '/api/create',
     method='POST',
     json={
       'name': 'dummy',
-      'modelfile': 'FROM llama2\n',
+      'modelfile': 'FROM llama2',
       'stream': False,
     },
   ).respond_with_json({})
@@ -820,6 +868,55 @@ async def test_async_client_create_modelfile(httpserver: HTTPServer):
     assert isinstance(response, dict)
 
 
+@pytest.mark.asyncio
+async def test_async_client_create_modelfile_roundtrip(httpserver: HTTPServer):
+  httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='HEAD').respond_with_response(Response(status=200))
+  httpserver.expect_ordered_request(
+    '/api/create',
+    method='POST',
+    json={
+      'name': 'dummy',
+      'modelfile': '''FROM @sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+TEMPLATE """[INST] <<SYS>>{{.System}}<</SYS>>
+{{.Prompt}} [/INST]"""
+SYSTEM """
+Use
+multiline
+strings.
+"""
+PARAMETER stop [INST]
+PARAMETER stop [/INST]
+PARAMETER stop <<SYS>>
+PARAMETER stop <</SYS>>''',
+      'stream': False,
+    },
+  ).respond_with_json({})
+
+  client = AsyncClient(httpserver.url_for('/'))
+
+  with tempfile.NamedTemporaryFile() as blob:
+    response = await client.create(
+      'dummy',
+      modelfile='\n'.join(
+        [
+          f'FROM {blob.name}',
+          'TEMPLATE """[INST] <<SYS>>{{.System}}<</SYS>>',
+          '{{.Prompt}} [/INST]"""',
+          'SYSTEM """',
+          'Use',
+          'multiline',
+          'strings.',
+          '"""',
+          'PARAMETER stop [INST]',
+          'PARAMETER stop [/INST]',
+          'PARAMETER stop <<SYS>>',
+          'PARAMETER stop <</SYS>>',
+        ]
+      ),
+    )
+    assert isinstance(response, dict)
+
+
 @pytest.mark.asyncio
 async def test_async_client_create_from_library(httpserver: HTTPServer):
   httpserver.expect_ordered_request(
@@ -827,7 +924,7 @@ async def test_async_client_create_from_library(httpserver: HTTPServer):
     method='POST',
     json={
       'name': 'dummy',
-      'modelfile': 'FROM llama2\n',
+      'modelfile': 'FROM llama2',
       'stream': False,
     },
   ).respond_with_json({})