Skip all ragas tests if ragas unavailable

DataDog · Jan 6, 2025 · b20211e · b20211e
1 parent 34f469d
commit b20211e
Show file tree

Hide file tree

Showing 8 changed files with 204 additions and 209 deletions.
diff --git a/riotfile.py b/riotfile.py
@@ -2885,11 +2885,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
             pkgs={"vcrpy": latest, "pytest-asyncio": "==0.21.1"},
             venvs=[
                 Venv(pys="3.7"),
-                Venv(
-                    pys=select_pys(min_version="3.8"),
-                    pkgs={"ragas": "==0.1.21", "langchain": latest},
-                    env={"RAGAS_AVAILABLE": "True"},
-                ),
+                Venv(pys=select_pys(min_version="3.8"), pkgs={"ragas": "==0.1.21", "langchain": latest}),
             ],
         ),
         Venv(

diff --git a/...emits_traces_and_evaluations_on_exit.yaml → ...emits_traces_and_evaluations_on_exit.yaml b/...emits_traces_and_evaluations_on_exit.yaml → ...emits_traces_and_evaluations_on_exit.yaml
diff --git a/...test_ragas_faithfulness_emits_traces.yaml → ...test_ragas_faithfulness_emits_traces.yaml b/...test_ragas_faithfulness_emits_traces.yaml → ...test_ragas_faithfulness_emits_traces.yaml
diff --git a/...agas_faithfulness_submits_evaluation.yaml → ...agas_faithfulness_submits_evaluation.yaml b/...agas_faithfulness_submits_evaluation.yaml → ...agas_faithfulness_submits_evaluation.yaml
diff --git a/..._evaluation_on_span_with_custom_keys.yaml → ..._evaluation_on_span_with_custom_keys.yaml b/..._evaluation_on_span_with_custom_keys.yaml → ..._evaluation_on_span_with_custom_keys.yaml
diff --git a/...on_on_span_with_question_in_messages.yaml → ...on_on_span_with_question_in_messages.yaml b/...on_on_span_with_question_in_messages.yaml → ...on_on_span_with_question_in_messages.yaml
diff --git a/tests/llmobs/test_llmobs_ragas_faithfulness_evaluator.py b/tests/llmobs/test_llmobs_ragas_faithfulness_evaluator.py
diff --git a/tests/llmobs/test_llmobs_service.py b/tests/llmobs/test_llmobs_service.py
@@ -1746,8 +1746,8 @@ async def test_annotation_context_async_nested(llmobs):
                 assert span._get_ctx_item(TAGS) == {"foo": "baz", "boo": "bar"}
 
 
-@pytest.mark.skipif(not RAGAS_AVAILABLE, reason="Test requires ragas to be available on user env")
 def test_service_enable_starts_evaluator_runner_when_evaluators_exist():
+    pytest.importorskip("ragas")
     with override_global_config(dict(_dd_api_key="<not-a-real-api-key>", _llmobs_ml_app="<ml-app-name>")):
         with override_env(dict(_DD_LLMOBS_EVALUATORS="ragas_faithfulness")):
             dummy_tracer = DummyTracer()