Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ref(api): establish transport boundary for API client by AbhiPrasad · Pull Request #641 · braintrustdata/braintrust-sdk-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ref(api): establish transport boundary for API client by AbhiPrasad · Pull Request #641 · braintrustdata/braintrust-sdk-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ref(api): establish transport boundary for API client by AbhiPrasad · Pull Request #641 · braintrustdata/braintrust-sdk-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ref(api): establish transport boundary for API client by AbhiPrasad · Pull Request #641 · braintrustdata/braintrust-sdk-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ref(api): establish transport boundary for API client by AbhiPrasad · Pull Request #641 · braintrustdata/braintrust-sdk-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ref(api): establish transport boundary for API client by AbhiPrasad · Pull Request #641 · braintrustdata/braintrust-sdk-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); ref(api): establish transport boundary for API client by AbhiPrasad · Pull Request #641 · braintrustdata/braintrust-sdk-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/src/braintrust/api/__init__.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
"""Braintrust API client package."""

__all__: list[str] = []
160 changes: 160 additions & 0 deletions py/src/braintrust/api/_transport.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
"""Legacy HTTP transport primitives used by the Braintrust SDK."""

import sys
import time
from collections.abc import Mapping
from typing import Any

import requests
import urllib3
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from ..env import BraintrustEnv
from ..util import _urljoin, response_raise_for_status


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()
152 changes: 2 additions & 150 deletions py/src/braintrust/logger.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,13 +37,12 @@

import chevron
import exceptiongroup
import requests
import urllib3
from braintrust.functions.stream import BraintrustStream
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry

from . import context, id_gen
from .api._transport import HTTPConnection
from .api._transport import RetryRequestExceptionsAdapter as RetryRequestExceptionsAdapter
from .bt_json import bt_dumps, bt_safe_deep_copy
from .db_fields import (
AUDIT_METADATA_FIELD,
Expand DownExpand Up@@ -97,7 +96,6 @@
GLOBAL_PROJECT,
AugmentedHTTPError,
LazyValue,
_urljoin,
add_azure_blob_headers,
bt_iscoroutinefunction,
coalesce,
Expand DownExpand Up@@ -728,152 +726,6 @@ def set_http_adapter(adapter: HTTPAdapter) -> None:
_state._api_conn._reset()


class RetryRequestExceptionsAdapter(HTTPAdapter):
"""An HTTP adapter that automatically retries requests on connection exceptions.

This adapter extends requests' HTTPAdapter to add retry logic for common network-related
exceptions including connection errors, timeouts, and other HTTP errors. It implements
an exponential backoff strategy between retries to avoid overwhelming servers during
intermittent connectivity issues.

Attributes:
base_num_retries: Maximum number of retries before giving up and re-raising the exception.
backoff_factor: A multiplier used to determine the time to wait between retries.
The actual wait time is calculated as: backoff_factor * (2 ** retry_count).
default_timeout_secs: Default timeout in seconds for requests that don't specify one.
Prevents indefinite hangs on stale connections.
"""

def __init__(
self,
*args: Any,
base_num_retries: int = 0,
backoff_factor: float = 0.5,
default_timeout_secs: float = 60,
**kwargs: Any,
):
self.base_num_retries = base_num_retries
self.backoff_factor = backoff_factor
self.default_timeout_secs = default_timeout_secs
super().__init__(*args, **kwargs)

def send(self, *args, **kwargs):
# Apply default timeout if none provided to prevent indefinite hangs
if kwargs.get("timeout") is None:
kwargs["timeout"] = self.default_timeout_secs

num_prev_retries = 0
while True:
try:
response = super().send(*args, **kwargs)
# Fully-download the content to ensure we catch any errors from
# downloading.
if not response.is_redirect and response.content:
pass
return response
except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException) as e:
if num_prev_retries < self.base_num_retries:
if isinstance(e, requests.exceptions.ReadTimeout):
# Clear all connection pools to discard stale connections. This
# fixes hangs caused by NAT gateways silently dropping idle TCP
# connections (e.g., Azure's ~4 min timeout). close() calls
# PoolManager.clear() which is thread-safe: in-flight requests
# keep their checked-out connections, and new requests create
# fresh pools on demand.
self.close()
# Emulates the sleeping logic in the backoff_factor of urllib3 Retry
sleep_s = self.backoff_factor * (2**num_prev_retries)
print("Retrying request after error:", e, file=sys.stderr)
print("Sleeping for", sleep_s, "seconds", file=sys.stderr)
time.sleep(sleep_s)
num_prev_retries += 1
else:
raise e


class HTTPConnection:
def __init__(self, base_url: str, adapter: HTTPAdapter | None = None):
self.base_url = base_url
self.token = None
self.adapter = adapter

self._reset(total=0)

def ping(self) -> bool:
try:
resp = self.get("ping")
return resp.ok
except requests.exceptions.ConnectionError:
return False

def make_long_lived(self) -> None:
if not self.adapter:
timeout_secs = BraintrustEnv.HTTP_TIMEOUT.get(60.0)
self.adapter = RetryRequestExceptionsAdapter(
base_num_retries=10, backoff_factor=0.5, default_timeout_secs=timeout_secs
)
self._reset()

@staticmethod
def sanitize_token(token: str) -> str:
return token.rstrip("\n")

def set_token(self, token: str) -> None:
token = HTTPConnection.sanitize_token(token)
self.token = token
self._set_session_token()

def _set_adapter(self, adapter: HTTPAdapter | None) -> None:
self.adapter = adapter

def _reset(self, **retry_kwargs: Any) -> None:
self.session = requests.Session()

adapter = self.adapter
if adapter is None:
retry = Retry(**retry_kwargs)
adapter = HTTPAdapter(max_retries=retry)

self.session.mount("http://", adapter)
self.session.mount("https://", adapter)

self._set_session_token()

def _set_session_token(self) -> None:
if self.token:
self.session.headers.update({"Authorization": f"Bearer {self.token}"})

def get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.get(_urljoin(self.base_url, path), *args, **kwargs)

def post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.post(_urljoin(self.base_url, path), *args, **kwargs)

def patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.patch(_urljoin(self.base_url, path), *args, **kwargs)

def put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.put(_urljoin(self.base_url, path), *args, **kwargs)

def delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
return self.session.delete(_urljoin(self.base_url, path), *args, **kwargs)

def get_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Mapping[str, Any]:
resp = self.get(f"/{object_type}", params=args)
response_raise_for_status(resp)
return resp.json()

def post_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.post(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()

def patch_json(self, object_type: str, args: Mapping[str, Any] | None = None) -> Any:
resp = self.patch(f"/{object_type.lstrip('/')}", json=args)
response_raise_for_status(resp)
return resp.json()


# Sometimes we'd like to launch network requests concurrently. We provide a
# thread pool to accomplish this. Use a multiple of number of CPU cores to limit
# concurrency.
Expand Down
Loading