Skip to content
Merged
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
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
FROM python:3.9-buster
FROM python:3.9-slim-trixie

COPY pyproject.toml .
COPY uv.lock .
COPY --from=ghcr.io/astral-sh/uv:0.11.19 /uv /uvx /bin/

RUN apt-get update -y
WORKDIR /home/package

# Install uv
COPY --from=ghcr.io/astral-sh/uv:0.11.16 /uv /uvx /bin/
COPY pyproject.toml .
COPY uv.lock .

# Install dependencies
RUN uv sync --frozen --no-install-project
Comment thread
Strift marked this conversation as resolved.
6 changes: 4 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
from meilisearch.models.embedders import OpenAiEmbedder, UserProvidedEmbedder
from tests import common

TEST_TASK_TIMEOUT_MS = 30_000


@fixture(scope="session")
def client():
Expand All @@ -30,7 +32,7 @@ def _clear_indexes(meilisearch_client):
indexes = meilisearch_client.get_indexes()
for index in indexes["results"]:
task = meilisearch_client.index(index.uid).delete()
meilisearch_client.wait_for_task(task.task_uid)
meilisearch_client.wait_for_task(task.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)


@fixture(autouse=True)
Expand Down Expand Up @@ -143,7 +145,7 @@ def empty_index(client, index_uid: Optional[str] = None):

def index_maker(index_uid=index_uid):
task = client.create_index(uid=index_uid)
client.wait_for_task(task.task_uid)
client.wait_for_task(task.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
return client.get_index(uid=index_uid)

return index_maker
Expand Down
2 changes: 1 addition & 1 deletion tests/settings/test_settings_embedders.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def test_composite_embedder_format(empty_index):
}

response = index.update_embedders(composite_embedder)
update = index.wait_for_task(response.task_uid)
update = index.wait_for_task(response.task_uid, timeout_in_ms=60000)
embedders = index.get_embedders()
assert update.status == "succeeded"

Expand Down
9 changes: 5 additions & 4 deletions tests/settings/test_settings_facet_search.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
DEFAULT_FACET_SEARCH_SETTINGS_STATUS = True
ENABLED_FACET_SEARCH_SETTINGS_STATUS = True
DISABLED_FACET_SEARCH_SETTINGS_STATUS = False
TEST_TASK_TIMEOUT_MS = 30_000


def test_get_facet_search_settings(empty_index):
Expand All @@ -13,12 +14,12 @@ def test_update_facet_search_settings(empty_index):
index = empty_index()

response = index.update_facet_search_settings(DISABLED_FACET_SEARCH_SETTINGS_STATUS)
index.wait_for_task(response.task_uid)
index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
response = index.get_facet_search_settings()
assert DISABLED_FACET_SEARCH_SETTINGS_STATUS == response

response = index.update_facet_search_settings(ENABLED_FACET_SEARCH_SETTINGS_STATUS)
index.wait_for_task(response.task_uid)
index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
response = index.get_facet_search_settings()
assert ENABLED_FACET_SEARCH_SETTINGS_STATUS == response

Expand All @@ -27,12 +28,12 @@ def test_reset_facet_search_settings(empty_index):
index = empty_index()

response = index.update_facet_search_settings(DISABLED_FACET_SEARCH_SETTINGS_STATUS)
index.wait_for_task(response.task_uid)
index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
response = index.get_facet_search_settings()
assert DISABLED_FACET_SEARCH_SETTINGS_STATUS == response
assert DEFAULT_FACET_SEARCH_SETTINGS_STATUS != response

response = index.reset_facet_search_settings()
index.wait_for_task(response.task_uid)
index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
response = index.get_facet_search_settings()
assert DEFAULT_FACET_SEARCH_SETTINGS_STATUS == response
Loading