lmnr 0.7.12__tar.gz → 0.7.14__tar.gz

{lmnr-0.7.12 → lmnr-0.7.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lmnr
-Version: 0.7.12
+Version: 0.7.14
 Summary: Python SDK for Laminar
 Author: lmnr.ai
 Author-email: lmnr.ai <founders@lmnr.ai>
@@ -26,52 +26,52 @@ Requires-Dist: grpcio>=1
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: orjson>=3.0.0
 Requires-Dist: packaging>=22.0
-Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.46.2 ; extra == 'alephalpha'
-Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-bedrock>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-chromadb>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-cohere>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-crewai>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-haystack>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-lancedb>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-langchain>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-marqo>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-mcp>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-milvus>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-mistralai>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-ollama>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-pinecone>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-qdrant>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-replicate>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-together>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-transformers>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-vertexai>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-watsonx>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-weaviate>=0.46.2 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-bedrock>=0.46.2 ; extra == 'bedrock'
-Requires-Dist: opentelemetry-instrumentation-chromadb>=0.46.2 ; extra == 'chromadb'
-Requires-Dist: opentelemetry-instrumentation-cohere>=0.46.2 ; extra == 'cohere'
-Requires-Dist: opentelemetry-instrumentation-crewai>=0.46.2 ; extra == 'crewai'
-Requires-Dist: opentelemetry-instrumentation-haystack>=0.46.2 ; extra == 'haystack'
-Requires-Dist: opentelemetry-instrumentation-lancedb>=0.46.2 ; extra == 'lancedb'
-Requires-Dist: opentelemetry-instrumentation-langchain>=0.46.2 ; extra == 'langchain'
-Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.46.2 ; extra == 'llamaindex'
-Requires-Dist: opentelemetry-instrumentation-marqo>=0.46.2 ; extra == 'marqo'
-Requires-Dist: opentelemetry-instrumentation-mcp>=0.46.2 ; extra == 'mcp'
-Requires-Dist: opentelemetry-instrumentation-milvus>=0.46.2 ; extra == 'milvus'
-Requires-Dist: opentelemetry-instrumentation-mistralai>=0.46.2 ; extra == 'mistralai'
-Requires-Dist: opentelemetry-instrumentation-ollama>=0.46.2 ; extra == 'ollama'
-Requires-Dist: opentelemetry-instrumentation-pinecone>=0.46.2 ; extra == 'pinecone'
-Requires-Dist: opentelemetry-instrumentation-qdrant>=0.46.2 ; extra == 'qdrant'
-Requires-Dist: opentelemetry-instrumentation-replicate>=0.46.2 ; extra == 'replicate'
-Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.46.2 ; extra == 'sagemaker'
-Requires-Dist: opentelemetry-instrumentation-together>=0.46.2 ; extra == 'together'
-Requires-Dist: opentelemetry-instrumentation-transformers>=0.46.2 ; extra == 'transformers'
-Requires-Dist: opentelemetry-instrumentation-vertexai>=0.46.2 ; extra == 'vertexai'
-Requires-Dist: opentelemetry-instrumentation-watsonx>=0.46.2 ; extra == 'watsonx'
-Requires-Dist: opentelemetry-instrumentation-weaviate>=0.46.2 ; extra == 'weaviate'
+Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.47.1 ; extra == 'alephalpha'
+Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-bedrock>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-chromadb>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-cohere>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-crewai>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-haystack>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-lancedb>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-langchain>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-marqo>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-mcp>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-milvus>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-mistralai>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-ollama>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-pinecone>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-qdrant>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-replicate>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-together>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-transformers>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-vertexai>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-watsonx>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-weaviate>=0.47.1 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-bedrock>=0.47.1 ; extra == 'bedrock'
+Requires-Dist: opentelemetry-instrumentation-chromadb>=0.47.1 ; extra == 'chromadb'
+Requires-Dist: opentelemetry-instrumentation-cohere>=0.47.1 ; extra == 'cohere'
+Requires-Dist: opentelemetry-instrumentation-crewai>=0.47.1 ; extra == 'crewai'
+Requires-Dist: opentelemetry-instrumentation-haystack>=0.47.1 ; extra == 'haystack'
+Requires-Dist: opentelemetry-instrumentation-lancedb>=0.47.1 ; extra == 'lancedb'
+Requires-Dist: opentelemetry-instrumentation-langchain>=0.47.1 ; extra == 'langchain'
+Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.47.1 ; extra == 'llamaindex'
+Requires-Dist: opentelemetry-instrumentation-marqo>=0.47.1 ; extra == 'marqo'
+Requires-Dist: opentelemetry-instrumentation-mcp>=0.47.1 ; extra == 'mcp'
+Requires-Dist: opentelemetry-instrumentation-milvus>=0.47.1 ; extra == 'milvus'
+Requires-Dist: opentelemetry-instrumentation-mistralai>=0.47.1 ; extra == 'mistralai'
+Requires-Dist: opentelemetry-instrumentation-ollama>=0.47.1 ; extra == 'ollama'
+Requires-Dist: opentelemetry-instrumentation-pinecone>=0.47.1 ; extra == 'pinecone'
+Requires-Dist: opentelemetry-instrumentation-qdrant>=0.47.1 ; extra == 'qdrant'
+Requires-Dist: opentelemetry-instrumentation-replicate>=0.47.1 ; extra == 'replicate'
+Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.47.1 ; extra == 'sagemaker'
+Requires-Dist: opentelemetry-instrumentation-together>=0.47.1 ; extra == 'together'
+Requires-Dist: opentelemetry-instrumentation-transformers>=0.47.1 ; extra == 'transformers'
+Requires-Dist: opentelemetry-instrumentation-vertexai>=0.47.1 ; extra == 'vertexai'
+Requires-Dist: opentelemetry-instrumentation-watsonx>=0.47.1 ; extra == 'watsonx'
+Requires-Dist: opentelemetry-instrumentation-weaviate>=0.47.1 ; extra == 'weaviate'
 Requires-Python: >=3.10, <4
 Provides-Extra: alephalpha
 Provides-Extra: all

{lmnr-0.7.12 → lmnr-0.7.14}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.7.12"
+version = "0.7.14"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -62,57 +62,57 @@ lmnr = "lmnr.cli:cli"
 # `uv add lmnr --extra anthropic --extra groq`
 # `poetry add 'lmnr[anthropic,groq]'`
 
-alephalpha=["opentelemetry-instrumentation-alephalpha>=0.46.2"]
-bedrock=["opentelemetry-instrumentation-bedrock>=0.46.2"]
-chromadb=["opentelemetry-instrumentation-chromadb>=0.46.2"]
-cohere=["opentelemetry-instrumentation-cohere>=0.46.2"]
-crewai=["opentelemetry-instrumentation-crewai>=0.46.2"]
-haystack=["opentelemetry-instrumentation-haystack>=0.46.2"]
-lancedb=["opentelemetry-instrumentation-lancedb>=0.46.2"]
-langchain=["opentelemetry-instrumentation-langchain>=0.46.2"]
-llamaindex=["opentelemetry-instrumentation-llamaindex>=0.46.2"]
-marqo=["opentelemetry-instrumentation-marqo>=0.46.2"]
-mcp=["opentelemetry-instrumentation-mcp>=0.46.2"]
-milvus=["opentelemetry-instrumentation-milvus>=0.46.2"]
-mistralai=["opentelemetry-instrumentation-mistralai>=0.46.2"]
-ollama=["opentelemetry-instrumentation-ollama>=0.46.2"]
-pinecone=["opentelemetry-instrumentation-pinecone>=0.46.2"]
-qdrant=["opentelemetry-instrumentation-qdrant>=0.46.2"]
-replicate=["opentelemetry-instrumentation-replicate>=0.46.2"]
-sagemaker=["opentelemetry-instrumentation-sagemaker>=0.46.2"]
-together=["opentelemetry-instrumentation-together>=0.46.2"]
-transformers=["opentelemetry-instrumentation-transformers>=0.46.2"]
-vertexai=["opentelemetry-instrumentation-vertexai>=0.46.2"]
-watsonx=["opentelemetry-instrumentation-watsonx>=0.46.2"]
-weaviate=["opentelemetry-instrumentation-weaviate>=0.46.2"]
+alephalpha=["opentelemetry-instrumentation-alephalpha>=0.47.1"]
+bedrock=["opentelemetry-instrumentation-bedrock>=0.47.1"]
+chromadb=["opentelemetry-instrumentation-chromadb>=0.47.1"]
+cohere=["opentelemetry-instrumentation-cohere>=0.47.1"]
+crewai=["opentelemetry-instrumentation-crewai>=0.47.1"]
+haystack=["opentelemetry-instrumentation-haystack>=0.47.1"]
+lancedb=["opentelemetry-instrumentation-lancedb>=0.47.1"]
+langchain=["opentelemetry-instrumentation-langchain>=0.47.1"]
+llamaindex=["opentelemetry-instrumentation-llamaindex>=0.47.1"]
+marqo=["opentelemetry-instrumentation-marqo>=0.47.1"]
+mcp=["opentelemetry-instrumentation-mcp>=0.47.1"]
+milvus=["opentelemetry-instrumentation-milvus>=0.47.1"]
+mistralai=["opentelemetry-instrumentation-mistralai>=0.47.1"]
+ollama=["opentelemetry-instrumentation-ollama>=0.47.1"]
+pinecone=["opentelemetry-instrumentation-pinecone>=0.47.1"]
+qdrant=["opentelemetry-instrumentation-qdrant>=0.47.1"]
+replicate=["opentelemetry-instrumentation-replicate>=0.47.1"]
+sagemaker=["opentelemetry-instrumentation-sagemaker>=0.47.1"]
+together=["opentelemetry-instrumentation-together>=0.47.1"]
+transformers=["opentelemetry-instrumentation-transformers>=0.47.1"]
+vertexai=["opentelemetry-instrumentation-vertexai>=0.47.1"]
+watsonx=["opentelemetry-instrumentation-watsonx>=0.47.1"]
+weaviate=["opentelemetry-instrumentation-weaviate>=0.47.1"]
 # `all` is the group added for convenience, if you want to install all
 # the instrumentations.
 # we suggest using package-manager-specific commands instead,
 # like `uv add lmnr --all-extras`
 all = [
-  "opentelemetry-instrumentation-alephalpha>=0.46.2",
-  "opentelemetry-instrumentation-bedrock>=0.46.2",
-  "opentelemetry-instrumentation-chromadb>=0.46.2",
-  "opentelemetry-instrumentation-cohere>=0.46.2",
-  "opentelemetry-instrumentation-crewai>=0.46.2",
-  "opentelemetry-instrumentation-haystack>=0.46.2",
-  "opentelemetry-instrumentation-lancedb>=0.46.2",
-  "opentelemetry-instrumentation-langchain>=0.46.2",
-  "opentelemetry-instrumentation-llamaindex>=0.46.2",
-  "opentelemetry-instrumentation-marqo>=0.46.2",
-  "opentelemetry-instrumentation-mcp>=0.46.2",
-  "opentelemetry-instrumentation-milvus>=0.46.2",
-  "opentelemetry-instrumentation-mistralai>=0.46.2",
-  "opentelemetry-instrumentation-ollama>=0.46.2",
-  "opentelemetry-instrumentation-pinecone>=0.46.2",
-  "opentelemetry-instrumentation-qdrant>=0.46.2",
-  "opentelemetry-instrumentation-replicate>=0.46.2",
-  "opentelemetry-instrumentation-sagemaker>=0.46.2",
-  "opentelemetry-instrumentation-together>=0.46.2",
-  "opentelemetry-instrumentation-transformers>=0.46.2",
-  "opentelemetry-instrumentation-vertexai>=0.46.2",
-  "opentelemetry-instrumentation-watsonx>=0.46.2",
-  "opentelemetry-instrumentation-weaviate>=0.46.2"
+  "opentelemetry-instrumentation-alephalpha>=0.47.1",
+  "opentelemetry-instrumentation-bedrock>=0.47.1",
+  "opentelemetry-instrumentation-chromadb>=0.47.1",
+  "opentelemetry-instrumentation-cohere>=0.47.1",
+  "opentelemetry-instrumentation-crewai>=0.47.1",
+  "opentelemetry-instrumentation-haystack>=0.47.1",
+  "opentelemetry-instrumentation-lancedb>=0.47.1",
+  "opentelemetry-instrumentation-langchain>=0.47.1",
+  "opentelemetry-instrumentation-llamaindex>=0.47.1",
+  "opentelemetry-instrumentation-marqo>=0.47.1",
+  "opentelemetry-instrumentation-mcp>=0.47.1",
+  "opentelemetry-instrumentation-milvus>=0.47.1",
+  "opentelemetry-instrumentation-mistralai>=0.47.1",
+  "opentelemetry-instrumentation-ollama>=0.47.1",
+  "opentelemetry-instrumentation-pinecone>=0.47.1",
+  "opentelemetry-instrumentation-qdrant>=0.47.1",
+  "opentelemetry-instrumentation-replicate>=0.47.1",
+  "opentelemetry-instrumentation-sagemaker>=0.47.1",
+  "opentelemetry-instrumentation-together>=0.47.1",
+  "opentelemetry-instrumentation-transformers>=0.47.1",
+  "opentelemetry-instrumentation-vertexai>=0.47.1",
+  "opentelemetry-instrumentation-watsonx>=0.47.1",
+  "opentelemetry-instrumentation-weaviate>=0.47.1"
 ]
 
 [dependency-groups]
@@ -124,15 +124,14 @@ dev = [
   "pytest-asyncio>=1.1.0",
   "playwright>=1.52.0",
   "vcrpy>=7.0.0",
-  # litellm breaks with openai>=1.100.0 (as of litellm 1.75.8)
-  "openai>=1.99.7,<1.100.0",
+  "openai>=1.107.0",
   "pytest-recording>=0.13.4",
   "patchright>=1.52.3",
   "google-genai>=1.31.0",
   "langgraph>=0.4.8",
   "langchain-core>=0.3.75",
   "langchain>=0.3.27",
-  "litellm>=1.75.8",
+  "litellm>=1.77.0",
   "groq>=0.30.0",
   "anthropic[bedrock]>=0.60.0",
   "langchain-openai>=0.3.32",

{lmnr-0.7.12 → lmnr-0.7.14}/src/lmnr/opentelemetry_lib/tracing/__init__.py

@@ -55,7 +55,7 @@ class TracerWrapper(object):
         exporter: SpanExporter | None = None,
         instruments: set[Instruments] | None = None,
         block_instruments: set[Instruments] | None = None,
-        base_url: str = "https://api.lmnr.ai",
+        base_url: str | None = None,
         port: int = 8443,
         http_port: int = 443,
         project_api_key: str | None = None,
@@ -69,7 +69,7 @@ class TracerWrapper(object):
         # Silence some opentelemetry warnings
         logging.getLogger("opentelemetry.trace").setLevel(otel_logger_level)
 
-        base_http_url = f"{base_url}:{http_port}"
+        base_http_url = f"{base_url}:{http_port}" if base_url else None
         with cls._lock:
             if not hasattr(cls, "instance"):
                 cls._initialize_logger(cls)
@@ -78,14 +78,18 @@ class TracerWrapper(object):
                 # Store session recording options
                 cls.session_recording_options = session_recording_options or {}
 
-                obj._client = LaminarClient(
-                    base_url=base_http_url,
-                    project_api_key=project_api_key,
-                )
-                obj._async_client = AsyncLaminarClient(
-                    base_url=base_http_url,
-                    project_api_key=project_api_key,
-                )
+                if project_api_key:
+                    obj._client = LaminarClient(
+                        base_url=base_http_url or "https://api.lmnr.ai",
+                        project_api_key=project_api_key,
+                    )
+                    obj._async_client = AsyncLaminarClient(
+                        base_url=base_http_url or "https://api.lmnr.ai",
+                        project_api_key=project_api_key,
+                    )
+                else:
+                    obj._client = None
+                    obj._async_client = None
 
                 obj._resource = Resource(attributes=TracerWrapper.resource_attributes)
 

{lmnr-0.7.12 → lmnr-0.7.14}/src/lmnr/opentelemetry_lib/tracing/_instrument_initializers.py

@@ -91,6 +91,9 @@ class BrowserUseSessionInstrumentorInitializer(InstrumentorInitializer):
         if version and parse(version) >= parse("0.6.0rc1"):
             from lmnr.sdk.browser.browser_use_cdp_otel import BrowserUseInstrumentor
 
+            if async_client is None:
+                return None
+
             return BrowserUseInstrumentor(async_client)
 
         return None
@@ -348,6 +351,9 @@ class PatchrightInstrumentorInitializer(InstrumentorInitializer):
 
         from lmnr.sdk.browser.patchright_otel import PatchrightInstrumentor
 
+        if client is None and async_client is None:
+            return None
+
         return PatchrightInstrumentor(client, async_client)
 
 
@@ -372,6 +378,9 @@ class PlaywrightInstrumentorInitializer(InstrumentorInitializer):
 
         from lmnr.sdk.browser.playwright_otel import PlaywrightInstrumentor
 
+        if client is None and async_client is None:
+            return None
+
         return PlaywrightInstrumentor(client, async_client)
 
 

{lmnr-0.7.12 → lmnr-0.7.14}/src/lmnr/opentelemetry_lib/tracing/exporter.py

@@ -10,7 +10,10 @@ from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter as HTTPOTLPSpanExporter,
 )
 
-from lmnr.sdk.utils import from_env
+from lmnr.sdk.log import get_default_logger
+from lmnr.sdk.utils import from_env, get_otel_env_var, parse_otel_headers
+
+logger = get_default_logger(__name__)
 
 
 class LaminarSpanExporter(SpanExporter):
@@ -39,16 +42,39 @@ class LaminarSpanExporter(SpanExporter):
         final_url = f"{url}:{port or 443}"
         api_key = api_key or from_env("LMNR_PROJECT_API_KEY")
         self.endpoint = final_url
-        self.headers = (
-            {"Authorization": f"Bearer {api_key}"}
-            if force_http
-            else {"authorization": f"Bearer {api_key}"}
-        )
+        if api_key:
+            self.headers = (
+                {"Authorization": f"Bearer {api_key}"}
+                if force_http
+                else {"authorization": f"Bearer {api_key}"}
+            )
+        elif get_otel_env_var("HEADERS"):
+            self.headers = parse_otel_headers(get_otel_env_var("HEADERS"))
+        else:
+            self.headers = {}
         self.timeout = timeout_seconds
         self.force_http = force_http
-        self._init_instance()
+        if get_otel_env_var("ENDPOINT"):
+            if not base_url:
+                self.endpoint = get_otel_env_var("ENDPOINT")
+            else:
+                logger.warning(
+                    "OTEL_ENDPOINT is set, but Laminar base URL is also set. Ignoring OTEL_ENDPOINT."
+                )
+            protocol = get_otel_env_var("PROTOCOL") or "grpc/protobuf"
+            exporter_type = from_env("OTEL_EXPORTER") or "otlp_grpc"
+            self.force_http = (
+                protocol in ("http/protobuf", "http/json")
+                or exporter_type == "otlp_http"
+            )
+        if not self.endpoint:
+            raise ValueError(
+                "Laminar base URL is not set and OTEL_ENDPOINT is not set. Please either\n"
+                "- set the LMNR_BASE_URL environment variable\n"
+                "- set the OTEL_ENDPOINT environment variable\n"
+                "- pass the base_url parameter to Laminar.initialize"
+            )
 
-    def _init_instance(self):
         if self.force_http:
             self.instance = HTTPOTLPSpanExporter(
                 endpoint=self.endpoint,

{lmnr-0.7.12 → lmnr-0.7.14}/src/lmnr/sdk/client/asynchronous/async_client.py

@@ -12,7 +12,7 @@ from lmnr.sdk.client.asynchronous.resources import (
     AsyncBrowserEvents,
     AsyncEvals,
     AsyncTags,
-    AsyncEvaluators
+    AsyncEvaluators,
 )
 from lmnr.sdk.utils import from_env
 
@@ -66,6 +66,26 @@ class AsyncLaminarClient:
         self.__client = httpx.AsyncClient(
             headers=self._headers(),
             timeout=timeout,
+            # Context: If the server responds with a 413, the connection becomes
+            # poisoned and freezes on subsequent requests, and there is no way
+            # to recover or recycle such connection.
+            # Setting max_keepalive_connections to 0 will resolve this, but is
+            # less efficient, as it will create a new connection
+            # (not client, so still better) for each request.
+            #
+            # Note: from my experiments with a simple python server, forcing the
+            # server to read/consume the request payload from the socket seems
+            # to resolve this, but I haven't figured out how to do that in our
+            # real actix-web backend server and whether it makes sense to do so.
+            #
+            # TODO: investigate if there are better ways to fix this rather than
+            # setting keepalive_expiry to 0. Other alternative: migrate to
+            # requests + aiohttp.
+            #
+            # limits=httpx.Limits(
+            #     max_keepalive_connections=0,
+            #     keepalive_expiry=0,
+            # ),
         )
 
         # Initialize resource objects
@@ -157,5 +177,3 @@ class AsyncLaminarClient:
             "Content-Type": "application/json",
             "Accept": "application/json",
         }
-
-

{lmnr-0.7.12 → lmnr-0.7.14}/src/lmnr/sdk/client/asynchronous/resources/evals.py

@@ -1,21 +1,31 @@
 """Evals resource for interacting with Laminar evaluations API."""
 
-from typing import Any
+import urllib
 import uuid
+from typing import Any
 
 from lmnr.sdk.client.asynchronous.resources.base import BaseAsyncResource
+from lmnr.sdk.log import get_default_logger
 from lmnr.sdk.types import (
+    GetDatapointsResponse,
     InitEvaluationResponse,
     EvaluationResultDatapoint,
     PartialEvaluationDatapoint,
 )
+from lmnr.sdk.utils import serialize
+
+INITIAL_EVALUATION_DATAPOINT_MAX_DATA_LENGTH = 16_000_000  # 16MB
+logger = get_default_logger(__name__)
 
 
 class AsyncEvals(BaseAsyncResource):
     """Resource for interacting with Laminar evaluations API."""
 
     async def init(
-        self, name: str | None = None, group_name: str | None = None, metadata: dict[str, Any] | None = None
+        self,
+        name: str | None = None,
+        group_name: str | None = None,
+        metadata: dict[str, Any] | None = None,
     ) -> InitEvaluationResponse:
         """Initialize a new evaluation.
 
@@ -51,7 +61,7 @@ class AsyncEvals(BaseAsyncResource):
     ) -> uuid.UUID:
         """
         Create a new evaluation and return its ID.
-        
+
         Parameters:
             name (str | None, optional): Optional name of the evaluation.
             group_name (str | None, optional): An identifier to group evaluations.
@@ -60,7 +70,9 @@ class AsyncEvals(BaseAsyncResource):
         Returns:
             uuid.UUID: The evaluation ID.
         """
-        evaluation = await self.init(name=name, group_name=group_name, metadata=metadata)
+        evaluation = await self.init(
+            name=name, group_name=group_name, metadata=metadata
+        )
         return evaluation.id
 
     async def create_datapoint(
@@ -74,7 +86,7 @@ class AsyncEvals(BaseAsyncResource):
     ) -> uuid.UUID:
         """
         Create a datapoint for an evaluation.
-        
+
         Parameters:
             eval_id (uuid.UUID): The evaluation ID.
             data: The input data for the executor.
@@ -82,13 +94,13 @@ class AsyncEvals(BaseAsyncResource):
             metadata (dict[str, Any] | None, optional): Optional metadata.
             index (int | None, optional): Optional index of the datapoint.
             trace_id (uuid.UUID | None, optional): Optional trace ID.
-        
+
         Returns:
             uuid.UUID: The datapoint ID.
         """
-        
+
         datapoint_id = uuid.uuid4()
-        
+
         # Create a minimal datapoint first
         partial_datapoint = PartialEvaluationDatapoint(
             id=datapoint_id,
@@ -99,7 +111,7 @@ class AsyncEvals(BaseAsyncResource):
             executor_span_id=uuid.uuid4(),  # Will be updated when executor runs
             metadata=metadata,
         )
-        
+
         await self.save_datapoints(eval_id, [partial_datapoint])
         return datapoint_id
 
@@ -119,18 +131,61 @@ class AsyncEvals(BaseAsyncResource):
         Raises:
             ValueError: If there's an error saving the datapoints.
         """
+        length = INITIAL_EVALUATION_DATAPOINT_MAX_DATA_LENGTH
+        points = [datapoint.to_dict(max_data_length=length) for datapoint in datapoints]
         response = await self._client.post(
             self._base_url + f"/v1/evals/{eval_id}/datapoints",
             json={
-                "points": [datapoint.to_dict() for datapoint in datapoints],
+                "points": points,
                 "groupName": group_name,
             },
             headers=self._headers(),
         )
+        if response.status_code == 413:
+            await self._retry_save_datapoints(eval_id, datapoints, group_name)
+            return
+
         if response.status_code != 200:
-            raise ValueError(f"Error saving evaluation datapoints: {response.text}")
-        
-    
+            raise ValueError(
+                f"Error saving evaluation datapoints: [{response.status_code}] {response.text}"
+            )
+
+    async def get_datapoints(
+        self,
+        dataset_name: str,
+        offset: int,
+        limit: int,
+    ) -> GetDatapointsResponse:
+        """Get datapoints from a dataset.
+
+        Args:
+            dataset_name (str): The name of the dataset.
+            offset (int): The offset to start from.
+            limit (int): The maximum number of datapoints to return.
+
+        Returns:
+            GetDatapointsResponse: The response containing the datapoints.
+
+        Raises:
+            ValueError: If there's an error fetching the datapoints.
+        """
+        params = {"name": dataset_name, "offset": offset, "limit": limit}
+        url = (
+            self._base_url + "/v1/datasets/datapoints?" + urllib.parse.urlencode(params)
+        )
+        response = await self._client.get(url, headers=self._headers())
+        if response.status_code != 200:
+            try:
+                resp_json = response.json()
+                raise ValueError(
+                    f"Error fetching datapoints: [{response.status_code}] {resp_json}"
+                )
+            except Exception:
+                raise ValueError(
+                    f"Error fetching datapoints: [{response.status_code}] {response.text}"
+                )
+        return GetDatapointsResponse.model_validate(response.json())
+
     async def update_datapoint(
         self,
         eval_id: uuid.UUID,
@@ -146,17 +201,59 @@ class AsyncEvals(BaseAsyncResource):
             executor_output (Any): The executor output.
             scores (dict[str, float | int] | None, optional): The scores. Defaults to None.
         """
-        
+
         response = await self._client.post(
             self._base_url + f"/v1/evals/{eval_id}/datapoints/{datapoint_id}",
             json={
-                "executorOutput": executor_output,
+                "executorOutput": (
+                    str(serialize(executor_output))[
+                        :INITIAL_EVALUATION_DATAPOINT_MAX_DATA_LENGTH
+                    ]
+                    if executor_output is not None
+                    else None
+                ),
                 "scores": scores,
             },
             headers=self._headers(),
         )
 
         if response.status_code != 200:
-            raise ValueError(f"Error updating evaluation datapoint: {response.text}")
-        
-    
+            raise ValueError(
+                f"Error updating evaluation datapoint: [{response.status_code}] {response.text}"
+            )
+
+    async def _retry_save_datapoints(
+        self,
+        eval_id: uuid.UUID,
+        datapoints: list[EvaluationResultDatapoint | PartialEvaluationDatapoint],
+        group_name: str | None = None,
+        initial_length: int = INITIAL_EVALUATION_DATAPOINT_MAX_DATA_LENGTH,
+        max_retries: int = 20,
+    ):
+        retry = 0
+        length = initial_length
+        while retry < max_retries:
+            retry += 1
+            length = length // 2
+            logger.debug(
+                f"Retrying save datapoints: {retry} of {max_retries}, length: {length}"
+            )
+            if length == 0:
+                raise ValueError("Error saving evaluation datapoints")
+            points = [
+                datapoint.to_dict(max_data_length=length) for datapoint in datapoints
+            ]
+            response = await self._client.post(
+                self._base_url + f"/v1/evals/{eval_id}/datapoints",
+                json={
+                    "points": points,
+                    "groupName": group_name,
+                },
+                headers=self._headers(),
+            )
+            if response.status_code != 413:
+                break
+        if response.status_code != 200:
+            raise ValueError(
+                f"Error saving evaluation datapoints: [{response.status_code}] {response.text}"
+            )