Fix streaming tests (#2032)

* Fix streaming tests

* Updated lockfile

* Update poetry version

.github/workflows/run_tests.yml

@@ -8,7 +8,7 @@ on:
     types: [opened, synchronize, reopened]
 
 env:
-  POETRY_VERSION: "1.7.1"
+  POETRY_VERSION: "2.0.0"
 
 jobs:
   fix:

dspy/adapters/json_adapter.py

@@ -37,7 +37,8 @@ def __call__(self, lm, lm_kwargs, signature, demos, inputs):
 
         try:
             provider = lm.model.split("/", 1)[0] or "openai"
-            if "response_format" in litellm.get_supported_openai_params(model=lm.model, custom_llm_provider=provider):
+            params = litellm.get_supported_openai_params(model=lm.model, custom_llm_provider=provider)
+            if params and "response_format" in params:
                 try:
                     response_format = _get_structured_outputs_response_format(signature)
                     outputs = lm(**inputs, **lm_kwargs, response_format=response_format)

dspy/clients/lm.py

@@ -262,9 +262,9 @@ def cache_key(request: Dict[str, Any]) -> str:
 
         def transform_value(value):
             if isinstance(value, type) and issubclass(value, pydantic.BaseModel):
-                return value.schema()
+                return value.model_json_schema()
             elif isinstance(value, pydantic.BaseModel):
-                return value.dict()
+                return value.model_dump()
             elif callable(value) and hasattr(value, "__code__") and hasattr(value.__code__, "co_code"):
                 return value.__code__.co_code.decode("utf-8")
             else:

dspy/utils/streaming.py

@@ -78,7 +78,7 @@ async def streaming_response(streamer: AsyncGenerator) -> AsyncGenerator:
         if isinstance(value, Prediction):
             data = {"prediction": {k: v for k, v in value.items(include_dspy=False)}}
             yield f"data: {ujson.dumps(data)}\n\n"
-        elif isinstance(value, litellm.ModelResponse):
+        elif isinstance(value, litellm.ModelResponseStream):
             data = {"chunk": value.json()}
             yield f"data: {ujson.dumps(data)}\n\n"
         elif isinstance(value, str) and value.startswith("data:"):

pyproject.toml

@@ -3,12 +3,12 @@ requires = ["setuptools>=40.8.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-# Do not add spaces around the '=' sign for any of the fields 
-# preceeded by a marker comment as it affects the publish workflow. 
+# Do not add spaces around the '=' sign for any of the fields
+# preceeded by a marker comment as it affects the publish workflow.
 #replace_package_name_marker
-name="dspy"
+name = "dspy"
 #replace_package_version_marker
-version="2.6.0rc8"
+version = "2.6.0rc8"
 description = "DSPy"
 readme = "README.md"
 authors = [{ name = "Omar Khattab", email = "[email protected]" }]
@@ -40,7 +40,7 @@ dependencies = [
     "pydantic~=2.0",
     "jinja2",
     "magicattr~=0.1.6",
-    "litellm==1.55.3",
+    "litellm==1.57.4",
     "diskcache",
     "json-repair",
     "tenacity>=8.2.3",
@@ -134,7 +134,7 @@ pgvector = { version = "^0.2.5", optional = true }
 llama-index = { version = "^0.10.30", optional = true }
 jinja2 = "^3.1.3"
 magicattr = "^0.1.6"
-litellm = { version = "==1.55.3", extras = ["proxy"] }
+litellm = { version = "==1.57.4", extras = ["proxy"] }
 diskcache = "^5.6.0"
 json-repair = "^0.30.0"
 tenacity = ">=8.2.3"
@@ -231,7 +231,8 @@ target-version = "py39"
 select = [
     "F", # Pyflakes
     "E", # Pycodestyle
-    "TID252",  # Absolute imports
+    "TID252", # Absolute imports
+
 ]
 ignore = [
     "E501", # Line too long

tests/reliability/conftest.py

@@ -3,8 +3,8 @@
 import pytest
 
 import dspy
-from tests.conftest import clear_settings
-from tests.reliability.utils import get_adapter, parse_reliability_conf_yaml
+from ..conftest import clear_settings
+from ..reliability.utils import get_adapter, parse_reliability_conf_yaml
 
 # Standard list of models that should be used for periodic DSPy reliability testing
 MODEL_LIST = [

tests/utils/test_streaming.py

@@ -2,10 +2,10 @@
 
 import dspy
 from dspy.utils.streaming import streaming_response
-from tests.test_utils.server import litellm_test_server
+from ..test_utils.server import litellm_test_server
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_streamify_yields_expected_response_chunks(litellm_test_server):
     api_base, _ = litellm_test_server
     lm = dspy.LM(
@@ -37,7 +37,7 @@ class TestSignature(dspy.Signature):
         assert last_chunk2.output_text == "Hello!"
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_streaming_response_yields_expected_response_chunks(litellm_test_server):
     api_base, _ = litellm_test_server
     lm = dspy.LM(