Rebase with main

Author: rhlbhatnagar

src/ragas/metrics/collections/__init__.py

@@ -14,6 +14,7 @@
 )
 from ragas.metrics.collections._bleu_score import BleuScore
 from ragas.metrics.collections._context_entity_recall import ContextEntityRecall
+from ragas.metrics.collections._context_relevance import ContextRelevance
 from ragas.metrics.collections._faithfulness import Faithfulness
 from ragas.metrics.collections._noise_sensitivity import NoiseSensitivity
 from ragas.metrics.collections._rouge_score import RougeScore

tests/e2e/metrics_migration/test_answer_accuracy_migration.py

@@ -92,12 +92,12 @@ def test_modern_llm(self):
         try:
             import openai
 
-            from ragas.llms.base import instructor_llm_factory
+            from ragas.llms.base import llm_factory
 
             client = openai.AsyncOpenAI()
-            return instructor_llm_factory(
-                "openai",
+            return llm_factory(
                 model="gpt-4o",
+                provider="openai",
                 client=client,
             )
         except ImportError as e:

tests/e2e/metrics_migration/test_context_relevance_migration.py

@@ -30,12 +30,12 @@ def nvidia_modern_llm():
     try:
         import openai
 
-        from ragas.llms.base import instructor_llm_factory
+        from ragas.llms.base import llm_factory
 
         client = openai.AsyncOpenAI()
         # Set temperature=0.1 to match legacy NVIDIA calls exactly
-        return instructor_llm_factory(
-            "openai", model="gpt-4o", client=client, temperature=0.1
+        return llm_factory(
+            model="gpt-4o", provider="openai", client=client, temperature=0.1
         )
     except Exception as e:
         pytest.skip(str(e))
@@ -99,12 +99,12 @@ def test_modern_llm(self):
         try:
             import openai
 
-            from ragas.llms.base import instructor_llm_factory
+            from ragas.llms.base import llm_factory
 
             client = openai.AsyncOpenAI()
-            return instructor_llm_factory(
-                "openai",
+            return llm_factory(
                 model="gpt-4o",
+                provider="openai",
                 client=client,
             )
         except ImportError as e: