.

Author: kritinv

deepeval/openai/__init__.py

@@ -1,37 +1,34 @@
-import os
-import sys
 import importlib.util
+import sys
 from importlib.machinery import SourceFileLoader
-
 from deepeval.openai.patch import patch_openai
 
-# ——— 1) Locate the real OpenAI package on disk ———
-spec = importlib.util.find_spec("openai")
-if not spec or not spec.origin:
-    raise ImportError("OpenAI package not found")
-origin = spec.origin
-subpkg_paths = spec.submodule_search_locations
-
-# ——— 2) Prepare a “fork” module loader ———
-loader = SourceFileLoader("deepeval_openai_fork", origin)
-fork_spec = importlib.util.spec_from_loader(
-    "deepeval_openai_fork", loader, origin=origin, is_package=True
-)
-
-# ——— 3) Instantiate the module and preserve its package path ———
-fork = importlib.util.module_from_spec(fork_spec)
-fork.__path__ = subpkg_paths  # so internal imports still resolve
-
-# ——— 4) Register, load, and patch the forked copy ———
-sys.modules[fork_spec.name] = fork
-loader.exec_module(fork)
-patch_openai(fork)
+def load_and_patch_openai():
+    openai_spec = importlib.util.find_spec("openai")
+    if not openai_spec or not openai_spec.origin:
+        raise ImportError("Could not find the OpenAI package")
 
-# ——— 5) Export only inside deepeval.openai ———
-openai      = fork
-OpenAI      = fork.OpenAI
-AsyncOpenAI = fork.AsyncOpenAI
+    init_file = openai_spec.origin
+    package_dirs = openai_spec.submodule_search_locations
+    loader = SourceFileLoader("deepeval_openai", init_file)
+    new_spec = importlib.util.spec_from_loader(
+        "deepeval_openai",
+        loader,
+        origin=init_file,
+        is_package=True,
+    )
+    deepeval_openai = importlib.util.module_from_spec(new_spec)
+    deepeval_openai.__path__ = package_dirs
+    sys.modules["deepeval_openai"] = deepeval_openai
+    loader.exec_module(deepeval_openai)
+    patch_openai(deepeval_openai)
+    return deepeval_openai
 
+# Load and patch OpenAI
+_openai = load_and_patch_openai()
+openai      = _openai
+OpenAI      = _openai.OpenAI
+AsyncOpenAI = _openai.AsyncOpenAI
 __all__ = ["openai", "OpenAI", "AsyncOpenAI"] + [
     name for name in dir(openai) if not name.startswith("_")
-]
+]

deepeval/openai/evaluate.py

@@ -15,7 +15,7 @@ class TestCaseMetricPair:
     hyperparameters: Dict[str, Any]
 
 @dataclass
-class TestCasesMetricSet:
+class TestRunParameters:
     test_cases: List[LLMTestCase]
     metrics: List[BaseMetric]
     hyperparameters: Dict[str, Any]
@@ -44,12 +44,12 @@ def evaluate_sync():
     sync_config = AsyncConfig(run_async=False)
     if not test_case_pairs:
         return
-    grouped: Dict[str, TestCasesMetricSet] = {}
+    grouped: Dict[str, TestRunParameters] = {}
     for pair in test_case_pairs:
         if pair.metrics:
             key = "".join([metric.__name__ for metric in pair.metrics])
             if key not in grouped:
-                grouped[key] = TestCasesMetricSet(
+                grouped[key] = TestRunParameters(
                     test_cases=[pair.test_case], 
                     metrics=pair.metrics,
                     hyperparameters=pair.hyperparameters

deepeval/openai/patch.py

@@ -39,7 +39,7 @@ def new_init(self, *args, **kwargs):
             original_init(self, *args, **kwargs)
             wrap_openai_client_methods(self, is_async)
         openai_class.__init__ = new_init
-
+        
     openai_class = getattr(openai_module, "OpenAI", None)
     if openai_class:
         wrap_init(openai_class, is_async=False)

tests/integrations/test_openai_integration.py

@@ -45,7 +45,7 @@
     }
 }]
 
-completion_mode = "response"
+completion_mode = "chat"
 client = OpenAI()
 tools = CHAT_TOOLS if completion_mode == "chat" else COMPLETION_TOOLS
 
@@ -124,6 +124,6 @@ def test_traceable_evaluate():
 ##############################################
 
 if __name__ == "__main__":
-    # test_end_to_end_evaluation()
-    # test_traceable_evaluate()
-    # test_tracing()
+    test_end_to_end_evaluation()
+    test_traceable_evaluate()
+    test_tracing()