andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-01-12 01:28:30 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix Ollama embedding configurator to respect API_BASE environment variable

Browse Source 
- Add support for API_BASE environment variable in _configure_ollama method
- Implement priority order: url config > api_base config > API_BASE env var > default
- Handle URL construction with proper /api/embeddings endpoint appending
- Maintain backward compatibility with existing url parameter
- Add comprehensive tests covering all configuration scenarios
- Fixes issue #3099: Ollama integration problems with API_BASE configuration

The fix ensures consistent behavior with other embedding providers and
allows users to configure Ollama embeddings using environment variables
for better deployment flexibility.

Co-Authored-By: João <joao@crewai.com>
This commit is contained in:
Devin AI
2025-07-01 22:01:45 +00:00
parent 640e1a7bc2
commit d422439b7a
2 changed files with 148 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/crewai/utilities/embedding_configurator.py
View File

@@ -97,8 +97,22 @@ class EmbeddingConfigurator:
OllamaEmbeddingFunction,
)
url = (
config.get("url")
or config.get("api_base")
or os.getenv("API_BASE")
)
if url and not url.endswith("/api/embeddings"):
if not url.endswith("/"):
url += "/"
url += "api/embeddings"
if not url:
url = "http://localhost:11434/api/embeddings"
return OllamaEmbeddingFunction(
url=config.get("url", "http://localhost:11434/api/embeddings"),
url=url,
model_name=model_name,
)

133
tests/utilities/test_ollama_embedding_configurator.py Normal file
View File

@@ -0,0 +1,133 @@
import os
import pytest
from unittest.mock import patch, MagicMock
from crewai.utilities.embedding_configurator import EmbeddingConfigurator
class TestOllamaEmbeddingConfigurator:
def setup_method(self):
self.configurator = EmbeddingConfigurator()
@patch.dict(os.environ, {}, clear=True)
def test_ollama_default_url(self):
config = {"provider": "ollama", "config": {"model": "llama2"}}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://localhost:11434/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {"API_BASE": "http://custom-ollama:8080"}, clear=True)
def test_ollama_respects_api_base_env_var(self):
config = {"provider": "ollama", "config": {"model": "llama2"}}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://custom-ollama:8080/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {"API_BASE": "http://env-ollama:8080"}, clear=True)
def test_ollama_config_url_overrides_env_var(self):
config = {
"provider": "ollama",
"config": {
"model": "llama2",
"url": "http://config-ollama:9090/api/embeddings"
}
}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://config-ollama:9090/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {"API_BASE": "http://env-ollama:8080"}, clear=True)
def test_ollama_config_api_base_overrides_env_var(self):
config = {
"provider": "ollama",
"config": {
"model": "llama2",
"api_base": "http://config-ollama:9090"
}
}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://config-ollama:9090/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {}, clear=True)
def test_ollama_url_priority_order(self):
config = {
"provider": "ollama",
"config": {
"model": "llama2",
"url": "http://url-config:1111/api/embeddings",
"api_base": "http://api-base-config:2222"
}
}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://url-config:1111/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {"API_BASE": "http://localhost:11434/"}, clear=True)
def test_ollama_handles_trailing_slash_in_api_base(self):
config = {"provider": "ollama", "config": {"model": "llama2"}}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://localhost:11434/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {"API_BASE": "http://localhost:11434/api/embeddings"}, clear=True)
def test_ollama_handles_full_url_in_api_base(self):
config = {"provider": "ollama", "config": {"model": "llama2"}}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://localhost:11434/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {"API_BASE": "http://localhost:11434"}, clear=True)
def test_ollama_api_base_without_trailing_slash(self):
config = {"provider": "ollama", "config": {"model": "llama2"}}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://localhost:11434/api/embeddings",
model_name="llama2"
)
@patch.dict(os.environ, {}, clear=True)
def test_ollama_config_api_base_without_url(self):
config = {
"provider": "ollama",
"config": {
"model": "llama2",
"api_base": "http://config-ollama:9090"
}
}
with patch("crewai.utilities.embedding_configurator.OllamaEmbeddingFunction") as mock_ollama:
self.configurator.configure_embedder(config)
mock_ollama.assert_called_once_with(
url="http://config-ollama:9090/api/embeddings",
model_name="llama2"
)