Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .github/workflows/ci-matrix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI Matrix (including Windows)

on:
pull_request:
branches: [ main ]
push:
branches: [ main ]

jobs:
test:
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.11]

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt || true
- name: Run tests
run: |
# ensure a project-local temp dir to avoid AppData permission issues on Windows
python - <<'PY'
import os, pathlib
p = pathlib.Path('tmp')
p.mkdir(exist_ok=True)
os.environ['TMP'] = str(p.resolve())
os.environ['TEMP'] = str(p.resolve())
print('TMP/TEMP set to', os.environ['TMP'])
PY
pytest --basetemp=tmp/pytest --cov --cov-branch --cov-report=xml
- name: Upload coverage to Artifacts
if: always()
uses: actions/upload-artifact@v4
with:
name: coverage-xml-${{ matrix.os }}
path: coverage.xml
52 changes: 36 additions & 16 deletions tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,16 @@ def test_client_generate_images(httpserver: HTTPServer):
)

client = Client(httpserver.url_for('/'))

with tempfile.NamedTemporaryFile() as temp:
with tempfile.NamedTemporaryFile(delete=False) as temp:
temp.write(PNG_BYTES)
temp.flush()
response = client.generate('dummy', 'Why is the sky blue?', images=[temp.name])
temp_name = temp.name
try:
response = client.generate('dummy', 'Why is the sky blue?', images=[temp_name])
assert response['model'] == 'dummy'
assert response['response'] == 'Because it is.'
finally:
os.unlink(temp_name)


def test_client_generate_format_json(httpserver: HTTPServer):
Expand Down Expand Up @@ -740,20 +743,26 @@ def test_client_create_blob(httpserver: HTTPServer):
httpserver.expect_ordered_request(re.compile('^/api/blobs/sha256[:-][0-9a-fA-F]{64}$'), method='POST').respond_with_response(Response(status=201))

client = Client(httpserver.url_for('/'))

with tempfile.NamedTemporaryFile() as blob:
response = client.create_blob(blob.name)
with tempfile.NamedTemporaryFile(delete=False) as blob:
blob_name = blob.name
try:
response = client.create_blob(blob_name)
assert response == 'sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
finally:
os.unlink(blob_name)


def test_client_create_blob_exists(httpserver: HTTPServer):
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='POST').respond_with_response(Response(status=200))

client = Client(httpserver.url_for('/'))

with tempfile.NamedTemporaryFile() as blob:
response = client.create_blob(blob.name)
with tempfile.NamedTemporaryFile(delete=False) as blob:
blob_name = blob.name
try:
response = client.create_blob(blob_name)
assert response == 'sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
finally:
os.unlink(blob_name)


def test_client_delete(httpserver: HTTPServer):
Expand Down Expand Up @@ -945,13 +954,16 @@ async def test_async_client_generate_images(httpserver: HTTPServer):
)

client = AsyncClient(httpserver.url_for('/'))

with tempfile.NamedTemporaryFile() as temp:
with tempfile.NamedTemporaryFile(delete=False) as temp:
temp.write(PNG_BYTES)
temp.flush()
response = await client.generate('dummy', 'Why is the sky blue?', images=[temp.name])
temp_name = temp.name
try:
response = await client.generate('dummy', 'Why is the sky blue?', images=[temp_name])
assert response['model'] == 'dummy'
assert response['response'] == 'Because it is.'
finally:
os.unlink(temp_name)


async def test_async_client_pull(httpserver: HTTPServer):
Expand Down Expand Up @@ -1118,19 +1130,27 @@ async def test_async_client_create_blob(httpserver: HTTPServer):

client = AsyncClient(httpserver.url_for('/'))

with tempfile.NamedTemporaryFile() as blob:
response = await client.create_blob(blob.name)
with tempfile.NamedTemporaryFile(delete=False) as blob:
blob_name = blob.name
try:
response = await client.create_blob(blob_name)
assert response == 'sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
finally:
os.unlink(blob_name)


async def test_async_client_create_blob_exists(httpserver: HTTPServer):
httpserver.expect_ordered_request(PrefixPattern('/api/blobs/'), method='POST').respond_with_response(Response(status=200))

client = AsyncClient(httpserver.url_for('/'))

with tempfile.NamedTemporaryFile() as blob:
response = await client.create_blob(blob.name)
with tempfile.NamedTemporaryFile(delete=False) as blob:
blob_name = blob.name
try:
response = await client.create_blob(blob_name)
assert response == 'sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
finally:
os.unlink(blob_name)


async def test_async_client_delete(httpserver: HTTPServer):
Expand Down
17 changes: 13 additions & 4 deletions tests/test_type_serialization.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import tempfile
import os
from base64 import b64encode
from pathlib import Path

Expand Down Expand Up @@ -32,19 +33,27 @@ def test_image_serialization_plain_string():


def test_image_serialization_path():
with tempfile.NamedTemporaryFile() as temp_file:
with tempfile.NamedTemporaryFile(delete=False) as temp_file:
temp_file.write(b'test file content')
temp_file.flush()
img = Image(value=Path(temp_file.name))
temp_name = temp_file.name
try:
img = Image(value=Path(temp_name))
assert img.model_dump() == b64encode(b'test file content').decode()
finally:
os.unlink(temp_name)


def test_image_serialization_string_path():
with tempfile.NamedTemporaryFile() as temp_file:
with tempfile.NamedTemporaryFile(delete=False) as temp_file:
temp_file.write(b'test file content')
temp_file.flush()
img = Image(value=temp_file.name)
temp_name = temp_file.name
try:
img = Image(value=temp_name)
assert img.model_dump() == b64encode(b'test file content').decode()
finally:
os.unlink(temp_name)

with pytest.raises(ValueError):
img = Image(value='some_path/that/does/not/exist.png')
Expand Down