revert langfuse / langsmith changes

Author: xzrderek

eval_protocol/adapters/langfuse.py

@@ -9,7 +9,7 @@
 import random
 import time
 from datetime import datetime, timedelta
-from typing import Any, Callable, Dict, List, Optional, Protocol, cast
+from typing import Any, Dict, List, Optional, Protocol
 
 from eval_protocol.models import EvaluationRow, InputMetadata, Message
 from .base import BaseAdapter
@@ -44,19 +44,14 @@ def __call__(
         ...
 
 
-LangfuseClient = Any
-
-_get_langfuse_client: Callable[[], Any] | None
-
 try:
-    from langfuse import get_client as _get_langfuse_client  # type: ignore[attr-defined, reportPrivateImportUsage]
+    from langfuse import get_client  # pyright: ignore[reportPrivateImportUsage]
     from langfuse.api.resources.trace.types.traces import Traces
     from langfuse.api.resources.commons.types.trace import Trace
     from langfuse.api.resources.commons.types.trace_with_full_details import TraceWithFullDetails
 
     LANGFUSE_AVAILABLE = True
-except ImportError:  # pragma: no cover - optional dependency
-    _get_langfuse_client = None
+except ImportError:
     LANGFUSE_AVAILABLE = False
 
 
@@ -224,11 +219,7 @@ def __init__(self):
         if not LANGFUSE_AVAILABLE:
             raise ImportError("Langfuse not installed. Install with: pip install 'eval-protocol[langfuse]'")
 
-        if _get_langfuse_client is None:
-            raise ImportError("Langfuse not installed. Install with: pip install 'eval-protocol[langfuse]'")
-
-        client_factory = cast(Callable[[], LangfuseClient], _get_langfuse_client)
-        self.client: LangfuseClient = client_factory()
+        self.client = get_client()
 
     def get_evaluation_rows(
         self,

eval_protocol/adapters/langsmith.py

@@ -10,23 +10,18 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Callable, Dict, Iterable, List, Optional, cast
+from typing import Any, Dict, List, Optional, Iterable
 
 from eval_protocol.models import EvaluationRow, InputMetadata, Message
 from .base import BaseAdapter
 
 logger = logging.getLogger(__name__)
 
-LangSmithClient = Any
-
-_LANGSMITH_CLIENT_CTOR: Callable[..., LangSmithClient] | None
-
 try:
-    from langsmith import Client as _LANGSMITH_CLIENT_CTOR  # type: ignore[attr-defined]
+    from langsmith import Client  # type: ignore
 
     LANGSMITH_AVAILABLE = True
-except ImportError:  # pragma: no cover - optional dependency
-    _LANGSMITH_CLIENT_CTOR = None
+except ImportError:
     LANGSMITH_AVAILABLE = False
 
 
@@ -40,17 +35,10 @@ class LangSmithAdapter(BaseAdapter):
     - outputs: { messages: [...] } | { content } | { result } | { answer } | { output } | str | list[dict]
     """
 
-    def __init__(self, client: Optional[LangSmithClient] = None) -> None:
+    def __init__(self, client: Optional[Client] = None) -> None:
         if not LANGSMITH_AVAILABLE:
             raise ImportError("LangSmith not installed. Install with: pip install 'eval-protocol[langsmith]'")
-        if client is not None:
-            self.client = client
-            return
-
-        if _LANGSMITH_CLIENT_CTOR is None:
-            raise ImportError("LangSmith client constructor unavailable despite successful import check")
-
-        self.client: LangSmithClient = cast(LangSmithClient, _LANGSMITH_CLIENT_CTOR())
+        self.client = client or Client()
 
     def get_evaluation_rows(
         self,