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

Fix tests to match new URL behavior: use complete URLs as-is

Browse Source 
- Update test expectations to provide complete URLs with /api/embeddings endpoint
- Remove assumptions about automatic URL construction per lucasgomide's feedback
- Tests now reflect the new behavior where URLs are used exactly as provided
- Maintains backward compatibility for users who provide complete URLs

Co-Authored-By: João <joao@crewai.com>
This commit is contained in:
Devin AI
2025-07-02 17:04:27 +00:00
parent 2ede9ca9be
commit b022e06e0d
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/utilities/test_ollama_embedding_configurator.py
View File

@@ -20,7 +20,7 @@ class TestOllamaEmbeddingConfigurator:
model_name="llama2" model_name="llama2"
) )
@patch.dict(os.environ, {"API_BASE": "http://custom-ollama:8080"}, clear=True) @patch.dict(os.environ, {"API_BASE": "http://custom-ollama:8080/api/embeddings"}, clear=True)
def test_ollama_respects_api_base_env_var(self): def test_ollama_respects_api_base_env_var(self):
config = {"provider": "ollama", "config": {"model": "llama2"}} config = {"provider": "ollama", "config": {"model": "llama2"}}
@@ -48,13 +48,13 @@ class TestOllamaEmbeddingConfigurator:
model_name="llama2" model_name="llama2"
) )
@patch.dict(os.environ, {"API_BASE": "http://env-ollama:8080"}, clear=True) @patch.dict(os.environ, {"API_BASE": "http://env-ollama:8080/api/embeddings"}, clear=True)
def test_ollama_config_api_base_overrides_env_var(self): def test_ollama_config_api_base_overrides_env_var(self):
config = { config = {
"provider": "ollama", "provider": "ollama",
"config": { "config": {
"model": "llama2", "model": "llama2",
"api_base": "http://config-ollama:9090" "api_base": "http://config-ollama:9090/api/embeddings"
} }
} }
@@ -72,7 +72,7 @@ class TestOllamaEmbeddingConfigurator:
"config": { "config": {
"model": "llama2", "model": "llama2",
"url": "http://url-config:1111/api/embeddings", "url": "http://url-config:1111/api/embeddings",
"api_base": "http://api-base-config:2222" "api_base": "http://api-base-config:2222/api/embeddings"
} }
} }
@@ -83,17 +83,6 @@ class TestOllamaEmbeddingConfigurator:
model_name="llama2" 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("chromadb.utils.embedding_functions.ollama_embedding_function.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) @patch.dict(os.environ, {"API_BASE": "http://localhost:11434/api/embeddings"}, clear=True)
def test_ollama_handles_full_url_in_api_base(self): def test_ollama_handles_full_url_in_api_base(self):
config = {"provider": "ollama", "config": {"model": "llama2"}} config = {"provider": "ollama", "config": {"model": "llama2"}}
@@ -105,8 +94,8 @@ class TestOllamaEmbeddingConfigurator:
model_name="llama2" model_name="llama2"
) )
@patch.dict(os.environ, {"API_BASE": "http://localhost:11434"}, clear=True) @patch.dict(os.environ, {"API_BASE": "http://localhost:11434/api/embeddings"}, clear=True)
def test_ollama_api_base_without_trailing_slash(self): def test_ollama_uses_provided_url_as_is(self):
config = {"provider": "ollama", "config": {"model": "llama2"}} config = {"provider": "ollama", "config": {"model": "llama2"}}
with patch("chromadb.utils.embedding_functions.ollama_embedding_function.OllamaEmbeddingFunction") as mock_ollama: with patch("chromadb.utils.embedding_functions.ollama_embedding_function.OllamaEmbeddingFunction") as mock_ollama:
@@ -122,7 +111,7 @@ class TestOllamaEmbeddingConfigurator:
"provider": "ollama", "provider": "ollama",
"config": { "config": {
"model": "llama2", "model": "llama2",
"api_base": "http://config-ollama:9090" "api_base": "http://config-ollama:9090/api/embeddings"
} }
} }