Skip to content

[python] Remove Python-3.10-only Ollama auto-pull block in integration tests #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenjin272 merged 2 commits into from
Jun 11, 2026
Merged

[python] Remove Python-3.10-only Ollama auto-pull block in integration tests #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c1aa25
[python] Remove dead Python-3.10-only Ollama auto-pull from integrati…
weiqingy Jun 10, 2026
3b8d9e1
[python] Address review: pull Ollama test models via pull_model
weiqingy Jun 11, 2026
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
40 changes: 0 additions & 40 deletions python/flink_agents/integrations/chat_models/tests/start_ollama_server.sh
View file
Open in desktop

This file was deleted.

30 changes: 3 additions & 27 deletions python/flink_agents/integrations/chat_models/tests/test_ollama_chat_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,14 @@
# limitations under the License.
#################################################################################
import os
import subprocess
import sys
from pathlib import Path
from unittest.mock import MagicMock

import pytest
from ollama import Client

from flink_agents.api.chat_message import ChatMessage, MessageRole
from flink_agents.api.resource import Resource, ResourceType
from flink_agents.api.resource_context import ResourceContext
from flink_agents.e2e_tests.test_utils import pull_model
from flink_agents.integrations.chat_models.ollama_chat_model import (
OllamaChatModelConnection,
OllamaChatModelSetup,
Expand All @@ -37,29 +34,8 @@
pytestmark = pytest.mark.integration

test_model = os.environ.get("OLLAMA_CHAT_MODEL", "qwen3:1.7b")
current_dir = Path(__file__).parent

try:
# only auto setup ollama in ci with python 3.10 to reduce ci cost.
if "3.10" in sys.version:
subprocess.run(
["bash", f"{current_dir}/start_ollama_server.sh", test_model],
timeout=300,
check=True,
)

@wenjin272 wenjin272 Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The script start_ollama_server.sh installs the Ollama server and pulls the required models. After moving the integration tests into the it-python pipeline, we no longer need to install the Ollama server separately; however, we still need to pull the test models being used. We can use the pull_model method in test_utils.py.

@weiqingy weiqingy Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch -tools/start_ollama_server.sh only installs the server; it doesn't pull models, so after dropping the inline block these tests would skip on a missing model in CI rather than actually run.

Switched both files to client = pull_model(test_model) from e2e_tests/test_utils.py — the same helper the e2e integration tests already use. It pulls the model and returns the client (or None), so the existing skipif(client is None) guard is unchanged. Also dropped the now-unused from ollama import Client.

Verified locally: the embedding test now runs instead of skipping. Fixed in 3b8d9e1.

client = Client()
models = client.list()

model_found = False
for model in models["models"]:
if model.model == test_model:
model_found = True
break

if not model_found:
client = None # type: ignore
except Exception:
client = None # type: ignore

client = pull_model(test_model)


@pytest.mark.skipif(
Expand Down
39 changes: 0 additions & 39 deletions python/flink_agents/integrations/embedding_models/local/tests/start_ollama_server.sh
View file
Open in desktop

This file was deleted.

26 changes: 2 additions & 24 deletions python/flink_agents/integrations/embedding_models/local/tests/test_ollama_embedding_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@
# limitations under the License.
################################################################################
import os
import subprocess
import sys
from pathlib import Path
from unittest.mock import MagicMock

import pytest
from ollama import Client

from flink_agents.api.resource import Resource, ResourceType
from flink_agents.api.resource_context import ResourceContext
from flink_agents.e2e_tests.test_utils import pull_model
from flink_agents.integrations.embedding_models.local.ollama_embedding_model import (
OllamaEmbeddingModelConnection,
OllamaEmbeddingModelSetup,
Expand All @@ -34,27 +31,8 @@
pytestmark = pytest.mark.integration

test_model = os.environ.get("OLLAMA_EMBEDDING_MODEL", "all-minilm:22m")
current_dir = Path(__file__).parent

try:
# only auto setup ollama in ci with python 3.10 to reduce ci cost.
if "3.10" in sys.version:
subprocess.run(
["bash", f"{current_dir}/start_ollama_server.sh"], timeout=300, check=True
)

@wenjin272 wenjin272 Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

@weiqingy weiqingy Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done here too — same pull_model(test_model) switch as the chat test. 3b8d9e1

client = Client()
models = client.list()

model_found = False
for model in models["models"]:
if model.model == test_model:
model_found = True
break

if not model_found:
client = None # type: ignore
except Exception:
client = None # type: ignore
client = pull_model(test_model)


@pytest.mark.skipif(
Expand Down
Loading