From f718dab45db268bc9c5a09e1c0eab2cb30bccd59 Mon Sep 17 00:00:00 2001
From: ParthSareen <parth.sareen@ollama.com>
Date: Mon, 13 Jan 2025 14:59:14 -0800
Subject: [PATCH] Make ruff happy

---
 ollama/_types.py                 |  2 +-
 tests/test_client.py             |  5 +--
 tests/test_type_serialization.py | 77 +++++++++++---------------------
 3 files changed, 29 insertions(+), 55 deletions(-)

diff --git a/ollama/_types.py b/ollama/_types.py
index fc4e178..cb74cb6 100644
--- a/ollama/_types.py
+++ b/ollama/_types.py
@@ -405,7 +405,7 @@ class CreateRequest(BaseStreamableRequest):
   def serialize_model(self, nxt):
     output = nxt(self)
     if 'from_' in output:
-        output['from'] = output.pop('from_')
+      output['from'] = output.pop('from_')
     return output
 
   """
diff --git a/tests/test_client.py b/tests/test_client.py
index 666c7f0..7ef2aa8 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -536,7 +536,6 @@ def test_client_push_stream(httpserver: HTTPServer):
     assert part['status'] == next(it)
 
 
-
 @pytest.fixture
 def userhomedir():
   with tempfile.TemporaryDirectory() as temp:
@@ -559,7 +558,7 @@ def test_client_create_with_blob(httpserver: HTTPServer):
 
   client = Client(httpserver.url_for('/'))
 
-  with tempfile.NamedTemporaryFile() as blob:
+  with tempfile.NamedTemporaryFile():
     response = client.create('dummy', files={'test.gguf': 'sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'})
     assert response['status'] == 'success'
 
@@ -584,7 +583,7 @@ def test_client_create_with_parameters_roundtrip(httpserver: HTTPServer):
 
   client = Client(httpserver.url_for('/'))
 
-  with tempfile.NamedTemporaryFile() as blob:
+  with tempfile.NamedTemporaryFile():
     response = client.create(
       'dummy',
       quantize='q4_k_m',
diff --git a/tests/test_type_serialization.py b/tests/test_type_serialization.py
index aa02319..1ecbe08 100644
--- a/tests/test_type_serialization.py
+++ b/tests/test_type_serialization.py
@@ -54,65 +54,40 @@ def test_image_serialization_string_path():
     img.model_dump()
 
 
-
-
 def test_create_request_serialization():
-    request = CreateRequest(
-        model="test-model",
-        from_="base-model",
-        quantize="q4_0",
-        files={"file1": "content1"},
-        adapters={"adapter1": "content1"},
-        template="test template",
-        license="MIT",
-        system="test system",
-        parameters={"param1": "value1"}
-    )
-
-    serialized = request.model_dump()
-    assert serialized["from"] == "base-model"
-    assert "from_" not in serialized
-    assert serialized["quantize"] == "q4_0"
-    assert serialized["files"] == {"file1": "content1"}
-    assert serialized["adapters"] == {"adapter1": "content1"}
-    assert serialized["template"] == "test template"
-    assert serialized["license"] == "MIT"
-    assert serialized["system"] == "test system"
-    assert serialized["parameters"] == {"param1": "value1"}
+  request = CreateRequest(model='test-model', from_='base-model', quantize='q4_0', files={'file1': 'content1'}, adapters={'adapter1': 'content1'}, template='test template', license='MIT', system='test system', parameters={'param1': 'value1'})
 
+  serialized = request.model_dump()
+  assert serialized['from'] == 'base-model'
+  assert 'from_' not in serialized
+  assert serialized['quantize'] == 'q4_0'
+  assert serialized['files'] == {'file1': 'content1'}
+  assert serialized['adapters'] == {'adapter1': 'content1'}
+  assert serialized['template'] == 'test template'
+  assert serialized['license'] == 'MIT'
+  assert serialized['system'] == 'test system'
+  assert serialized['parameters'] == {'param1': 'value1'}
 
 
 def test_create_request_serialization_exclude_none_true():
-    request = CreateRequest(
-        model="test-model",
-        from_=None,
-        quantize=None
-    )
-    serialized = request.model_dump(exclude_none=True)
-    assert serialized == {"model": "test-model"}
-    assert "from" not in serialized
-    assert "from_" not in serialized
-    assert "quantize" not in serialized
+  request = CreateRequest(model='test-model', from_=None, quantize=None)
+  serialized = request.model_dump(exclude_none=True)
+  assert serialized == {'model': 'test-model'}
+  assert 'from' not in serialized
+  assert 'from_' not in serialized
+  assert 'quantize' not in serialized
 
 
 def test_create_request_serialization_exclude_none_false():
-    request = CreateRequest(
-        model="test-model",
-        from_=None,
-        quantize=None
-    )
-    serialized = request.model_dump(exclude_none=False)
-    assert "from" in serialized
-    assert "quantize" in serialized
-    assert "adapters" in serialized
-    assert "from_" not in serialized
+  request = CreateRequest(model='test-model', from_=None, quantize=None)
+  serialized = request.model_dump(exclude_none=False)
+  assert 'from' in serialized
+  assert 'quantize' in serialized
+  assert 'adapters' in serialized
+  assert 'from_' not in serialized
 
 
 def test_create_request_serialization_license_list():
-    request = CreateRequest(
-        model="test-model",
-        license=["MIT", "Apache-2.0"]
-    )
-    serialized = request.model_dump()
-    assert serialized["license"] == ["MIT", "Apache-2.0"]
-
+  request = CreateRequest(model='test-model', license=['MIT', 'Apache-2.0'])
+  serialized = request.model_dump()
+  assert serialized['license'] == ['MIT', 'Apache-2.0']