Skip to content

armgit / dspy

Public Imported from GitHub
0

DSPy: The framework for programming—not prompting—language models

Python

Async fixes (#8110)

Chen Qiana6cdfa70f60e
diff --git a/dspy/clients/embedding.py b/dspy/clients/embedding.py
index 8d1a41eed..70af16d15 100644
--- a/dspy/clients/embedding.py
+++ b/dspy/clients/embedding.py
@@ -141,7 +141,7 @@ class Embedder:
acompute_embeddings = _cached_acompute_embeddings if caching else _acompute_embeddings
for batch in input_batches:
- embeddings_list.extend(acompute_embeddings(self.model, batch, caching=caching, **kwargs))
+ embeddings_list.extend(await acompute_embeddings(self.model, batch, caching=caching, **kwargs))
return self._postprocess(embeddings_list, is_single_input)
diff --git a/dspy/clients/lm.py b/dspy/clients/lm.py
index d092808b1..12068aeb0 100644
--- a/dspy/clients/lm.py
+++ b/dspy/clients/lm.py
@@ -125,6 +125,7 @@ class LM(BaseLM):
async def aforward(self, prompt=None, messages=None, **kwargs):
completion = alitellm_completion if self.model_type == "chat" else alitellm_text_completion
+ messages = messages or [{"role": "user", "content": prompt}]
results = await completion(
request=dict(model=self.model, messages=messages, **kwargs),
num_retries=self.num_retries,
diff --git a/pyproject.toml b/pyproject.toml
index f5d5cbbcc..27d37a706 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,6 +54,7 @@ aws = ["boto3~=1.34.78"]
dev = [
"pytest>=6.2.5",
"pytest-mock>=3.12.0",
+ "pytest-asyncio>=0.26.0",
"ruff>=0.3.0",
"pre-commit>=3.7.0",
"pillow>=10.1.0",
diff --git a/tests/clients/test_embedding.py b/tests/clients/test_embedding.py
index 625c7fc77..81263b76c 100644
--- a/tests/clients/test_embedding.py
+++ b/tests/clients/test_embedding.py
@@ -116,7 +116,7 @@ async def test_async_embedding():
result = await embedding.acall(inputs)
# Verify litellm was called with correct parameters.
- mock_litellm.assert_called_once_with(model=model, input=inputs, caching=True)
+ mock_litellm.assert_called_once_with(model=model, input=inputs, caching=False)
assert len(result) == len(inputs)
np.testing.assert_allclose(result, mock_embeddings)
diff --git a/tests/clients/test_lm.py b/tests/clients/test_lm.py
index c593ffb53..febd1e04f 100644
--- a/tests/clients/test_lm.py
+++ b/tests/clients/test_lm.py
@@ -1,4 +1,5 @@
from unittest import mock
+from unittest.mock import patch
import time
import litellm
@@ -324,9 +325,16 @@ def test_exponential_backoff_retry():
@pytest.mark.asyncio
-async def test_async_lm_call(litellm_test_server):
- api_base, _ = litellm_test_server
+async def test_async_lm_call():
+ from litellm.utils import ModelResponse, Message, Choices
+
+ mock_response = ModelResponse(choices=[Choices(message=Message(content="answer"))], model="openai/gpt-4o-mini")
+
+ with patch("litellm.acompletion") as mock_acompletion:
+ mock_acompletion.return_value = mock_response
+
+ lm = dspy.LM(model="openai/gpt-4o-mini")
+ result = await lm.acall("question")
- lm = dspy.LM(model="openai/gpt-4o-mini", api_base=api_base, api_key="fakekey", model_type="chat")
- result = await lm.acall("question")
- assert result == "answer"
+ assert result == ["answer"]
+ mock_acompletion.assert_called_once()
diff --git a/uv.lock b/uv.lock
index 60b2f6e03..ee8da45b2 100644
--- a/uv.lock
+++ b/uv.lock
@@ -665,7 +665,7 @@ wheels = [
[[package]]
name = "dspy"
-version = "2.6.17"
+version = "2.6.19"
source = { editable = "." }
dependencies = [
{ name = "anyio" },
@@ -708,6 +708,7 @@ dev = [
{ name = "pillow" },
{ name = "pre-commit" },
{ name = "pytest" },
+ { name = "pytest-asyncio" },
{ name = "pytest-mock" },
{ name = "ruff" },
]
@@ -743,6 +744,7 @@ requires-dist = [
{ name = "pre-commit", marker = "extra == 'dev'", specifier = ">=3.7.0" },
{ name = "pydantic", specifier = ">=2.0" },
{ name = "pytest", marker = "extra == 'dev'", specifier = ">=6.2.5" },
+ { name = "pytest-asyncio", marker = "extra == 'dev'", specifier = ">=0.26.0" },
{ name = "pytest-mock", marker = "extra == 'dev'", specifier = ">=3.12.0" },
{ name = "regex", specifier = ">=2023.10.3" },
{ name = "requests", specifier = ">=2.31.0" },
@@ -2257,6 +2259,19 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/30/3d/64ad57c803f1fa1e963a7946b6e0fea4a70df53c1a7fed304586539c2bac/pytest-8.3.5-py3-none-any.whl", hash = "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820", size = 343634 },
]
+[[package]]
+name = "pytest-asyncio"
+version = "0.26.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "pytest" },
+ { name = "typing-extensions", marker = "python_full_version < '3.10'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/8e/c4/453c52c659521066969523e87d85d54139bbd17b78f09532fb8eb8cdb58e/pytest_asyncio-0.26.0.tar.gz", hash = "sha256:c4df2a697648241ff39e7f0e4a73050b03f123f760673956cf0d72a4990e312f", size = 54156 }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/20/7f/338843f449ace853647ace35870874f69a764d251872ed1b4de9f234822c/pytest_asyncio-0.26.0-py3-none-any.whl", hash = "sha256:7b51ed894f4fbea1340262bdae5135797ebbe21d8638978e35d31c6d19f72fb0", size = 19694 },
+]
+
[[package]]
name = "pytest-mock"
version = "3.14.0"